diff --git a/ansible/roles/postgres/tasks/main.yml b/ansible/roles/postgres/tasks/main.yml index 3fff606ad..c90c0b2bf 100644 --- a/ansible/roles/postgres/tasks/main.yml +++ b/ansible/roles/postgres/tasks/main.yml @@ -51,9 +51,9 @@ - name: Build the custom postgres docker image docker_image: name: newsblur/postgres:13 + source: build build: - path: /srv/newsblur/docker/postgres/Dockerfile.postgres - pull: yes + path: /srv/newsblur/docker/postgres/ force_tag: yes state: present diff --git a/docker/postgres/Dockerfile.postgres b/docker/postgres/Dockerfile similarity index 100% rename from docker/postgres/Dockerfile.postgres rename to docker/postgres/Dockerfile diff --git a/docker/postgres/postgresql-13.conf.j2 b/docker/postgres/postgresql-13.conf.j2 index 108c23399..109a4af03 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" 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'