From c544239e16d5526834370ecd5574589b6fafb97b Mon Sep 17 00:00:00 2001 From: Adam Shannon Date: Mon, 30 Sep 2024 11:59:40 -0500 Subject: [PATCH] test: use directory outside of /var/lib/postgresql --- database/testdata/owncerts.sh | 10 ++++++---- docker-compose.yml | 8 ++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/database/testdata/owncerts.sh b/database/testdata/owncerts.sh index 4b5da08b..d5504b85 100644 --- a/database/testdata/owncerts.sh +++ b/database/testdata/owncerts.sh @@ -1,10 +1,12 @@ #!/bin/bash set -e -chmod 600 /var/lib/postgresql/*.key -chmod 644 /var/lib/postgresql/*.crt +chown -R postgres:postgres /opt/moov/ -chown root:root /var/lib/postgresql/*.key -chown root:root /var/lib/postgresql/*.crt +chmod 600 /opt/moov/certs/*.key +chmod 644 /opt/moov/certs/*.crt + +chown postgres:postgres /opt/moov/certs/*.key +chown postgres:postgres /opt/moov/certs/*.crt ls -l /var/lib/postgresql/ diff --git a/docker-compose.yml b/docker-compose.yml index de76348f..4a6d8db9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -33,7 +33,7 @@ services: restart: always ports: - "5432:5432" - command: -c ssl=on -c ssl_cert_file=/var/lib/postgresql/server.crt -c ssl_key_file=/var/lib/postgresql/server.key -c ssl_ca_file=/var/lib/postgresql/root.crt + command: -c ssl=on -c ssl_cert_file=/opt/moov/certs/server.crt -c ssl_key_file=/opt/moov/certs/server.key -c ssl_ca_file=/opt/moov/certs/root.crt healthcheck: test: ["CMD-SHELL", "pg_isready -U moov"] interval: 5s @@ -46,9 +46,9 @@ services: networks: - intranet volumes: - - ./testcerts/root.crt:/var/lib/postgresql/root.crt - - ./testcerts/server.crt:/var/lib/postgresql/server.crt - - ./testcerts/server.key:/var/lib/postgresql/server.key + - ./testcerts/root.crt:/opt/moov/certs/root.crt + - ./testcerts/server.crt:/opt/moov/certs/server.crt + - ./testcerts/server.key:/opt/moov/certs/server.key - ./database/testdata/owncerts.sh:/docker-entrypoint-initdb.d/owncerts.sh networks: