From ead7a6ea6cd6c1ebe1933b237cd40ecbff08b68c Mon Sep 17 00:00:00 2001
From: Ruben <sneexy@disroot.org>
Date: Sat, 4 Oct 2025 02:38:59 -0500
Subject: [PATCH] cleanup, helperbot fixes

---
 helperbot                                     |  6 +++-
 neptunium/srv/docker/postgres/compose.yaml    |  2 +-
 .../srv/docker/postgres/db/postgresql.conf    | 28 +++++++++++++++++++
 phosphorus/srv/docker/postgres/compose.yaml   |  1 -
 4 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 neptunium/srv/docker/postgres/db/postgresql.conf

diff --git a/helperbot b/helperbot
index b0769c8..2e127bd 100755
--- a/helperbot
+++ b/helperbot
@@ -448,6 +448,7 @@ function system_backup {
         postgres_backup postgres-db-1 zitadel zitadel $backup_working_directory
         # configs, extra
         cp $backup_local_folder/zitadel/compose.yaml $backup_working_directory/zitadel
+        cp $backup_local_folder/zitadel/.env $backup_working_directory/zitadel
         # =============================================================================
         # freshrss
         echo "${blue}Pulling in FreshRSS...${normal}"
@@ -458,6 +459,7 @@ function system_backup {
         # configs, extra
         cp -r $backup_local_folder/freshrss/extensions $backup_working_directory/freshrss
         cp $backup_local_folder/freshrss/compose.yaml $backup_working_directory/freshrss
+        cp $backup_local_folder/freshrss/.env $backup_working_directory/freshrss
         # =============================================================================
         # vaultwarden
         echo "${blue}Pulling in Vaultwarden...${normal}"
@@ -496,8 +498,10 @@ function system_backup {
         # database
         postgres_backup postgres-db-1 forgejo forgejo $backup_working_directory
         cp -r $backup_local_folder/forgejo/forgejo $backup_working_directory/forgejo
+        cp -r $backup_local_folder/forgejo/runner $backup_working_directory/forgejo
         # configs, extra
         cp $backup_local_folder/forgejo/compose.yaml $backup_working_directory/forgejo
+        cp $backup_local_folder/forgejo/.env $backup_working_directory/forgejo
         # =============================================================================
         # ask-js
         echo "${blue}Pulling in Ask-js...${normal}"
@@ -612,7 +616,7 @@ function docker_cleanup {
 # (for context: certificates are handled automatically by caddy. we just pull them out of caddy's special home directory to make some of them accessible to other services we run like email and xmpp)
 function update_certificates {
     # internal values - caddy's home may change at random
-    local caddy_home_directory=/var/lib/caddy/.local/share/caddy/certificates/acme-v02.api.letsencrypt.org-directory
+    local caddy_home_directory=/srv/docker/caddy/caddy_data/caddy/certificates/acme-v02.api.letsencrypt.org-directory
     local known_domains=("synth.download" "mx1.synth.download" "xmpp.synth.download" "muc.xmpp.synth.download" "upload.xmpp.synth.download" "proxy.xmpp.synth.download" "pubsub.xmpp.synth.download")
     local certs_location=/etc/certs
     
diff --git a/neptunium/srv/docker/postgres/compose.yaml b/neptunium/srv/docker/postgres/compose.yaml
index 0fbd260..614cf0c 100644
--- a/neptunium/srv/docker/postgres/compose.yaml
+++ b/neptunium/srv/docker/postgres/compose.yaml
@@ -3,7 +3,7 @@ services:
     # custom image for docker with pgroonga support
     image: groonga/pgroonga:latest-alpine-17
     restart: always
-    shm_size: 6GB
+    shm_size: 4GB
     volumes:
       - ./db:/var/lib/postgresql/data
     networks:
diff --git a/neptunium/srv/docker/postgres/db/postgresql.conf b/neptunium/srv/docker/postgres/db/postgresql.conf
new file mode 100644
index 0000000..f3440d0
--- /dev/null
+++ b/neptunium/srv/docker/postgres/db/postgresql.conf
@@ -0,0 +1,28 @@
+# PGTune for Neptunium.
+# Append to the bottom of the autogenerated postgresql.conf file made on first container creation.
+
+# DB Version: 17
+# OS Type: linux
+# DB Type: oltp
+# Total Memory (RAM): 8 GB
+# CPUs num: 4
+# Connections num: 300
+# Data Storage: ssd
+
+max_connections = 300
+shared_buffers = 2GB
+effective_cache_size = 6GB
+maintenance_work_mem = 512MB
+checkpoint_completion_target = 0.9
+wal_buffers = 16MB
+default_statistics_target = 100
+random_page_cost = 1.1
+effective_io_concurrency = 200
+work_mem = 6898kB
+huge_pages = off
+min_wal_size = 2GB
+max_wal_size = 8GB
+max_worker_processes = 4
+max_parallel_workers_per_gather = 2
+max_parallel_workers = 4
+max_parallel_maintenance_workers = 2
\ No newline at end of file
diff --git a/phosphorus/srv/docker/postgres/compose.yaml b/phosphorus/srv/docker/postgres/compose.yaml
index 7d164fd..0fbd260 100644
--- a/phosphorus/srv/docker/postgres/compose.yaml
+++ b/phosphorus/srv/docker/postgres/compose.yaml
@@ -8,7 +8,6 @@ services:
       - ./db:/var/lib/postgresql/data
     networks:
       - postgres_db
-    # default user values
     env_file:
       - .env
     healthcheck: