From bfff38ac3c0b52d72868e9909f63d6b9adb98167 Mon Sep 17 00:00:00 2001 From: Torsten Date: Mon, 21 Nov 2022 12:16:59 +0200 Subject: [PATCH] fix db add passenger --- Gemfile | 36 ++++------------------ Gemfile.lock | 16 +++++++++- config/database.yml | 74 +++------------------------------------------ 3 files changed, 25 insertions(+), 101 deletions(-) diff --git a/Gemfile b/Gemfile index d99a137..7b39b12 100644 --- a/Gemfile +++ b/Gemfile @@ -3,42 +3,23 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby "3.0.4" -# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" gem "rails", "~> 7.0.4" -# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails] gem "sprockets-rails" - -# Use postgresql as the database for Active Record gem "pg", "~> 1.1" -# Use the Puma web server [https://github.com/puma/puma] -gem "puma", "~> 5.0" - -# Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails] gem "importmap-rails" - -# Use Tailwind CSS [https://github.com/rails/tailwindcss-rails] gem "tailwindcss-rails" - -# Use Kredis to get higher-level data types in Redis [https://github.com/rails/kredis] -# gem "kredis" - -# Use Active Model has_secure_password [https://guides.rubyonrails.org/active_model_basics.html#securepassword] -# gem "bcrypt", "~> 3.1.7" - -# Windows does not include zoneinfo files, so bundle the tzinfo-data gem -gem "tzinfo-data", platforms: %i[ mingw mswin x64_mingw jruby ] - -# Reduces boot times through caching; required in config/boot.rb gem "bootsnap", require: false - -# Use Sass to process CSS -# gem "sassc-rails" +gem "sassc-rails" # Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images] # gem "image_processing", "~> 1.2" +group :production do + gem "passenger" +end + group :development, :test do # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem gem "debug", platforms: %i[ mri mingw x64_mingw ] @@ -47,12 +28,7 @@ end group :development do # Use console on exceptions pages [https://github.com/rails/web-console] gem "web-console" - - # Add speed badges [https://github.com/MiniProfiler/rack-mini-profiler] - # gem "rack-mini-profiler" - - # Speed up commands on slow machines / big apps [https://github.com/rails/spring] - # gem "spring" + gem "puma", "~> 5.0" end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 04ad41a..f52edde 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -88,6 +88,7 @@ GEM irb (>= 1.3.6) reline (>= 0.3.1) erubi (1.11.0) + ffi (1.15.5) globalid (1.0.0) activesupport (>= 5.0) i18n (1.12.0) @@ -120,6 +121,9 @@ GEM nio4r (2.5.8) nokogiri (1.13.9-x86_64-linux) racc (~> 1.4) + passenger (6.0.15) + rack + rake (>= 0.8.1) pg (1.4.5) public_suffix (5.0.0) puma (5.6.5) @@ -160,6 +164,14 @@ GEM io-console (~> 0.5) rexml (3.2.5) rubyzip (2.3.2) + sassc (2.4.0) + ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt selenium-webdriver (4.6.1) childprocess (>= 0.5, < 5.0) rexml (~> 3.2, >= 3.2.5) @@ -175,6 +187,7 @@ GEM tailwindcss-rails (2.0.21-x86_64-linux) railties (>= 6.0.0) thor (1.2.1) + tilt (2.0.11) timeout (0.3.0) tzinfo (2.0.5) concurrent-ruby (~> 1.0) @@ -203,13 +216,14 @@ DEPENDENCIES capybara debug importmap-rails + passenger pg (~> 1.1) puma (~> 5.0) rails (~> 7.0.4) + sassc-rails selenium-webdriver sprockets-rails tailwindcss-rails - tzinfo-data web-console webdrivers diff --git a/config/database.yml b/config/database.yml index c9981e9..a55cddd 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,86 +1,20 @@ -# PostgreSQL. Versions 9.3 and up are supported. -# -# Install the pg driver: -# gem install pg -# On macOS with Homebrew: -# gem install pg -- --with-pg-config=/usr/local/bin/pg_config -# On macOS with MacPorts: -# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config -# On Windows: -# gem install pg -# Choose the win32 build. -# Install PostgreSQL and put its /bin directory on your path. -# -# Configure Using Gemfile -# gem "pg" -# default: &default adapter: postgresql encoding: unicode - # For details on connection pooling, see Rails configuration guide - # https://guides.rubyonrails.org/configuring.html#database-pooling - pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + username: postgres development: <<: *default - database: hubfeenix_fi_development - - # The specified database role being used to connect to postgres. - # To create additional roles in postgres see `$ createuser --help`. - # When left blank, postgres will use the default role. This is - # the same name as the operating system user running Rails. - #username: hubfeenix_fi - - # The password associated with the postgres role (username). - #password: - - # Connect on a TCP socket. Omitted by default since the client uses a - # domain socket that doesn't need configuration. Windows does not have - # domain sockets, so uncomment these lines. - #host: localhost - - # The TCP port the server listens on. Defaults to 5432. - # If your server runs on a different port number, change accordingly. - #port: 5432 - - # Schema search path. The server defaults to $user,public - #schema_search_path: myapp,sharedapp,public - - # Minimum log levels, in increasing order: - # debug5, debug4, debug3, debug2, debug1, - # log, notice, warning, error, fatal, and panic - # Defaults to warning. - #min_messages: notice + database: hubfeenix_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: hubfeenix_fi_test + database: hubfeenix_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. -# -# Instead, provide the password or a full connection URL as an environment -# variable when you boot the app. For example: -# -# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" -# -# If the connection URL is provided in the special DATABASE_URL environment -# variable, Rails will automatically merge its configuration values on top of -# the values provided in this file. Alternatively, you can specify a connection -# URL environment variable explicitly: -# -# production: -# url: <%= ENV["MY_APP_DATABASE_URL"] %> -# -# Read https://guides.rubyonrails.org/configuring.html#configuring-a-database -# for a full overview on how database connection configuration can be specified. # production: <<: *default - database: hubfeenix_fi_production - username: hubfeenix_fi - password: <%= ENV["HUBFEENIX_FI_DATABASE_PASSWORD"] %> + database: hubfeenix_production