From 711cd95ad4f23724b2b6d1467255b0cf797402b5 Mon Sep 17 00:00:00 2001
From: Benjamin ter Kuile <bterkuile@gmail.com>
Date: Mon, 31 Jan 2022 12:17:03 -0500
Subject: [PATCH] See if it deploys

---
 Gemfile.lock                       | 19 ++++++++++---------
 config/couchdb.yml                 |  5 +++--
 config/environments/development.rb |  2 +-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 513db351..f8bfd815 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -242,7 +242,7 @@ GEM
     hashie (5.0.0)
     http_parser.rb (0.8.0)
     httpclient (2.8.3)
-    i18n (1.9.0)
+    i18n (1.9.1)
       concurrent-ruby (~> 1.0)
     iso_country_codes (0.7.8)
     jquery-rails (4.4.0)
@@ -288,15 +288,15 @@ GEM
       rake
     mini_magick (4.11.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.7.1)
     minitest (5.15.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     naught (1.1.0)
     nio4r (2.5.8)
-    nokogiri (1.13.1)
-      mini_portile2 (~> 2.7.0)
+    nokogiri (1.13.1-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.13.1-x86_64-linux)
       racc (~> 1.4)
     oauth2 (1.4.7)
       faraday (>= 0.8, < 2.0)
@@ -390,7 +390,7 @@ GEM
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
       rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
+    rspec-core (3.10.2)
       rspec-support (~> 3.10.0)
     rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -398,7 +398,7 @@ GEM
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.10.2)
+    rspec-mocks (3.10.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-rails (5.1.0)
@@ -480,10 +480,11 @@ GEM
       nokogiri (~> 1.8)
     yard (0.9.27)
       webrick (~> 1.7.0)
-    zeitwerk (2.5.3)
+    zeitwerk (2.5.4)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-21
+  x86_64-linux
 
 DEPENDENCIES
   ace-rails-ap
@@ -542,4 +543,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.1.4
+   2.3.6
diff --git a/config/couchdb.yml b/config/couchdb.yml
index 8b01b6ca..c7296f1c 100644
--- a/config/couchdb.yml
+++ b/config/couchdb.yml
@@ -1,7 +1,7 @@
 development:
   validation_framework: :active_model #optional
   #database: "http://mozo:secret@localhost:5984/qwaiter_development"
-  database: "http://admin:admin@localhost:5984/mozo_development"
+  database: "http://admin:<%= ENV['COUCHDB_ADMIN_PASSWORD']%>@localhost:5984/mozo_development"
   #database: mozo_development
 test:
   validation_framework: :active_model #optional
@@ -11,7 +11,8 @@ test:
   # database: "http://admin:secret@localhost:5984/qwaiter_test"
 production:
   validation_framework: :active_model #optional
-  database: qwaiter
+  database: "http://admin:<%= ENV['COUCHDB_ADMIN_PASSWORD']%>@localhost:5984/qwaiter"
+  #database: qwaiter
 user_app:
   validation_framework: :active_model #optional
   database: mozo_development
diff --git a/config/environments/development.rb b/config/environments/development.rb
index d867492c..32d8b6c3 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -9,7 +9,7 @@ Qwaiter::Application.configure do
   config.cache_classes = false
   config.middleware.insert_before 0, Rack::Cors do
     allow do
-      origins 'https://localhost:4202', 'https://localhost:4201', 'http://localhost:9296', 'supplier.mozo.local', 'user.mozo.local', 'events.mozo.local'
+      origins 'https://localhost:4202', 'https://localhost:4201', 'https://localhost:9296', 'supplier.mozo.local', 'user.mozo.local', 'events.mozo.local'
       #resource '/user/*', :headers => '*', :methods => '*' #[:get, :post, :options]
       resource '*', headers: :any, methods: %i[get post put patch delete options]
     end