Merge pull request #2 from zalando/feature/snakeoil_certificate

Feature/snakeoil certificate
zalando · May 19, 2015 · b8c5b17 · b8c5b17
2 parents 7a6e63d + e20a14e
commit b8c5b17
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 88 deletions.
diff --git a/postgres-appliance/Dockerfile b/postgres-appliance/Dockerfile
@@ -44,12 +44,12 @@ RUN curl -L https://github.com/coreos/etcd/releases/download/v${ETCDVERSION}/etc
 
 ENV PATH $PATH:/usr/lib/postgresql-${PGVERSION}/bin
 
+# Copy the snakeoil certificates for usage as dummy certificates
+RUN cp /etc/ssl/private/ssl-cert-snakeoil.key /home/postgres/dummy.key && cp /etc/ssl/certs/ssl-cert-snakeoil.pem /home/postgres/dummy.crt
+
 ADD postgres_ha.sh  /home/postgres/
-ADD certs/dummy.key /home/postgres/
-ADD certs/dummy.crt /home/postgres/
 RUN chown postgres:postgres /home/postgres -R
 RUN chmod 700 /home/postgres/postgres_ha.sh
-RUN chmod 700 /home/postgres/dummy.key
 
 ENV ETCD_DISCOVERY_URL postgres.acid.example.com
 ENV SCOPE test

diff --git a/postgres-appliance/certs/dummy.crt b/postgres-appliance/certs/dummy.crt
diff --git a/postgres-appliance/certs/dummy.key b/postgres-appliance/certs/dummy.key
diff --git a/postgres-appliance/postgres_ha.sh b/postgres-appliance/postgres_ha.sh
@@ -38,7 +38,9 @@ postgresql:
     archive_timeout: 1800s
     max_replication_slots: 5
     hot_standby: "on"
-    ssl: "off"
+    ssl: "on"
+    ssl_cert_file: "/home/postgres/dummy.crt"
+    ssl_key_file: "/home/postgres/dummy.key"
   recovery_conf:
     restore_command: "envdir ${WALE_ENV_DIR} wal-e --aws-instance-profile wal-fetch \"%f\" \"%p\" -p 1"
 __EOF__