backups/gitea.sh

@@ -1,21 +0,0 @@
-# Immediatly exit on command failure (e)
-# and quit on unset variables (u)
-set -ue
-
-export BACKUP_REPO=ssh://cttuebak/media/borg/cttue/gitea
-export BACKUP_NAME_DB="db_$(date -u +'%Y-%m-%dT%H:%M%Z')"
-export BACKUP_NAME_DATA="data_$(date -u +'%Y-%m-%dT%H:%M%Z')"
-export BORG_PASSPHRASE=$(cat "$(dirname $0)/borg_passphrase.txt")
-
-# Dump the database into borg create
-echo "Starting Backup of Gitea Database..."
-docker exec gitea_db_1 pg_dump gitea -U gitea |
-    /usr/bin/borg create --compression zstd --stats ${BACKUP_REPO}::${BACKUP_NAME_DB} -
-
-echo "Starting Backup of Gitea Data..."
-/usr/bin/borg create --compression zstd --stats ${BACKUP_REPO}::${BACKUP_NAME_DATA} /srv/docker-containers/gitea/gitea-data
-
-echo "Backup done. Pruning backup-repo..."
-/usr/bin/borg prune -v --list --keep-daily=7 --keep-weekly=7 --keep-monthly=10 --keep-yearly=5 ${BACKUP_REPO}
-
-echo "Done"

backups/matrix.sh

@@ -1,21 +0,0 @@
-# Immediatly exit on command failure (e)
-# and quit on unset variables (u)
-set -ue
-
-export BACKUP_REPO=ssh://cttuebak/media/borg/cttue/matrix
-export BACKUP_NAME_DB="db_$(date -u +'%Y-%m-%dT%H:%M%Z')"
-export BACKUP_NAME_DATA="synapse-storage_$(date -u +'%Y-%m-%dT%H:%M%Z')"
-export BORG_PASSPHRASE=$(cat "$(dirname $0)/borg_passphrase.txt")
-
-# Dump the database into borg create
-echo "Starting Backup of Matrix / Synapse Database..."
-docker exec matrix-postgres pg_dump synapse -U synapse |
-    /usr/bin/borg create --compression zstd --stats ${BACKUP_REPO}::${BACKUP_NAME_DB} -
-
-echo "Starting Backup of Matrix / Synapse Storage..."
-/usr/bin/borg create --compression zstd --stats ${BACKUP_REPO}::${BACKUP_NAME_DATA} /matrix/synapse/storage
-
-echo "Backup done. Pruning backup-repo..."
-/usr/bin/borg prune -v --list --keep-daily=7 --keep-weekly=7 --keep-monthly=10 --keep-yearly=5 ${BACKUP_REPO}
-
-echo "Done"

backups/nginx-proxy.sh

@@ -1,15 +0,0 @@
-# Immediatly exit on command failure (e)
-# and quit on unset variables (u)
-set -ue
-
-export BACKUP_REPO=ssh://cttuebak/media/borg/cttue/nginx-proxy
-export BACKUP_NAME_DATA="data_$(date -u +'%Y-%m-%dT%H:%M%Z')"
-export BORG_PASSPHRASE=$(cat "$(dirname $0)/borg_passphrase.txt")
-
-echo "Starting Backup of nginx-proxy data..."
-/usr/bin/borg create --compression zstd --stats ${BACKUP_REPO}::${BACKUP_NAME_DATA} /srv/docker-containers/nginx-proxy/nginx-data
-
-echo "Backup done. Pruning backup-repo..."
-/usr/bin/borg prune -v --list --keep-daily=7 --keep-weekly=7 --keep-monthly=10 --keep-yearly=5 ${BACKUP_REPO}
-
-echo "Done"

docker-containers/nginx-proxy/docker-compose.yml

@@ -7,10 +7,10 @@ services:
       - 80:80
       - 443:443
     volumes:
-      - ./nginx-data/conf:/etc/nginx/conf.d
-      - ./nginx-data/certs:/etc/nginx/certs
-      - ./nginx-data/vhost:/etc/nginx/vhost.d
-      - ./nginx-data/html:/usr/share/nginx/html
+      - ./conf:/etc/nginx/conf.d
+      - ./certs:/etc/nginx/certs
+      - ./vhost:/etc/nginx/vhost.d
+      - ./html:/usr/share/nginx/html
       - /var/run/docker.sock:/tmp/docker.sock:ro
       - ${PWD}/secure-turn-module:/etc/nginx/modules/secure-turn-module
     networks:
@@ -21,8 +21,8 @@ services:
     volumes_from:
       - nginx-proxy
     volumes:
-      - ./nginx-data/certs:/etc/nginx/certs:rw
-      - ./nginx-data/acme:/etc/acme.sh
+      - ./certs:/etc/nginx/certs:rw
+      - ./acme:/etc/acme.sh
       - /var/run/docker.sock:/var/run/docker.sock:ro
     environment:
       - DEFAULT_EMAIL=codingmarco@gmail.com

docker-containers/pad/docker-compose.yml

@@ -14,7 +14,7 @@ services:
     restart: always
 
   app:
-    image: quay.io/hedgedoc/hedgedoc:1.9.7
+    image: quay.io/hedgedoc/hedgedoc:1.9.4
     environment:
       - CMD_DB_URL=postgres://hedgedoc:hedgedoc@database:5432/hedgedoc
       - CMD_DOMAIN=pad.cttue.de