fix: remove /etc/timezone bind mount, not present on all hosts

Docker Swarm requires the bind source to exist on the node before
scheduling the task; /etc/timezone is Debian/Ubuntu-specific and
missing on other distros, causing deploy failures. /etc/localtime
alone covers timezone info portably.

.drone.yml

@@ -17,7 +17,6 @@ steps:
     environment:
       APP_INI_VERSION: v1
       DOCKER_SETUP_SH_VERSION: v1
-      PG_BACKUP_VERSION: v1
       DOMAIN: gitea.swarm-test.autonomic.zone
       GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION: true
       GITEA_APP_NAME: Git with solidaritea
@@ -51,7 +50,7 @@ steps:
         from_secret: drone_abra-bot_token
       fork: true
       repositories:
-        - toolshed/auto-recipes-catalogue-json
+        - coop-cloud/auto-recipes-catalogue-json
 
 trigger:
   event: tag

.env.sample

@@ -3,14 +3,11 @@ TYPE=gitea
 DOMAIN=gitea.example.com
 LETS_ENCRYPT_ENV=production
 COMPOSE_FILE="compose.yml"
-ENABLE_BACKUPS=true
 COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml"
-# COMPOSE_FILE="$COMPOSE_FILE:compose.sqlite3.yml"
 # COMPOSE_FILE="$COMPOSE_FILE:compose.postgres.yml"
 
 # Enable to use forgejo instead of gitea
 # COMPOSE_FILE="$COMPOSE_FILE:compose.forgejo.yml"
-# SECRET_LFS_JWT_SECRET_VERSION=v1 # length=43
 
 GITEA_DOMAIN=git.example.com
 GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION=true
@@ -32,9 +29,6 @@ GITEA_DEFAULT_USER_VISIBILITY=limited
 GITEA_ALLOWED_USER_VISIBILITY_MODES=limited,private
 GITEA_DEFAULT_ORG_VISIBILITY=limited
 GITEA_REQUIRE_SIGNIN_VIEW=true
