From 56ff4ea7c369426ae2a1f1e8ca76e2c64ae0adc9 Mon Sep 17 00:00:00 2001
From: javielico <javier@javiersanchez.net>
Date: Fri, 11 Nov 2022 16:04:33 +0000
Subject: [PATCH 1/7] Add oauth2_client options

---
 app.ini.tmpl | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app.ini.tmpl b/app.ini.tmpl
index 64f01ef..ec30369 100644
--- a/app.ini.tmpl
+++ b/app.ini.tmpl
@@ -57,6 +57,15 @@ MAILER_TYPE    = smtp
 IS_TLS_ENABLED = true
 {{ end }}
 
+{{ if eq (env "GITEA_OAUTH2_CLIENT_ENABLED") "1" }}
+[oauth2_client]
+REGISTER_EMAIL_CONFIRM = {{ env "GITEA_REGISTER_EMAIL_CONFIRM" }}
+ENABLE_AUTO_REGISTRATION = {{ env "GITEA_ENABLE_AUTO_REGISTRATION" }}
+USERNAME = {{ env "GITEA_OAUTH2_USERNAME" }}
+UPDATE_AVATAR = {{ env "GITEA_UPDATE_AVATAR" }}
+ACCOUNT_LINKING = {{ env "GITEA_ACCOUNT_LINKING" }}
+{{ end }}
+
 [markup.restructuredtext]
 ENABLED         = true
 FILE_EXTENSIONS = .rst

From fa1c5dc4e7f9c8bfcc76a301ef40de96337eea37 Mon Sep 17 00:00:00 2001
From: javielico <javier@javiersanchez.net>
Date: Fri, 11 Nov 2022 16:09:27 +0000
Subject: [PATCH 2/7] Adding variables to .env.sample

---
 .env.sample | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.env.sample b/.env.sample
index 957f4cb..e5e254e 100644
--- a/.env.sample
+++ b/.env.sample
@@ -31,3 +31,10 @@ SECRET_SECRET_KEY_VERSION=v1 # length=64
 # GITEA_SMTP_MAILER_ENABLED=1
 # GITEA_MAILER_HOST=mail.gandi.net:465
 # SECRET_SMTP_PASSWORD_VERSION=v1
+
+# OATH2 Options
+# GITEA_REGISTER_EMAIL_CONFIRM=replace-me
+# GITEA_REGISTER_EMAIL_CONFIRM=replace-me
+# GITEA_OAUTH2_USERNAME=replace-me
+# GITEA_UPDATE_AVATAR=replace-me
+# GITEA_ACCOUNT_LINKING=replace-me

From 19601df7d913804124daa52367579cb73ef6acc3 Mon Sep 17 00:00:00 2001
From: javielico <javier@javiersanchez.net>
Date: Fri, 11 Nov 2022 16:10:38 +0000
Subject: [PATCH 3/7] Adding vars to compose.yml

---
 compose.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/compose.yml b/compose.yml
index 16db624..e041657 100644
--- a/compose.yml
+++ b/compose.yml
@@ -32,6 +32,11 @@ services:
       - GITEA_SSH_PORT
       - GITEA_DISABLE_GRAVATAR
       - GITEA_ENABLE_FEDERATED_AVATAR
+      - GITEA_REGISTER_EMAIL_CONFIRM
+      - GITEA_ENABLE_AUTO_REGISTRATION
+      - GITEA_OAUTH2_USERNAME
+      - GITEA_UPDATE_AVATAR
+      - GITEA_ACCOUNT_LINKING
     volumes:
       - data:/var/lib/gitea
       - config:/etc/gitea

From 9f17346d10cbbcf98865264f1ff83d7f63f0b580 Mon Sep 17 00:00:00 2001
From: javielico <javier@javiersanchez.net>
Date: Fri, 11 Nov 2022 16:11:33 +0000
Subject: [PATCH 4/7] Version bump

---
 abra.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/abra.sh b/abra.sh
index 29b9c29..2583802 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,4 +1,4 @@
-export APP_INI_VERSION=v8
+export APP_INI_VERSION=v9
 export DOCKER_SETUP_SH_VERSION=v1
 
 abra_backup_app() {

From 567c31f7d204f5273e3d686e9c811b7d461ef19d Mon Sep 17 00:00:00 2001
From: javielico <javier@javiersanchez.net>
Date: Fri, 11 Nov 2022 16:15:34 +0000
Subject: [PATCH 5/7] Up versions of gitea and mariadb

---
 compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compose.yml b/compose.yml
index e041657..b4efdd6 100644
--- a/compose.yml
+++ b/compose.yml
@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: "gitea/gitea:1.17.2-rootless"
+    image: "gitea/gitea:1.17.3-rootless"
     configs:
       - source: app_ini
         target: /etc/gitea/app.ini
@@ -61,7 +61,7 @@ services:
         - coop-cloud.${STACK_NAME}.version=1.3.0+1.17.2-rootless
 
   db:
-    image: "mariadb:10.6"
+    image: "mariadb:10.9"
     command: |
       mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     environment:

From f6808c7c09b80c3e187fcd200a7a0e16a559827b Mon Sep 17 00:00:00 2001
From: javielico <javier@javiersanchez.net>
Date: Fri, 11 Nov 2022 16:47:52 +0000
Subject: [PATCH 6/7] Adding GITEA_OAUTH2_CLIENT_ENABLED to compose.yml and
 .env.sample

---
 .env.sample | 1 +
 compose.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.env.sample b/.env.sample
index e5e254e..9accacd 100644
--- a/.env.sample
+++ b/.env.sample
@@ -38,3 +38,4 @@ SECRET_SECRET_KEY_VERSION=v1 # length=64
 # GITEA_OAUTH2_USERNAME=replace-me
 # GITEA_UPDATE_AVATAR=replace-me
 # GITEA_ACCOUNT_LINKING=replace-me
+# GITEA_OAUTH2_CLIENT_ENABLED=replace-me
diff --git a/compose.yml b/compose.yml
index b4efdd6..15d8dd4 100644
--- a/compose.yml
+++ b/compose.yml
@@ -37,6 +37,7 @@ services:
       - GITEA_OAUTH2_USERNAME
       - GITEA_UPDATE_AVATAR
       - GITEA_ACCOUNT_LINKING
+      - GITEA_OAUTH2_CLIENT_ENABLED
     volumes:
       - data:/var/lib/gitea
       - config:/etc/gitea

From 1ff3082dfcc181bdf7bd87a8ed0ea88a4281843d Mon Sep 17 00:00:00 2001
From: javielico <javier@javiersanchez.net>
Date: Sun, 13 Nov 2022 00:45:23 +0000
Subject: [PATCH 7/7] Bump version up on compose.yml

---
 compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose.yml b/compose.yml
index 15d8dd4..a94b4e2 100644
--- a/compose.yml
+++ b/compose.yml
@@ -59,7 +59,7 @@ services:
         - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)"
         - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh"
         - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}"
-        - coop-cloud.${STACK_NAME}.version=1.3.0+1.17.2-rootless
+        - coop-cloud.${STACK_NAME}.version=1.3.1+1.17.3-rootless
 
   db:
     image: "mariadb:10.9"