Kamal: Update configs

Author: jlduran

.dockerignore

@@ -13,6 +13,7 @@
 # Ignore all default key files.
 /config/master.key
 /config/credentials/*.key
+/config/keys/*
 
 # Ignore all logfiles and tempfiles.
 /log/*

.kamal/secrets-common renamed to .kamal/secrets

@@ -5,3 +5,6 @@
 KAMAL_REGISTRY_PASSWORD=$KAMAL_REGISTRY_PASSWORD
 POSTGRES_PASSWORD=$POSTGRES_PASSWORD
 RAILS_MASTER_KEY=$(cat config/master.key)
+HEALTH_CARDS_HOST=$HEALTH_CARDS_HOST
+HEALTH_CARDS_KEY_PEM=$(cat config/keys/health_cards.pem)
+WEBAUTHN_ORIGIN=$WEBAUTHN_ORIGIN

config/database.yml

@@ -15,10 +15,10 @@ test:
 production:
   primary: &primary_production
     <<: *default
+    host: <%= ENV["DB_HOST"] %>
     database: open_lis_production
     username: open_lis
     password: <%= ENV["POSTGRES_PASSWORD"] %>
-    host: <%= ENV["DB_HOST"] %>
   cache:
     <<: *primary_production
     database: open_lis_production_cache

config/deploy.yml

@@ -34,8 +34,11 @@ registry:
 # Inject ENV variables into containers (secrets come from .kamal/secrets).
 env:
   secret:
-    - RAILS_MASTER_KEY
+    - HEALTH_CARDS_HOST
+    - HEALTH_CARDS_KEY_PEM
     - POSTGRES_PASSWORD
+    - RAILS_MASTER_KEY
+    - WEBAUTHN_ORIGIN
   clear:
     # Run the Solid Queue Supervisor inside the web server's Puma process to do jobs.
     # When you start using multiple servers, you should split out job processing to a dedicated machine.
@@ -48,10 +51,8 @@ env:
     # WEB_CONCURRENCY: 2
 
     # Match this to any external database server to configure Active Record correctly
-    # Use rails803-db for a db accessory server on same machine via local kamal docker network.
-    # DB_HOST: 192.168.0.2
+    # Use open-lis-db for a db accessory server on same machine via local kamal docker network.
     DB_HOST: open-lis-db
-    POSTGRES_USER: open_lis
 
     # Log everything from Rails
     # RAILS_LOG_LEVEL: debug
@@ -68,24 +69,24 @@ aliases:
 # Use a persistent storage volume for sqlite database files and local Active Storage files.
 # Recommended to change this to a mounted volume path that is backed up off server.
 # volumes:
-#   - "open_lis_storage:/rails/storage"
+#   - "open-lis_storage:/rails/storage"
 
 
 # Bridge fingerprinted assets, like JS and CSS, between versions to avoid
 # hitting 404 on in-flight requests. Combines all files from new and old
 # version inside the asset_path.
-# asset_path: /rails/public/assets
+asset_path: /rails/public/assets
 
 # Configure the image builder.
 builder:
   arch: arm64
 
-  # # Build image via remote server (useful for faster amd64 builds on arm64 computers)
+  # Build image via remote server (useful for faster amd64 builds on arm64 computers)
   # remote: ssh://docker@docker-builder-server
-  #
-  # # Pass arguments and secrets to the Docker build process
+
+  # Pass arguments and secrets to the Docker build process
   # args:
-  #   RUBY_VERSION: 3.4.3
+  #   RUBY_VERSION: 3.4.4
   # secrets:
   #   - GITHUB_TOKEN
   #   - RAILS_MASTER_KEY
@@ -97,9 +98,9 @@ builder:
 # Use accessory services (secrets come from .kamal/secrets).
 accessories:
   db:
-    image: postgres:17.0
-    host: 192.0.2.2
-    port: "127.0.0.1:5432:5432"
+    image: postgres:17
+    host: 192.0.2.1
+    port: "127.0.0.1:5432:5432 --publish [::1]:5432:5432"
     env:
       clear:
         POSTGRES_DB: open_lis_production

config/initializers/smart_health_cards.rb

@@ -1,5 +1,5 @@
 Rails.application.configure do
-  config.hc_key_path = ENV.fetch("HEALTH_CARDS_KEY_PATH", "config/keys/health_cards.pem")
+  config.hc_key_path = ENV.fetch("HEALTH_CARDS_KEY_PEM", "config/keys/health_cards.pem")
   FileUtils.mkdir_p(File.dirname(config.hc_key_path))
   kp = HealthCards::PrivateKey.load_from_or_create_from_file(config.hc_key_path)