-GITEA_ENABLE_PUSH_CREATE_USER=false
-GITEA_ENABLE_PUSH_CREATE_ORG=false
-GITEA_LFS_START_SERVER=false
 
 GITEA_REPO_UPLOAD_ENABLED=true
 GITEA_REPO_UPLOAD_ALLOWED_TYPES=*/*
@@ -56,10 +50,8 @@ SECRET_SECRET_KEY_VERSION=v1 # length=64
 # SMTP Mailer
 # COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml"
 # GITEA_SMTP_MAILER_ENABLED=1
-# GITEA_MAILER_ADDR=mail.gandi.net
-# GITEA_MAILER_PORT=465
+# GITEA_MAILER_HOST=mail.gandi.net:465
 # SECRET_SMTP_PASSWORD_VERSION=v1
-# GITEA_MAILER_PROTOCOL=smtps
 
 # OATH2 Options
 # GITEA_REGISTER_EMAIL_CONFIRM=replace-me
@@ -69,11 +61,6 @@ SECRET_SECRET_KEY_VERSION=v1 # length=64
 # GITEA_ACCOUNT_LINKING=replace-me
 # GITEA_OAUTH2_CLIENT_ENABLED=replace-me
 
-# Lifetime of an OAuth2 refresh token in hours, prolly no need to edit. We
-# were hitting issues with infrequently pushed to repos that were not picked
-# up by drone after a month of inactivity, hence the option.
-# GITEA__oauth2__REFRESH_TOKEN_EXPIRATION_TIME=730
-
 # Indexer (for issue search)
 # GITEA_REPO_INDEXER_ENABLED=false
 # GITEA_ISSUE_INDEXER_TYPE=db

README.md

@@ -15,7 +15,7 @@
 
 ## Basic usage
 
-1. [Set up Docker Swarm and `abra`][operators-tutorial]
+1. Set up Docker Swarm and [`abra`][abra]
 2. Deploy [`coop-cloud/traefik`][cc-traefik]
 3. `abra app new gitea --secrets` (optionally with `--pass` if you'd like
    to save secrets in `pass`)
@@ -23,15 +23,12 @@
    your Docker swarm box
 5. `abra app deploy YOURAPPDOMAIN`
 
-[operators-tutorial]: https://docs.coopcloud.tech/operators/tutorial/
-[cc-traefik]: https://git.coopcloud.tech/coop-cloud/traefik/
-
 ## 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
+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`.
@@ -39,34 +36,25 @@ See the [Gitea command-line documentation](https://docs.gitea.io/en-us/command-l
 ## 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`.
-
-```sh
+```
 abra app config YOURTRAEFIKAPP
 ```
-
 There uncomment or add these lines:
-
-```sh
+```
 GITEA_SSH_ENABLED=1
 COMPOSE_FILE="compose.yml:compose.gitea.yml"
 ```
-
 Then redeploy traefik:
-
-```sh
+```
 abra app undeploy YOURTRAEFIKAPP
 abra app deploy YOURTRAEFIKAPP
 ```
-
 You might need to wait a bit.  To check if it worked, you can run
-
-```sh
+```
 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
-
-```sh
+```
 ssh -T -p 2222 git@my.gitea.example.com
 ```
 

abra.sh

@@ -1,6 +1,5 @@
-export APP_INI_VERSION=v21
+export APP_INI_VERSION=v18
 export DOCKER_SETUP_SH_VERSION=v1
-export PG_BACKUP_VERSION=v1
 
 abra_backup_app() {
   _abra_backup_dir "app:/var/lib/gitea"

app.ini.tmpl

@@ -2,15 +2,10 @@ APP_NAME = {{ env "GITEA_APP_NAME" }}
 
 [database]
 DB_TYPE = {{ env "GITEA_DB_TYPE" }}
-{{ if ne (env "GITEA_DB_TYPE") "sqlite3" }}
 HOST = {{ env "GITEA_DB_HOST" }}
 NAME = {{ env "GITEA_DB_NAME" }}
 PASSWD = {{ secret "db_password" }}
 USER = {{ env "GITEA_DB_USER" }}
-{{ else }}
-SQLITE_JOURNAL_MODE = {{ env "GITEA_SQLITE_JOURNAL_MODE" }}
-PATH = {{ env "GITEA_PATH" }}
-{{ end }}
 
 [picture]
 DISABLE_GRAVATAR = {{ env "GITEA_DISABLE_GRAVATAR" }}
@@ -35,8 +30,6 @@ ENABLE_OPENID_SIGNUP = {{ env "GITEA_ENABLE_OPENID_SIGNUP" }}
 
 [repository]
 DEFAULT_BRANCH = main
-ENABLE_PUSH_CREATE_USER = {{ env "GITEA_ENABLE_PUSH_CREATE_USER" }}
-ENABLE_PUSH_CREATE_ORG = {{ env "GITEA_ENABLE_PUSH_CREATE_ORG" }}
 
 [repository.upload]
 ENABLED = {{ env "GITEA_REPO_UPLOAD_ENABLED" }}
@@ -60,10 +53,6 @@ SSH_DOMAIN = {{ env "GITEA_DOMAIN" }}
 SSH_LISTEN_PORT = {{ env "GITEA_SSH_PORT" }}
 SSH_PORT = {{ env "GITEA_SSH_PORT" }}
 START_SSH_SERVER = true
-LFS_START_SERVER = {{ env "GITEA_LFS_START_SERVER" }}
-{{ if eq (env "FORGE") "forgejo" }}
-LFS_JWT_SECRET = {{ secret "lfs_jwt_secret" }}
-{{ end }}
 
 [security]
 INSTALL_LOCK = true
@@ -82,12 +71,11 @@ JWT_SECRET = {{ secret "jwt_secret" }}
 [mailer]
 ENABLED        = true
 FROM           = {{ env "GITEA_MAILER_FROM" }}
-PROTOCOL       = {{ env "GITEA_MAILER_PROTOCOL" }}
-SMTP_ADDR      = {{ env "GITEA_MAILER_ADDR" }}
-SMTP_PORT      = {{ env "GITEA_MAILER_PORT" }}
+HOST           = {{ env "GITEA_MAILER_HOST" }}
 USER           = {{ env "GITEA_MAILER_USER" }}
 PASSWD         = {{ secret "smtp_password" }}
 MAILER_TYPE    = smtp
+IS_TLS_ENABLED = true
 {{ end }}
 
 {{ if eq (env "GITEA_OAUTH2_CLIENT_ENABLED") "1" }}

compose.forgejo.yml

@@ -2,12 +2,4 @@ version: '3.8'
 
 services:
   app:
-    image: codeberg.org/forgejo/forgejo:12.0.2-rootless
-    environment:
-    - FORGE=forgejo
-    secrets:
-    - lfs_jwt_secret
-secrets:
-  lfs_jwt_secret:
-    name: ${STACK_NAME}_lfs_jwt_secret_${SECRET_LFS_JWT_SECRET_VERSION}
-    external: true
+    image: codeberg.org/forgejo/forgejo:1.21.11-1-rootless

compose.mariadb.yml

@@ -7,15 +7,14 @@ services:
       - GITEA_DB_HOST="db:3306"
       - GITEA_DB_NAME=gitea
       - GITEA_DB_USER=gitea
-    secrets:
-      - db_password
   db:
     image: "mariadb:10.11.2"
     deploy:
       labels:
+          backupbot.backup: "true"
           backupbot.backup.pre-hook: 'mysqldump --single-transaction -u root -p"$$(cat /run/secrets/db_root_password)" gitea > /var/lib/mysql/backup.sql'
-          backupbot.backup.volumes.mariadb.path: "backup.sql"
-          backupbot.restore.post-hook: "mariadb -u root -p\"$$(cat /run/secrets/db_root_password)\" gitea < /var/lib/mysql/backup.sql"
+          backupbot.backup.post-hook: "rm -rf /var/lib/mysql/backup.sql"
+          backupbot.backup.path: "/var/lib/mysql/backup.sql"
     command: |
       mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     environment:
@@ -41,3 +40,4 @@ secrets:
 
 volumes:
   mariadb:
+  internal:

compose.postgres.yml

@@ -7,15 +7,14 @@ services:
       - GITEA_DB_HOST="db:5432"
       - GITEA_DB_NAME=gitea
       - GITEA_DB_USER=gitea
-    secrets:
-      - db_password
   db:
-    image: postgres:15.13
+    image: postgres:15.8
     deploy:
       labels:
-        backupbot.backup.pre-hook: "/pg_backup.sh backup"
-        backupbot.backup.volumes.db.path: "backup.sql"
-        backupbot.restore.post-hook: '/pg_backup.sh restore'
+          backupbot.backup: "true"
+          backupbot.backup.pre-hook: "PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /var/lib/postgresql/data/backup.sql"
+          backupbot.backup.post-hook: "rm -r /var/lib/postgresql/data/backup.sql"
+          backupbot.backup.path: "/var/lib/postgresql/data"
     environment: 
       - POSTGRES_DB=gitea
       - POSTGRES_USER=gitea
@@ -26,10 +25,6 @@ services:
       - db:/var/lib/postgresql/data
     networks:
       - internal
-    configs:
-        - source: pg_backup
-          target: /pg_backup.sh
-          mode: 0555
 
 secrets:
   db_password:
@@ -38,8 +33,4 @@ secrets:
 
 volumes:
   db:
-
-configs:
-  pg_backup:
-    name: ${STACK_NAME}_pg_backup_${PG_BACKUP_VERSION}
-    file: pg_backup.sh
+  internal:

compose.smtp.yml

@@ -5,10 +5,8 @@ services:
   app:
     environment:
       - GITEA_MAILER_FROM
-      - GITEA_MAILER_ADDR
-      - GITEA_MAILER_PORT
+      - GITEA_MAILER_HOST
       - GITEA_MAILER_USER
-      - "GITEA_MAILER_PROTOCOL=${GITEA_MAILER_PROTOCOL:-smtps}"
     secrets:
       - smtp_password
 

compose.sqlite3.yml

@@ -1,8 +0,0 @@
-version: '3.8'
-
-services:
-  app:
-    environment:
-      - GITEA_DB_TYPE=sqlite3
-      - GITEA_SQLITE_JOURNAL_MODE=wal
-      - GITEA_PATH=/var/lib/gitea/gitea.db

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: "gitea/gitea:1.24.2-rootless"
+    image: "gitea/gitea:1.22.2-rootless"
     configs:
       - source: app_ini
         target: /etc/gitea/app.ini
@@ -11,11 +11,11 @@ services:
         target: /usr/local/bin/docker-setup.sh
         mode: 0555
     secrets:
+      - db_password
       - internal_token
       - jwt_secret
       - secret_key
     environment:
-      - FORGE=gitea
       - GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION
       - GITEA_APP_NAME
       - GITEA_AUTO_WATCH_NEW_REPOS
@@ -52,12 +52,9 @@ services:
       - GITEA_ALLOWED_USER_VISIBILITY_MODES
       - GITEA_DEFAULT_ORG_VISIBILITY
       - GITEA_REQUIRE_SIGNIN_VIEW
-      - GITEA__oauth2__REFRESH_TOKEN_EXPIRATION_TIME
-      - GITEA_LFS_START_SERVER=${GITEA_LFS_START_SERVER:-false}
     volumes:
       - data:/var/lib/gitea
       - config:/etc/gitea
-      - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     networks:
       - proxy
@@ -71,9 +68,9 @@ services:
     deploy:
       update_config:
         failure_action: rollback
-        order: stop-first
+        order: start-first
       labels:
-        - "backupbot.backup=${ENABLE_BACKUPS:-true}"
+        - "backupbot.backup=true"
         - "traefik.enable=true"
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
@@ -84,11 +81,10 @@ services:
         - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}"
         - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}_cors"
         - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolallowmethods=GET,OPTIONS,PUT"
-        - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolallowheaders=content-type,authorization"
         - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}"
         - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100"
         - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true"
-        - coop-cloud.${STACK_NAME}.version=3.5.3+1.24.2-rootless
+        - coop-cloud.${STACK_NAME}.version=2.10.1+1.22.2-rootless
 
 
 networks:

pg_backup.sh

@@ -1,34 +0,0 @@
-#!/bin/bash
-
-set -e
-
-BACKUP_FILE='/var/lib/postgresql/data/backup.sql'
-
-function backup {
-  export PGPASSWORD=$(cat $POSTGRES_PASSWORD_FILE)
-  pg_dump -U ${POSTGRES_USER} ${POSTGRES_DB} > $BACKUP_FILE
-}
-
-function restore {
-    cd /var/lib/postgresql/data/
-    restore_config(){
-        # Restore allowed connections
-        cat pg_hba.conf.bak > pg_hba.conf
-        su postgres -c 'pg_ctl reload'
-    }
-    # Don't allow any other connections than local
-    cp pg_hba.conf pg_hba.conf.bak
-    echo "local all all trust" > pg_hba.conf
-    su postgres -c 'pg_ctl reload'
-    trap restore_config EXIT INT TERM
-
-    # Recreate Database
-    psql -U ${POSTGRES_USER} -d postgres -c "DROP DATABASE ${POSTGRES_DB} WITH (FORCE);" 
-    createdb -U ${POSTGRES_USER} ${POSTGRES_DB}
-    psql -U ${POSTGRES_USER} -d ${POSTGRES_DB} -1 -f $BACKUP_FILE
-
-    trap - EXIT INT TERM
-    restore_config
-}
-
-$@

release/3.0.0+1.22.2-rootless

@@ -1,3 +0,0 @@
-BEWARE! 🚨 This release updates to the newer Gitea SMTP settings format.
-
-If you are using SMTP, you will need to split the old GITEA_MAILER_HOST into separate GITEA_MAILER_ADDR (hostname) and GITEA_MAILER_PORT settings.