WIP: CORS headers

.env.sample

@@ -1,6 +1,6 @@
 TYPE=gitea
 
-DOMAIN={{ .Domain }}
+DOMAIN=gitea.example.com
 LETS_ENCRYPT_ENV=production
 
 GITEA_DOMAIN=git.example.com
@@ -11,8 +11,6 @@ GITEA_DISABLE_REGISTRATION=false
 GITEA_ENABLE_NOTIFY_MAIL=true
 GITEA_ENABLE_OPENID_SIGNIN=true
 GITEA_ENABLE_OPENID_SIGNUP=true
-GITEA_DISABLE_GRAVATAR=false
-GITEA_ENABLE_FEDERATED_AVATAR=true
 
 GITEA_MAILER_FROM=noreply@example.com
 GITEA_MAILER_USER=noreply@example.com
@@ -26,16 +24,11 @@ SECRET_DB_ROOT_PASSWORD_VERSION=v1
 SECRET_JWT_SECRET_VERSION=v1 # length=43
 SECRET_SECRET_KEY_VERSION=v1 # length=64
 
+GITEA_CORS_ENABLED=0
+# GITEA_CORS_DOMAIN=https://example.org
+
 # SMTP Mailer
 # COMPOSE_FILE="compose.yml:compose.smtp.yml"
 # 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
-# GITEA_OAUTH2_CLIENT_ENABLED=replace-me

README.md

@@ -1,16 +1,16 @@
 # Gitea
 
-[![Build Status](https://build.coopcloud.tech/api/badges/coop-cloud/gitea/status.svg)](https://build.coopcloud.tech/coop-cloud/gitea)
+[![Build Status](https://drone.coopcloud.tech/api/badges/coop-cloud/gitea/status.svg)](https://drone.coopcloud.tech/coop-cloud/gitea)
 
 <!-- metadata -->
-* **Category**: Development
-* **Status**: 3, stable
-* **Image**: [`gitea/gitea`](https://hub.docker.com/gitea/gitea), 4, upstream
-* **Healthcheck**: Yes
+- **Category**: Development
+* **Status**: ❶💚
+- **Image**: [`gitea/gitea`](https://hub.docker.com/gitea/gitea), ❶💚, upstream
+- **Healthcheck**: Yes
 * **Backups**: Yes
-* **Email**: ?
-* **Tests**: 2
-* **SSO**: 3 (OAuth)
+- **Email**: ?
+- **Tests**: ❷💛
+- **SSO**: ❶💚 (OAuth)
 <!-- endmetadata -->
 
 ## Basic usage
@@ -22,40 +22,3 @@
 4. `abra app YOURAPPDOMAIN config` - be sure to change `$DOMAIN` to something that resolves to
    your Docker swarm box
 5. `abra app YOURAPPDOMAIN deploy`
-
-## Create first user
-
-Run
-
-```bash
-abra app run YOURAPPNAME app gitea -c /etc/gitea/app.ini admin user create --username USERNAME --admin --random-password --email EMAIL
-```
-
-See the [Gitea command-line documentation](https://docs.gitea.io/en-us/command-line/) for more options.  Make sure not to forget the `-c /etc/gitea/app.ini`.
-
-## Enable SSH
-
-You most certainly want to be able to access your repository over SSH.  To do so, make sure you uncomment the right lines in the configuration for `traefik`.
-```
-abra app config YOURTRAEFIKAPP
-```
-There uncomment or add these lines:
-```
-GITEA_SSH_ENABLED=1
-COMPOSE_FILE="compose.yml:compose.gitea.yml"
-```
-Then redeploy traefik:
-```
-abra app undeploy YOURTRAEFIKAPP
-abra app deploy YOURTRAEFIKAPP
-```
-You might need to wait a bit.  To check if it worked, you can run
-```
-telnet my.gitea.example.com 2222
-```
-Once you have added a public SSH key, you can check that you can connect to your gitea server with
-```
-ssh -T -p 2222 git@my.gitea.example.com
-```
-
-Note that gitea should be configured to listen to port 2222, i.e. `GITEA_SSH_PORT=2222` in the gitea config.

abra.sh

@@ -1,4 +1,4 @@
-export APP_INI_VERSION=v9
+export APP_INI_VERSION=v8
 export DOCKER_SETUP_SH_VERSION=v1
 
 abra_backup_app() {

app.ini.tmpl

@@ -7,10 +7,6 @@ NAME = {{ env "GITEA_DB_NAME" }}
 PASSWD = {{ secret "db_password" }}
 USER = {{ env "GITEA_DB_USER" }}
 
-[picture]
-DISABLE_GRAVATAR = {{ env "GITEA_DISABLE_GRAVATAR" }}
-ENABLE_FEDERATED_AVATAR = {{ env "GITEA_ENABLE_FEDERATED_AVATAR" }}
-
 [service]
 ALLOW_ONLY_EXTERNAL_REGISTRATION = {{ env "GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION" }}
 AUTO_WATCH_NEW_REPOS = {{ env "GITEA_AUTO_WATCH_NEW_REPOS" }}
@@ -57,17 +53,22 @@ 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
 RENDER_COMMAND  = rst2html
 IS_INPUT_FILE   = false
+
+[picture]
+AVATAR_UPLOAD_PATH = /data/gitea/avatars
+REPOSITORY_AVATAR_UPLOAD_PATH = /data/gitea/repo-avatars
+
+[attachment]
+PATH = /data/gitea/attachments
+
+{{ if eq (env "GITEA_CORS_ENABLED") "1" }}
+[cors]
+ENABLED=true
+SCHEME=https
+ALLOW_DOMAIN={{ env "GITEA_CORS_DOMAIN" }}
+{{ end }}

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: "gitea/gitea:1.17.3-rootless"
+    image: "gitea/gitea:1.15.6-rootless"
     configs:
       - source: app_ini
         target: /etc/gitea/app.ini
@@ -30,14 +30,8 @@ services:
       - GITEA_ENABLE_OPENID_SIGNUP
       - GITEA_SMTP_MAILER_ENABLED
       - 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
-      - GITEA_OAUTH2_CLIENT_ENABLED
+      - GITEA_CORS_ENABLED
+      - GITEA_CORS_DOMAIN
     volumes:
       - data:/var/lib/gitea
       - config:/etc/gitea
@@ -59,10 +53,10 @@ 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.1+1.17.3-rootless
+        - coop-cloud.${STACK_NAME}.version=1.1.2+1.15.6-rootless
 
   db:
-    image: "mariadb:10.9"
+    image: "mariadb:10.6"
     command: |
       mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     environment: