Change custom config to be overridable

Overv · Dec 5, 2019 · 789ff77 · 789ff77
1 parent 64c66a7
commit 789ff77
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -153,8 +153,7 @@ RUN ln -sf /dev/stdout /var/log/apache2/access.log \
 # Configure PosgtreSQL
 COPY postgresql.custom.conf.tmpl /etc/postgresql/12/main/
 RUN chown -R postgres:postgres /var/lib/postgresql \
-  && chown postgres:postgres /etc/postgresql/12/main/postgresql.custom.conf.tmpl \
-  && echo "\ninclude 'postgresql.custom.conf'" >> /etc/postgresql/12/main/postgresql.conf
+  && chown postgres:postgres /etc/postgresql/12/main/postgresql.custom.conf.tmpl
 RUN echo "host all all 0.0.0.0/0 md5" >> /etc/postgresql/12/main/pg_hba.conf \
       && echo "host all all ::/0 md5" >> /etc/postgresql/12/main/pg_hba.conf
 

diff --git a/run.sh b/run.sh
@@ -3,9 +3,9 @@
 set -x
 
 function createPostgresConfig() {
-  cp /etc/postgresql/12/main/postgresql.custom.conf.tmpl /etc/postgresql/12/main/postgresql.custom.conf
-  sudo -u postgres echo "autovacuum = $AUTOVACUUM" >> /etc/postgresql/12/main/postgresql.custom.conf
-  cat /etc/postgresql/12/main/postgresql.custom.conf
+  cp /etc/postgresql/12/main/postgresql.custom.conf.tmpl /etc/postgresql/12/main/conf.d/postgresql.custom.conf
+  sudo -u postgres echo "autovacuum = $AUTOVACUUM" >> /etc/postgresql/12/main/conf.d/postgresql.custom.conf
+  cat /etc/postgresql/12/main/conf.d/postgresql.custom.conf
 }
 
 function setPostgresPassword() {