Revert database settings

config/credentials.example.yml

@@ -2,10 +2,6 @@ devise_pepper: 8515ff1197799eed94dc596257f7e459e564bad2e9664d0f77755564eca0e656e
 devise_secret_key: b5befc05ddfc36049bad568d325a2b0556f92e0701218aa3d662e96ebd2db19f2c8f9e56d046c38938bf94e9a06e8cae59215d591274d3a6de5cb76ca0f4e72e
 github_client_id: b657ae74187b2166988f
 github_client_secret: 64875198becbc7b301d308fd500ad552506d19f7
-postgres_password:
-  doadmin: 13e446bca0e424ce3cc95e2ca23e676a
-  partynest_public: a2f42510af9148bebf486811e52e3be3
-  partynest_staff: ae9e2e490fe21d52c767635956313563
 rails_cache_redis_password: 6be482269cb7812bceda2d5f2fc5c35f
 raven_dsn: https://c2135b1d5f8fb794379ee872f12ab4ea:3d96e586a0099b6fde62460c3f72415f@sentry.io/6865229
 recaptcha_secret_key: 6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe

config/credentials.yml.enc

@@ -1 +1 @@
-VvnbGspthIXPFXXd61dRZ/CGDBqZfTTyHUOqL0UEY2J9PrnTzymEH2FJVh/vcQaG6BfrJi/wEDbH1qxl7VUgT1CHLWcNHWEVhTBawHoFAh45h1gHSvqgf0tIJnD33M+M0ooFNlaPsJe43rhmGZY/9AHir79VuGGkiB1sk9QIXdGcJVt/FKK1EIBi4WR5GjXA/fDtGHvjCQa0DgsNvkStXbO7J8H8yBgMhMhaR90LLGwBuDJ7EVvDgrCicWH7YyRD62KBR5GU2Yo+C6c8PRjfxBpt/+j6KmesDc/XwRm0ZjP1sfZMABPYHqluoSuF18Nw3ReZQggZGBthS4IBI6UTecpofrmQ9Gf2MiLp/pO84oWuEjjP7ZgGqcsEs618gkz106TRjCL6dOiEjAf+rrRX0FUPqiMn57HeT6nptHKJk3M0N+AP6tvKCZ58McL2soXlPGlJEWgRMSGheVGfEIDAL+yTPOsBIkDCCbpN40I4x2cqr6Y+2aVgM+8joU6EsQlTq9xkScGkgIVXKAj2EVKCDDhTG0RZOL4R8P0f/VgnQ0ALDJbpWpewYuJU80GGYgrc6RJqh9RB0pmhTytb6ysdFC8jp0Cn9wcSQA+y5YVlUPBY4mTBFXTrSN9SR7DZnJZdlRKVdyuFvqwWaQuXuRc1mvVTmAPk7nTnd7avl4HMkYdWJwJVlpsP3y6NMZwPIm94HZMJPULE4fIShxZqSOtYDWoMFWY7AJaiQL/89ex2F+rskLhiB0CwJSx3YxJmtyVJeA18NV59HQvXhOjbA10cxIb1fYGFV60HNZWmsituhgWUQonJYw44Tapy6TyuQnsVqFYHU4nekIrE53YKUiunx/XRym2rjbPQlYNt0maDVTYgXHsbvCaal5vEqAIW77O/xjeIQM78kVx+BHtkugw3eLm304Qmhrh0nip7J1ohT7uX1u4229ndrVW+wS5IYvOZdwBYyaYt6X6NFDsASCZIqUf2z6bdsdpAlZZEuvYO2xEdEvvx99bmpnM1UoEGS7WdSvgmCeuIAFOoVOXg5naPNQ8jR+SyIgsMcQoMpllgrw9CUiqs6mh9K79x4Rb8oDq1f6CaXvqeR9bSeF3DGoVCvXSfJ2Z6WXJ15eGduV/sj9GQ9sjL1NtW6mIBHwqFWdVSiBO7a2q0p0pxHF+bgrRMD41vb9ViztpvDs7LYT2Q41rqiYGduGDHsZrPs1JrWbdWMyIiV/3QtRMNJSp+cxUro8edex7sIf2BMPwLQMnGfReWt3J5puloQwjxuW6q2jUd+zaX+wu4YXxsvG5RMLKAwQkjZa77/rA+WW3d3R0oFN+S1x5IB1TXFWn5qjVwdMfNJAL7kvMvq66XT7BhJG10IgKq38wYb3fSjbbcWiqzz/Q4CCIgIPhBoAl9qLIWjSoqXFNeEDpzr7TgjpzybwDzsVtQXl1pEkiNAKoD3Ytxuf3E0LF0QbbBMmfLBcWTis1Kc0+KElYoyZZYpBNCSTrtGUC+FSKfpY6jScuzakCxXSAGKHyWAf/UOA160ouY1s/cVdJjrS6OYbkRaubKMdoargZBIpVKuAcMKTblZhM=--bn6VI+TTwhmwsUrv--AxL/HMprvl8vf9H6uioRDg==
+J0m9Z7Phq0YeoEdAxYsNF2i9bF2++2uvTlUAKuJXkQE0NpVpGRjk6BUtm9qRhCzYoOsTa/ZB6T+DX25gc9umfPyKqVItYReKG855uJpO25CdmRVMdZM1WKLS/SRyaduskUnxJLUP1zmslnz44a4iGIg3dKMjUwFGZSQBMuB2myvGFfYsRCt6Yaq3zkA5W+AVjbuwGf2Deqn3fHU0A/MU4rMUTKR6WCzox0L4ZEy0y3v/yxZ+oUWh95IsTrtl3JJAWZCj9GVXdegT2+AtEcQ1HUb14xLTK39dRN1AXhuZLfnKuq1Hw8iHEGpAcic8LoBgpQ7Kqw1tC0PZbDa6ayQOCanppvk3q0ms40QL4XJggRXs+Ioc7k5u5QCQvBW1lj13A7imtH8hknKdR2S+86k6k5dN7yi2kCvc1BjMG+GOmhioC/Z5YDpRIlYsO9I29pFLxNJqMcRgwVKHEwMhTi0Zn85+15vGfIVOOyrvVSCLreZKb1yqJAXXwC5ASuMB9GeIHyMcogmuEWGxsDhIGzWH57SFwXlCCN96mK7dezCpse/olfuMi9U1HWdvKaufK4SEIAnSSHvFSFRzJ2NLfUHo+BOR0wA3dDCg6TMLMBabDP/sygrF+iN36/ulllAKQEgx+tWBvE9zDB6trm20TLDqRsz0jdd4NwQwbZYJKl4DYIFgqvTjmf902RqKBh8Y2tEujN3Qaz5FKodW63ZfQ/FWC/4faucS2ChYQfohdxBsA8nvs3h6OwbRjG7KJbtilhSgoN5XtnMX9Gq+U0/OfjF59vLiUnLJr+saoINN9uL7UhfHKBaJ8yoebotb4FGaNCvgldRb/Doe6l5gK7J1kxAUwNd7kd3nMlWUCTJXtUKgU6bXoEEf6s3RYHPwOPIAMS9lODicm67lEMbEqTVQqFZpX8g59MJHPCvanYpjvj6tTrvhMF9hRSMBushsbTv/5BVcx+MovWceC+Y7ZkObdtIxhduzCV/WD3Z9hszjTXGctCxE1UUR9O42OT5yHeRvWI8YzfSiFqejnVcFntswY1uCpIWCvp3voYKWd6nzHx+ra1V8N1BHvpN0FWbabfJpsbn5uHYBW1X55R8is8MeFOOGTdtfRYGHOKjuDkkhx/Sl5GnbA8a2i+Q0QR3InrCgmo2sUJBNK2yXeJM6rc1/DVV//KEc5Gms8v+66H4/tkbBhMAyd4bk9CQ0pLlHlofe48FXbBxPhbeSfTlFxvgxLUudthn+y0lj5ztD5lkx0mlzi1t8IIOWd/JQcPovl1iEvfi9tvBthYB/QbFDLcqsGKda/fYyglx4vx4W+qm5oTaecW+tRqghPcH+PZYS8IpuUSPiet+PJoVwXDV787OMtFD6aA+AslypYju8ndNJ061SxKdR1jQw2LR+1FKLkNfcLZ37JizqYFL5GhQ=--ZZYhW+xybk3u1AUe--jve7auKgLl2lOQb/OyarDA==

