From ea46d763a264dc8cd1c3d7ab655e4b8f849cfae2 Mon Sep 17 00:00:00 2001 From: Prajakta Purohit Date: Mon, 25 Nov 2019 08:20:28 -0800 Subject: [PATCH] Add sslmode = disable by default. Deleted an unnecessary command --- .../omnibus-external-postgresql/files/provision-postgres.sh | 6 ++---- .../templates/chef-server.rb.tpl | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/terraform/aws/scenarios/omnibus-external-postgresql/files/provision-postgres.sh b/terraform/aws/scenarios/omnibus-external-postgresql/files/provision-postgres.sh index 50086f54435..1bdaee42152 100755 --- a/terraform/aws/scenarios/omnibus-external-postgresql/files/provision-postgres.sh +++ b/terraform/aws/scenarios/omnibus-external-postgresql/files/provision-postgres.sh @@ -1,7 +1,7 @@ echo "deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main" > /etc/apt/sources.list.d/pgdg.list wget --quiet https://www.postgresql.org/media/keys/ACCC4CF8.asc apt-key add ACCC4CF8.asc -echo "hoping something along these lines will help: https://unix.stackexchange.com/questions/389156/how-to-fix-held-broken-packages" +echo "hoping something along these lines will help fix unmet and held deps error: https://unix.stackexchange.com/questions/389156/how-to-fix-held-broken-packages" echo "configure" dpkg --configure -a echo "update" @@ -14,12 +14,10 @@ echo "install ssl-cert" apt-get install ssl-cert -y echo "install sysstat" apt-get install sysstat -y -echo "install -f1" +echo "install -f" apt-get install -f echo "install postgres" apt-get install postgresql-9.6 -y -echo "install -f2" -apt-get install -f echo "host all all $1/32 md5" >> /etc/postgresql/9.6/main/pg_hba.conf echo "listen_addresses='*'" >> /etc/postgresql/9.6/main/postgresql.conf service postgresql restart diff --git a/terraform/aws/scenarios/omnibus-external-postgresql/templates/chef-server.rb.tpl b/terraform/aws/scenarios/omnibus-external-postgresql/templates/chef-server.rb.tpl index 0ed479858a0..6ed36cbe1a3 100644 --- a/terraform/aws/scenarios/omnibus-external-postgresql/templates/chef-server.rb.tpl +++ b/terraform/aws/scenarios/omnibus-external-postgresql/templates/chef-server.rb.tpl @@ -15,6 +15,7 @@ postgresql['port'] = 5432 postgresql['db_superuser'] = "bofh" postgresql['db_superuser_password'] = "i1uvd3v0ps" postgresql['external'] = true +postgresql['sslmode'] = "disable" opscode_erchef['db_pool_size'] = 10 oc_id['db_pool_size'] = 10 oc_bifrost['db_pool_size'] = 10