From f275a579cfc5bd10ff689bf32c849660e6aabbbf Mon Sep 17 00:00:00 2001
From: Opnxng <opnxng@tuta.io>
Date: Wed, 13 Dec 2023 07:36:36 +0800
Subject: [PATCH] Updated Gitea

---
 back-up.yaml                    |  2 +-
 templates/compose/gitea.yaml.j2 |  7 +++----
 vars/services.yaml              | 16 ++++++++++------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/back-up.yaml b/back-up.yaml
index 529d6d8..5abbd6c 100755
--- a/back-up.yaml
+++ b/back-up.yaml
@@ -208,4 +208,4 @@
     - name: Prune outdated backups
       command: find "{{ backup_path_on_control_host }}/" -type f -mtime +90 -delete
       run_once: true
-      delegate_to: "{{ control_host }}"
\ No newline at end of file
+      delegate_to: "{{ control_host }}"
diff --git a/templates/compose/gitea.yaml.j2 b/templates/compose/gitea.yaml.j2
index 315fdba..6ee4ff8 100644
--- a/templates/compose/gitea.yaml.j2
+++ b/templates/compose/gitea.yaml.j2
@@ -2,7 +2,7 @@
 version: "3"
 services:
   gitea:
-    image: gitea/gitea:1.21-nightly-rootless
+    image: gitea/gitea:1.21.2-rootless
     container_name: gitea
     security_opt:
       - no-new-privileges
@@ -33,7 +33,7 @@ services:
       - gitea
 
   gitea-db:
-    image: postgres:14
+    image: postgres:16-alpine
     container_name: gitea-db
     security_opt:
       - no-new-privileges
@@ -45,6 +45,7 @@ services:
       - POSTGRES_PASSWORD={{ gitea_database_passwd }}
       - POSTGRES_DB={{ gitea_database_name }}
     volumes:
+      - {{ docker_dir }}/gitea/data/dump:/dump
       - {{ docker_dir }}/gitea/data/postgres:/var/lib/postgresql/data
     restart: always
     networks:
@@ -53,5 +54,3 @@ services:
 networks:
   gitea:
     name: gitea
-
-# Cron in Gitea Action only works in Nightly for now
\ No newline at end of file
diff --git a/vars/services.yaml b/vars/services.yaml
index 8128eeb..fbdff0c 100644
--- a/vars/services.yaml
+++ b/vars/services.yaml
@@ -1,10 +1,6 @@
-config:
-  oracle4:
-    - caddy
-
 compose:
-  oracle4:
-    - caddy
+  oracle3:
+    - gitea
 
 # ----------------------------------------------------------------------------------------------------
 
@@ -41,6 +37,7 @@ deployed-compose:
     - binternet
     - watchtower
     - socks5
+    - priviblur
   oracle2:
     - firefox
     - wolfree
@@ -64,6 +61,7 @@ deployed-compose:
     - binternet
     - watchtower
     - socks5
+    - priviblur
   oracle3:
     - breezewiki
     - etherpad
@@ -90,6 +88,7 @@ deployed-compose:
     - binternet
     - watchtower
     - socks5
+    - priviblur
   oracle4:
     - caddy
     - nitter
@@ -116,6 +115,7 @@ deployed-compose:
     - binternet
     - watchtower
     - socks5
+    - priviblur
 
 # ----------------------------------------------------------------------------------------------------
 
@@ -125,10 +125,12 @@ deployed-config:
   oracle1:
     - anonymousoverflow
     - scribe
+    - priviblur
   oracle2:
     - firefox
     - anonymousoverflow
     - scribe
+    - priviblur
   oracle3:
     - ntfy
     - gitea
@@ -137,6 +139,7 @@ deployed-config:
     - breezewiki
     - anonymousoverflow
     - scribe
+    - priviblur
   oracle4:
     - authelia
     - nitter
@@ -144,3 +147,4 @@ deployed-config:
     - caddy
     - anonymousoverflow
     - scribe
+    - priviblur