FIX Rails db:prepare did not take DATABASE_URL into account

dbroeglin · Nov 16, 2024 · 8c4dbc0 · 8c4dbc0
1 parent c3ad17e
commit 8c4dbc0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -116,6 +116,9 @@ rails new --database=postgresql --name=azure-rails-starter src
 rm -rf src/.git
 cd src
 sed -i '' 's/# root.*$/root "home#index"/' config/routes.rb
+sed -i '' '/azure_rails_starter_production$/,/DATABASE_PASSWORD/c\
+    url: <%= ENV["DATABASE_URL"] %>
+' config/database.yml
 cat > app/controllers/home_controller.rb <<EOF
 class HomeController < ApplicationController
   def index

diff --git a/src/config/credentials.yml.enc b/src/config/credentials.yml.enc
@@ -1 +1 @@
-d7mZ3qcpU2KW31t1GKvWmW+FXsmy2qaZAIfJuF9BICq9PCTY3jvwv3nuDufa9T0Kt5rg9sjeuE3X0xd/IFkEokZ0njHPss6VdFAfRjmCdCYgWVUrqZFSumKO86NXi299y3KU2MAKwoH2rargS7XllsnUAOuut3IjjP9bf3F+m1qZr494Vdp8ojs2yx65iyyQgpNyRMVmC4z0185RzlB1tu8l+V7WtHsBIlgZXX4yI3KhUtN0MezPr0dT6JglyQ5FKU82Qqw+OCSswTtmXTvg0wonLttCWdHhMFrIDD//M+CgcHrtlR30AM6WA5LdAbviwmgsaaHRX4n4cPVBqc4tASblJeDhXM2ZWpLlBRhy+8of8zJ4Bc2h/B0An1GI8ACuKcu5bSRqcn0zNxbWZH+cDfmn4RobgpyGTdkLmiCYFt2wS5FYJEMN6Rfwiif+708IYqrqoiRg6rNe/2a3o41tt8EkTIk26IgPG+U2nX9uR+FTYAsh60qGWsxN--8VdKJcNQoSN3GC5l--e7i71PEkSkQ6gDvtKXgEwg==
+VoZFJnxxy7IudgikmP2UO+YLc1DIjkxXI7lO5TMacfitoQhPVfRmPqBDETY8ojgTHEB1ijpuwZiZseHIVDW+lm/kuFFT/eGg+pbOXxZHCs5q5i3Ba9R9KwwDZrvxz01pIyl4x4BUzEfEsRL11+REN5/CKETbGsWDDJnc24Uk1y6y2KVDs+gr5pcr7ijajShFi1EH1ha1SzyD2TA2MBlUmR5+Jliu4/+8fkyU4rVkndHFe+gnDxqC+aWg79pTrLBy08FuMdkrj85Ob/v9ovlDcQz/CWZUdxGGG8Z5ytHBQziCkTOVB4zSigwfyJ71LCg7hbKxZTxIYU7DVmPqZOQrGVsyrXeK8ZGpQATWvBsTwvgYrHTo77b/IHgt675nn4Bt8yYz55sWjMRkLaQZ9a6QM2v09lWMynQPj0wPvqL8FjQsc02qUxDZ2mZ8CYwgTHQnpvuvJLRplpB1lcStldSU9g5Xeyq+wQsAsbtg5gQCqH5ghNqMpOo687nq--xXURwMaq0iUqGA0e--ZWeBVeUKTuX6ipoyPDH+5w==
diff --git a/src/config/database.yml b/src/config/database.yml
@@ -81,9 +81,7 @@ test:
 production:
   primary: &primary_production
     <<: *default
-    database: azure_rails_starter_production
-    username: azure_rails_starter
-    password: <%= ENV["AZURE_RAILS_STARTER_DATABASE_PASSWORD"] %>
+    url: <%= ENV["DATABASE_URL"] %>
   cache:
     <<: *primary_production
     database: azure_rails_starter_production_cache

diff --git a/src/config/master.key b/src/config/master.key
@@ -1 +1 @@
-52e209498d5fd6dee1e7eb1cf7ea944e
+c355a5ddc047676bfd355655419bb9e1
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		d7mZ3qcpU2KW31t1GKvWmW+FXsmy2qaZAIfJuF9BICq9PCTY3jvwv3nuDufa9T0Kt5rg9sjeuE3X0xd/IFkEokZ0njHPss6VdFAfRjmCdCYgWVUrqZFSumKO86NXi299y3KU2MAKwoH2rargS7XllsnUAOuut3IjjP9bf3F+m1qZr494Vdp8ojs2yx65iyyQgpNyRMVmC4z0185RzlB1tu8l+V7WtHsBIlgZXX4yI3KhUtN0MezPr0dT6JglyQ5FKU82Qqw+OCSswTtmXTvg0wonLttCWdHhMFrIDD//M+CgcHrtlR30AM6WA5LdAbviwmgsaaHRX4n4cPVBqc4tASblJeDhXM2ZWpLlBRhy+8of8zJ4Bc2h/B0An1GI8ACuKcu5bSRqcn0zNxbWZH+cDfmn4RobgpyGTdkLmiCYFt2wS5FYJEMN6Rfwiif+708IYqrqoiRg6rNe/2a3o41tt8EkTIk26IgPG+U2nX9uR+FTYAsh60qGWsxN--8VdKJcNQoSN3GC5l--e7i71PEkSkQ6gDvtKXgEwg==
		VoZFJnxxy7IudgikmP2UO+YLc1DIjkxXI7lO5TMacfitoQhPVfRmPqBDETY8ojgTHEB1ijpuwZiZseHIVDW+lm/kuFFT/eGg+pbOXxZHCs5q5i3Ba9R9KwwDZrvxz01pIyl4x4BUzEfEsRL11+REN5/CKETbGsWDDJnc24Uk1y6y2KVDs+gr5pcr7ijajShFi1EH1ha1SzyD2TA2MBlUmR5+Jliu4/+8fkyU4rVkndHFe+gnDxqC+aWg79pTrLBy08FuMdkrj85Ob/v9ovlDcQz/CWZUdxGGG8Z5ytHBQziCkTOVB4zSigwfyJ71LCg7hbKxZTxIYU7DVmPqZOQrGVsyrXeK8ZGpQATWvBsTwvgYrHTo77b/IHgt675nn4Bt8yYz55sWjMRkLaQZ9a6QM2v09lWMynQPj0wPvqL8FjQsc02qUxDZ2mZ8CYwgTHQnpvuvJLRplpB1lcStldSU9g5Xeyq+wQsAsbtg5gQCqH5ghNqMpOo687nq--xXURwMaq0iUqGA0e--ZWeBVeUKTuX6ipoyPDH+5w==
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		52e209498d5fd6dee1e7eb1cf7ea944e
		c355a5ddc047676bfd355655419bb9e1