From 3ea1b29cb4d7815075db7972dd8f32fd7d3f79be Mon Sep 17 00:00:00 2001 From: cryptogopher Date: Mon, 6 Mar 2023 15:05:56 +0100 Subject: [PATCH] Set application name related values to FixinMe --- app/views/layouts/application.html.erb | 2 +- config/application.rb.dist | 2 +- config/database.yml | 43 ++++++++++++-------------- 3 files changed, 22 insertions(+), 25 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index b675dee..1d4f059 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,7 +1,7 @@ - Tracker + FixinMe <%= csrf_meta_tags %> <%= csp_meta_tag %> diff --git a/config/application.rb.dist b/config/application.rb.dist index 9eb499a..31e4c26 100644 --- a/config/application.rb.dist +++ b/config/application.rb.dist @@ -18,7 +18,7 @@ require "rails/test_unit/railtie" # you've limited to :test, :development, or :production. Bundler.require(*Rails.groups) -module Tracker +module FixinMe class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. config.load_defaults 7.0 diff --git a/config/database.yml b/config/database.yml index a1bfed9..07a0ca6 100644 --- a/config/database.yml +++ b/config/database.yml @@ -9,25 +9,6 @@ # And be sure to use new-style password hashing: # https://dev.mysql.com/doc/refman/5.7/en/password-hashing.html # -default: &default - adapter: mysql2 - encoding: utf8mb4 - pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> - username: root - password: - socket: /var/run/mysqld/mysqld.sock - -development: - <<: *default - database: tracker_development - -# Warning: The database defined as "test" will be erased and -# re-generated from your development database when you run "rake". -# Do not set this db to the same as development or production. -test: - <<: *default - database: tracker_test - # As with config/credentials.yml, you never want to store sensitive information, # like your database password, in your source code. If your source code is # ever seen by anyone, they now have access to your database. @@ -47,9 +28,25 @@ test: # # Read https://guides.rubyonrails.org/configuring.html#configuring-a-database # for a full overview on how database connection configuration can be specified. -# +default: &default + adapter: mysql2 + encoding: utf8mb4 + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + username: fixinme + password: <%= ENV["FIXINME_DATABASE_PASSWORD"] %> + socket: /run/mysqld/mysqld.sock + production: <<: *default - database: tracker_production - username: tracker - password: <%= ENV["TRACKER_DATABASE_PASSWORD"] %> + database: fixinme_production + +development: + <<: *default + database: fixinme_dev + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: fixinme_test