config/database.yml

@@ -4,10 +4,10 @@ default: &default
   pool:     <%= ENV.fetch('POSTGRES_POOL') { 5 } %>
   host:     <%= ENV.fetch('POSTGRES_HOST') { 'localhost' } %>
   port:     <%= ENV.fetch('POSTGRES_PORT') { 5432 } %>
+  username: <%= ENV.fetch('POSTGRES_USER') { 'partynest' } %>
 
 unsafe: &unsafe
   <<: *default
-  username: <%= ENV.fetch('POSTGRES_USER') { 'partynest' } %>
   password: <%= ENV.fetch('POSTGRES_PASSWORD') { 'password' } %>
 
 development:
@@ -24,5 +24,4 @@ cucumber:
 production:
   <<: *default
   database: <%= ENV.fetch('POSTGRES_DB') { 'partynest_production' } %>
-  username: <%= ENV.fetch('POSTGRES_USER') { 'doadmin' } %>
-  password: <%= Rails.application.credentials.postgres_password[ENV.fetch('POSTGRES_USER') { 'partynest' }.to_sym] %>
+  password: 'password'

config/deploy/production.rb

@@ -2,4 +2,4 @@
 
 server 'partynest.libertarian-party.com', roles: %w[web app]
 
-server 'partynest-staff.libertarian-party.com', roles: %w[web app db]
+server 'partynest-staff.libertarian-party.com', roles: %w[web app]