From 26a1fb2512af49caed7f5b6b6ec344f7a7e63696 Mon Sep 17 00:00:00 2001 From: jem Date: Thu, 31 Dec 2020 13:48:08 +0100 Subject: [PATCH] separate generic backup & app spefic --- .../docker/image/resources/backup-pg-functions.sh | 3 +++ infrastrucure/docker/image/resources/install.sh | 7 +------ infrastrucure/docker/test/serverspec.edn | 4 +--- 3 files changed, 5 insertions(+), 9 deletions(-) create mode 100644 infrastrucure/docker/image/resources/backup-pg-functions.sh diff --git a/infrastrucure/docker/image/resources/backup-pg-functions.sh b/infrastrucure/docker/image/resources/backup-pg-functions.sh new file mode 100644 index 0000000..780b38c --- /dev/null +++ b/infrastrucure/docker/image/resources/backup-pg-functions.sh @@ -0,0 +1,3 @@ +function init-role-repo() { + restic -r ${RESTIC_REPOSITORY}/pg-role -v init +} diff --git a/infrastrucure/docker/image/resources/install.sh b/infrastrucure/docker/image/resources/install.sh index 1256d3b..9f77101 100755 --- a/infrastrucure/docker/image/resources/install.sh +++ b/infrastrucure/docker/image/resources/install.sh @@ -10,10 +10,5 @@ apt-get -qqy install wget postgresql-client-13 restic > /dev/null; update-ca-certificates -install -m 0700 /tmp/entrypoint.sh / - install -m 0400 /tmp/functions.sh /usr/local/lib/ - -install -m 0700 /tmp/init.sh /usr/local/bin/ -install -m 0700 /tmp/backup.sh /usr/local/bin/ -install -m 0700 /tmp/restore.sh /usr/local/bin/ +install -m 0400 /tmp/backup-pg-functions.sh /usr/local/lib/ diff --git a/infrastrucure/docker/test/serverspec.edn b/infrastrucure/docker/test/serverspec.edn index 34f3270..5870ccf 100644 --- a/infrastrucure/docker/test/serverspec.edn +++ b/infrastrucure/docker/test/serverspec.edn @@ -2,6 +2,4 @@ {:name "postgresql-client-13"}] :file [{:path "/entrypoint.sh" :mod "700"} {:path "/usr/local/lib/functions.sh" :mod "400"} - {:path "/usr/local/bin/init.sh" :mod "700"} - {:path "/usr/local/bin/backup.sh" :mod "700"} - {:path "/usr/local/bin/restore.sh" :mod "700"}]} + {:path "/usr/local/lib/backup-pg-functions.sh" :mod "400"}]}