From 2690acdf631d183b32a8609407d957f8d51368c7 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Sun, 28 Jan 2024 00:38:05 -0500
Subject: [PATCH] Adding CMD to postgres dockerfile.

---
 ansible/roles/postgres/tasks/main.yml | 2 +-
 docker/postgres/Dockerfile            | 5 ++---
 docker/postgres/postgresql-13.conf.j2 | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ansible/roles/postgres/tasks/main.yml b/ansible/roles/postgres/tasks/main.yml
index c90c0b2bf..2e3e3ae4e 100644
--- a/ansible/roles/postgres/tasks/main.yml
+++ b/ansible/roles/postgres/tasks/main.yml
@@ -58,6 +58,7 @@
     state: present
 
 - name: Start postgres docker containers
+  become: yes
   docker_container:
     name: postgres
     image: newsblur/postgres:13
@@ -76,7 +77,6 @@
           - postgres
     ports:
       - 5432:5432
-    user: "{{ ansible_effective_user_id|int }}:{{ ansible_effective_group_id|int }}"
     volumes:
       - /srv/newsblur/docker/volumes/postgres/data:/var/lib/postgresql/data
       - /srv/newsblur/docker/volumes/postgres/archive:/var/lib/postgresql/archive
diff --git a/docker/postgres/Dockerfile b/docker/postgres/Dockerfile
index 541189d06..0621aa598 100644
--- a/docker/postgres/Dockerfile
+++ b/docker/postgres/Dockerfile
@@ -2,8 +2,7 @@ FROM postgres:13
 
 RUN apt update && apt install -y openssh-client rsync
 
-RUN usermod -u 1000 postgres
-RUN groupmod -g 1001 postgres
-
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
+
+CMD ["postgres", "-c", "config_file=/etc/postgresql/postgresql.conf"]
diff --git a/docker/postgres/postgresql-13.conf.j2 b/docker/postgres/postgresql-13.conf.j2
index 108c23399..33af3b38d 100644
--- a/docker/postgres/postgresql-13.conf.j2
+++ b/docker/postgres/postgresql-13.conf.j2
@@ -249,8 +249,8 @@ archive_command = 'test ! -f /var/lib/postgresql/archive/%f && cp -f %p /var/lib
 
 # These are only used in recovery mode.
 
-# restore_command = 'rsync -a -e "ssh -i /var/lib/postgresql/.ssh/id_rsa" db-postgres.service.consul:/srv/newsblur/docker/volumes/postgres/archive/%f "%p"'
-restore_command = 'cp /var/lib/postgresql/archive/%f %p'		# command to use to restore an archived logfile segment
+restore_command = 'rsync -a -e "ssh -i /var/lib/postgresql/.ssh/id_rsa" nb@db-postgres.service.consul:/srv/newsblur/docker/volumes/postgres/archive/%f "%p"'
+# restore_command = 'cp /var/lib/postgresql/archive/%f %p'		# command to use to restore an archived logfile segment
 				# placeholders: %p = path of file to restore
 				#               %f = file name only
 				# e.g. 'cp /mnt/server/archivedir/%f %p'