From 4379aadd877c260fa0b2e22b72f42ab5f28e42c6 Mon Sep 17 00:00:00 2001
From: Yannic Kilcher <yk@users.noreply.github.com>
Date: Tue, 17 Jan 2023 12:21:16 +0100
Subject: [PATCH 1/3] added backup script

---
 docker/Dockerfile.postgres |  2 ++
 docker/backup_pg_to_s3.sh  | 13 +++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100755 docker/backup_pg_to_s3.sh

diff --git a/docker/Dockerfile.postgres b/docker/Dockerfile.postgres
index b5b98c07..b78e5e3b 100644
--- a/docker/Dockerfile.postgres
+++ b/docker/Dockerfile.postgres
@@ -7,3 +7,5 @@ RUN apt-get update && apt-get install -y unzip curl && rm -rf /var/lib/apt/lists
 RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
 RUN unzip -q awscliv2.zip
 RUN ./aws/install
+
+COPY ./backup_pg_to_s3.sh .
\ No newline at end of file
diff --git a/docker/backup_pg_to_s3.sh b/docker/backup_pg_to_s3.sh
new file mode 100755
index 00000000..b3f4ab84
--- /dev/null
+++ b/docker/backup_pg_to_s3.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+set -x
+
+# filename with timestamp
+filename="postgres-$(date +%Y-%m-%d_%H-%M-%S).sql"
+
+# perform pg_dump
+pg_dump -U postgres postgres > /tmp/$filename
+
+# upload to s3
+aws s3 cp /tmp/$filename s3://$S3_BUCKET_NAME/$filename
\ No newline at end of file

From 8b291fb29ab9c8b78f38a58403e9d39514634f40 Mon Sep 17 00:00:00 2001
From: Yannic Kilcher <yk@users.noreply.github.com>
Date: Tue, 17 Jan 2023 12:22:01 +0100
Subject: [PATCH 2/3] fixed pre-commit

---
 docker/Dockerfile.postgres | 2 +-
 docker/backup_pg_to_s3.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile.postgres b/docker/Dockerfile.postgres
index b78e5e3b..5c4aad80 100644
--- a/docker/Dockerfile.postgres
+++ b/docker/Dockerfile.postgres
@@ -8,4 +8,4 @@ RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2
 RUN unzip -q awscliv2.zip
 RUN ./aws/install
 
-COPY ./backup_pg_to_s3.sh .
\ No newline at end of file
+COPY ./backup_pg_to_s3.sh .
diff --git a/docker/backup_pg_to_s3.sh b/docker/backup_pg_to_s3.sh
index b3f4ab84..86ef1691 100755
--- a/docker/backup_pg_to_s3.sh
+++ b/docker/backup_pg_to_s3.sh
@@ -10,4 +10,4 @@ filename="postgres-$(date +%Y-%m-%d_%H-%M-%S).sql"
 pg_dump -U postgres postgres > /tmp/$filename
 
 # upload to s3
-aws s3 cp /tmp/$filename s3://$S3_BUCKET_NAME/$filename
\ No newline at end of file
+aws s3 cp /tmp/$filename s3://$S3_BUCKET_NAME/$filename

From 1b41f8bbfc67febc947d5cba98d84cedba1e37c8 Mon Sep 17 00:00:00 2001
From: Yannic Kilcher <yk@users.noreply.github.com>
Date: Tue, 17 Jan 2023 12:22:10 +0100
Subject: [PATCH 3/3] fixed pre-commit

---
 ansible/deploy-to-node.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ansible/deploy-to-node.yaml b/ansible/deploy-to-node.yaml
index e8cd9757..f1cfe001 100644
--- a/ansible/deploy-to-node.yaml
+++ b/ansible/deploy-to-node.yaml
@@ -73,8 +73,7 @@
             "{{ lookup('ansible.builtin.env', 'AWS_ACCESS_KEY') }}"
           AWS_SECRET_ACCESS_KEY:
             "{{ lookup('ansible.builtin.env', 'AWS_SECRET_KEY') }}"
-          AWS_DEFAULT_REGION:
-            "{{ lookup('ansible.builtin.env', 'S3_REGION') }}"
+          AWS_DEFAULT_REGION: "{{ lookup('ansible.builtin.env', 'S3_REGION') }}"
         volumes:
           - "oasst-{{ stack_name }}-postgres-{{ item.name
             }}:/var/lib/postgresql/data"