From b286596765434c4e45a97bf5bd6ef35715342671 Mon Sep 17 00:00:00 2001
From: Tobias Reisinger <tobias@msrg.cc>
Date: Sat, 3 Jun 2023 03:35:37 +0200
Subject: [PATCH] Add some scripts and fix small issues

---
 _utils/cert-basic.sh       | 26 ++++++++++++++++++++++++++
 gitea/.env                 |  2 +-
 gitea/docker-compose.yml   |  2 +-
 synapse/docker-compose.yml |  2 +-
 watchtower/run-once.sh     |  3 +++
 5 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100755 _utils/cert-basic.sh
 create mode 100755 watchtower/run-once.sh

diff --git a/_utils/cert-basic.sh b/_utils/cert-basic.sh
new file mode 100755
index 0000000..89a4394
--- /dev/null
+++ b/_utils/cert-basic.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env sh
+
+LEGO_WORKING_PATH="/opt/services/.lego/"
+
+set -e
+
+domain="$1"
+
+action="$2" # either "run" or "renew"
+if [ -z "$action" ] || [ -z "$domain" ]; then
+    echo "Usage: $0 <domain> <run|renew>"
+    exit 1
+fi
+if [ "$action" != "run" ] && [ "$action" != "renew" ]; then
+    echo "Usage: $0 <domain> <run|renew>"
+    exit 1
+fi
+
+export ACME_DNS_API_BASE="https://acme.serguzim.me/"
+export ACME_DNS_STORAGE_PATH="$LEGO_WORKING_PATH/acme-dns.json"
+
+lego -a --email "tobias@msrg.cc" \
+    --path "$LEGO_WORKING_PATH" \
+    --dns "acme-dns" \
+    --domains "$domain" \
+    "$action"
diff --git a/gitea/.env b/gitea/.env
index 1fce649..83b2fba 100644
--- a/gitea/.env
+++ b/gitea/.env
@@ -36,7 +36,7 @@ GITEA__service__NO_REPLY_ADDRESS="discard.msrg.cc"
 GITEA__webhook__DELIVER_TIMEOUT="60"
 
 GITEA__mailer__ENABLED="true"
-GITEA__mailer__PROTOCOL="smtp+startls"
+GITEA__mailer__PROTOCOL="smtp+starttls"
 GITEA__mailer__SMTP_ADDR="mail.serguzim.me"
 GITEA__mailer__SMTP_PORT="587"
 GITEA__mailer__FROM="Gitea <git@serguzim.me>"
diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml
index 6e9ed13..06f782c 100644
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   server:
-    image: gitea/gitea:1.18
+    image: gitea/gitea:1.19
     container_name: gitea
     labels:
       com.centurylinklabs.watchtower.enable: true
diff --git a/synapse/docker-compose.yml b/synapse/docker-compose.yml
index e9cbb4b..7766a8f 100644
--- a/synapse/docker-compose.yml
+++ b/synapse/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
 
   synapse:
-    image: docker.io/matrixdotorg/synapse:latest
+    image: ghcr.io/matrix-org/synapse
     restart: always
     labels:
       com.centurylinklabs.watchtower.enable: true
diff --git a/watchtower/run-once.sh b/watchtower/run-once.sh
new file mode 100755
index 0000000..535100a
--- /dev/null
+++ b/watchtower/run-once.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+
+docker compose run -e WATCHTOWER_RUN_ONCE=true -e WATCHTOWER_NOTIFICATIONS= watchtower