From a1bf1cb8a5bfc4c07e4785e19a156921b8962c89 Mon Sep 17 00:00:00 2001 From: jmilljr24 <16829344+jmilljr24@users.noreply.github.com> Date: Tue, 11 Feb 2025 19:25:55 -0500 Subject: [PATCH 1/2] Use default env var db names Add minor fix to kamal alias for viewing production logs. --- .kamal/secrets | 4 ++-- Dockerfile | 2 +- config/database.yml | 2 -- config/deploy.yml | 10 +++++++--- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.kamal/secrets b/.kamal/secrets index cba127199..a9dd32038 100644 --- a/.kamal/secrets +++ b/.kamal/secrets @@ -6,8 +6,8 @@ # KAMAL_REGISTRY_PASSWORD=$(RAILS_ENV=production KEY=deploy,kamal_registry_password, bin/rails credentials:read) DB_HOST=$(RAILS_ENV=production KEY=deploy,db_host, bin/rails credentials:read) -DB_USER=$(RAILS_ENV=production KEY=deploy,db_user, bin/rails credentials:read) -DB_PASSWORD=$(RAILS_ENV=production KEY=deploy,db_password, bin/rails credentials:read) +DATABASE_USERNAME=$(RAILS_ENV=production KEY=deploy,db_user, bin/rails credentials:read) +DATABASE_PASSWORD=$(RAILS_ENV=production KEY=deploy,db_password, bin/rails credentials:read) # Option 2: Read secrets via a command RAILS_MASTER_KEY=$(cat config/credentials/production.key) diff --git a/Dockerfile b/Dockerfile index 2fb1b77e1..0810f2410 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ RUN echo "Bust" # Install base packages RUN apt-get update -qq && \ - apt-get install --no-install-recommends -y curl libjemalloc2 libvips postgresql-client && \ + apt-get install --no-install-recommends -y curl less libjemalloc2 libvips postgresql-client && \ rm -rf /var/lib/apt/lists /var/cache/apt/archives # Install Node.js diff --git a/config/database.yml b/config/database.yml index ce3b84446..b9afe3d89 100644 --- a/config/database.yml +++ b/config/database.yml @@ -101,8 +101,6 @@ production: primary: &primary_production <<: *default host: <%= ENV["DB_HOST"] %> - username: <%= ENV["DB_USER"] %> - password: <%= ENV["DB_PASSWORD"] %> database: postgres timeout: 5000 cable: diff --git a/config/deploy.yml b/config/deploy.yml index 7d09c35c6..f1f9c16a5 100644 --- a/config/deploy.yml +++ b/config/deploy.yml @@ -46,8 +46,8 @@ env: secret: - RAILS_MASTER_KEY - DB_HOST - - DB_USER - - DB_PASSWORD + - DATABASE_USERNAME + - DATABASE_PASSWORD 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. @@ -61,8 +61,12 @@ env: # aliases: shell: app exec --interactive --reuse "bash" - logs: app logs -f console: app exec -i --reuse "bin/rails console" + logs: app exec -i --reuse "less -n +F log/production.log" +# Running "kamal logs" will start following the tail of the log file and +# display more text as the file grows. "ctrl-c" to enter navigation. "F" to follow again. +# Navigation - "j" up, "k" down, "q" quit, Search - "/" /foo, "n" next occurance, "N" previous +# https://greenwoodsoftware.com/less/index.html # Use a different ssh user than root # From e026070d8543a3845a03d6cc1e3b7d3c9ace1669 Mon Sep 17 00:00:00 2001 From: jmilljr24 <16829344+jmilljr24@users.noreply.github.com> Date: Tue, 11 Feb 2025 20:33:22 -0500 Subject: [PATCH 2/2] update secrets --- .kamal/secrets | 4 ++-- config/credentials/production.yml.enc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.kamal/secrets b/.kamal/secrets index a9dd32038..129953a2a 100644 --- a/.kamal/secrets +++ b/.kamal/secrets @@ -6,8 +6,8 @@ # KAMAL_REGISTRY_PASSWORD=$(RAILS_ENV=production KEY=deploy,kamal_registry_password, bin/rails credentials:read) DB_HOST=$(RAILS_ENV=production KEY=deploy,db_host, bin/rails credentials:read) -DATABASE_USERNAME=$(RAILS_ENV=production KEY=deploy,db_user, bin/rails credentials:read) -DATABASE_PASSWORD=$(RAILS_ENV=production KEY=deploy,db_password, bin/rails credentials:read) +DATABASE_USERNAME=$(RAILS_ENV=production KEY=deploy,database_username, bin/rails credentials:read) +DATABASE_PASSWORD=$(RAILS_ENV=production KEY=deploy,database_password, bin/rails credentials:read) # Option 2: Read secrets via a command RAILS_MASTER_KEY=$(cat config/credentials/production.key) diff --git a/config/credentials/production.yml.enc b/config/credentials/production.yml.enc index fa5d332de..2cde5b39e 100644 --- a/config/credentials/production.yml.enc +++ b/config/credentials/production.yml.enc @@ -1 +1 @@ -W3w8nvvQhn3a9iVi1l/oSK3ob5pldwaW9cH3neLXfjhHJK5oXVHr+kxgE6PY0L6xiEjhuaB+TB/quXnAucBtaETqL6mO/3jx+NOHZWW8PeJJh3OkAJQHReGSSOH3XAM8HIpLDdgUWEO6mjKJTE+tg88pTA0uMi6KW2/XcfY6+sTiKgygZ0lnjUXEuKsOf2hgPBdHe0Q1xO1MpnDuK9641iljYKpT8NeEbi3hx02DGtNXgJ/U0cWZpP3YNpMGsWwj1zmai5MfX7XnS/kL+TKG1eilRVVccC8rllUEX65QWH37WKhHJjGJkGyXucFsO1Z6FIEDFyQUrweDf/iF9AilpBFObccIOIPicg0b475ZMylCrq4VZ4EwD4W2UTloMFx6OVlvWBckCP8BiY80q7N7deBkPkNs9vpNft1hO4eMM6a9bU09Q+EYZjsn4M77k0KBkKGBAS1Rc3X13Y0gR9CykVBRd6Akq1PJa4X+yTf/zzA/TySKB44t+tbrHBlIxt4aWtHI2brvqE6gE+/oBuTaVjvPZYFd5YccCzdGXgs+5rRPDOSP6VqAfn0mKfPSe2QXPavYLeFOP/5dYZg1JaGCOPtZvyhcrqvx4N8gwV1F7Q75z1tUqdu1djALho1J3kaAurAhDtjgiMHQ6KJuL++B13QsXhfMe2TJ3imqf+bY8Y+cPTNyNvkq/lql7qSAP4St7C1qDOr4YFD34Ye+hb8ePaKFxV/PSEk7Z1LDLnsiWI+cZhKc6vy22nvs262URhQ/MWtSM0KZD9Mh38XjoG+PYkcQ507pIYEyH977oeMLgqBDasBknaTxefeaaN8q2fLzonfhrKo2jqTdCdUP9ZgEqsFxWrQR33LmNv5/boN3HOVU/7wF1AX4QUZw6IRs6w/qzbscBgVevDF3SSDS3eMQ6a5gith3o2pBKfuG+wkRv6X6SnZ1Tj3DjsY44XX8eP9tD3/Nncg25jX1P7u9ZxBH5asWgz10g5cBtaWrESeoaBYjGzOPXtjbJAdv1AdSp64lkoRCRZgRWMpLVOMK3ZCWZCREZUuV8dNVWoBK7930K34o13h6ifRVd7GUviezeOdzsAQRDe1THc0Hvrs09E8qXixXPqdpSWEceozMgXaeK/ZyixRHJ9Xl4u8RzAPc70QJUh6zRY/Mf+QRBsv4czmzjoskaIpMpXohA/SbQzSUfrsYQBEnYEaocxS9S1CI6ikwGWU0trXj77kzB4TUqK640k+KS4DNQe3F/2Lbf0Gu8D+msnrIusi5GnuOfXFjS109RO7faUngVxSpVxuBLcKErzpA96IKsCTMeJq+6N/2WwryW9rzRbtFKLKR6Ip8C0d+RysVA/Qe4RV3nujLhncyUHd1TGmUiCwX--D/R1K1hn1a4Zav38--9R0KJV0yoSyKYDs4fBxyXg== \ No newline at end of file +I9QY3DwGUzoa2XfC8y67yN3nkJFy52firnrTyPNS3nCLQqB40krFypl6SVkVhPJ1MANwzSlqeWUqno3sE4zEL9nqKvrb5AFsMz3/r3ol0J9quLr6cAkCMKXhMTkTFOGvjsztD82EHKLbUrmfckqbVkPgrCZfTl5d64MJdQ7Y9NeTnBT8hVqrJlyFq49Ju/1eSc0RtwYVwbj8pEzblsn2qPV6gsfIetAeDESQsNhbkApAbQrjbNfnh1AsMm51ImSaokktr2J4p/8eg1zSuKmEatbMWOJq7yhtkWgxkeAVGTYE6NVkaEsWtCBW3haXMXlnvONfVuvDRhet4hEfDiPRXViFDooR5KX7hxAOfkgNZ6CjLxup9jiHNazlA9MX32ov+8wx1YC3FItFh40vlbOtmBuo0EFxhz/At73zh8frAG+izIYa5MERYGSx6ywhty6gaVlK4ViVEvZraYcCLI8EBtr0ZI1ypFol1mZE9Sg7kY4z9cClu7g6lZTqBgbYz66kFo+x94nbW7Xoy7iugDpbqsopypZm78iVmbbPJ1GAV4AGk0DhJlXr9SgL7bY/Tq5AZ4WuwXduhw5uNWzaot0dpWV0RCkjPA5h77zt/JhoF+9HVwj/NhHBx+novunkdKj2lwL3DIohnJsYgHOZZYQ3to4szd2S1YAtEuVpciekQCnlCzxGDgbAFUkaYcqg3sUq+46TG5OJOJ8BT6yDxGfUnl7z1ur0FxIcy2H+R6txq0HgHYY16r0op9lBi39lepMbwsII9jZAXo3brXmw8gmqDNVOMSXnGv4rluXHUtSekPMUFsyFR0yEwkMAnffiKXncFrldjiczfYPr2Nn7Xl7kBKzh656XHmcLQznxshSpQ7NUopTFwkW4T38ClU/FrtGoSILAihTzx/9/hH4V6nB7OuAHmhcdYlI+tN5Vcdq69EnwtyMpi4Q0o49ouW3nDecVgM0/kkY6Ueh1UcpQjwENwqkuaNdZP1YMxARQ/1CKxP6dYH76NcTgpTujgnhIEXbWUCxmsnXVGkB0YqGriIiWUqoghgGhuHpLn27+nGBjouwuUJpSamGIexGQMMJvuuZVclx+FmJlWz6775MNi4r+ErOUBO/5fqvTgDLVOjzoqTZ2xPS41Fkg3P7UfKGcU6xo5fFmrenhiZZ2qn7I5noIQ6KdUMJyuuXiH119DDp9xfDRjCgbwvwxWKD3W86zQ2FXSBtQR107SRRVzwTHs3OvZhlCnoNqaTaSfAH5p31kPyEEYxtsCXnIQljuAr1dvwKSOlrlkFo3eHkvnwYJSUUbxiDG0dRwr9FdH/Dq7dmeeMctbfZOvL1zWmrVygwxkspBPmqfi3/dhOtoOmF6EBXEodINtez3TC0ek3AqwNmgYLIbvl8UTzdNIA==--NlTqXjnNsLOZvGT4--HgcgRNmF/2v15q37gO/QbA== \ No newline at end of file