.env.pg

@@ -1,7 +0,0 @@
-#!/bin/bash
-# this is for the backup cron job, NOT for the docker-compose.yml
-
-POSTGRES_PASSWORD=$(< $HOME/git/.pg.pw)
-POSTGRES_USER=gitea
-POSTGRES_DB=gitea
-

.gitignore

@@ -3,4 +3,3 @@
 db/
 config/
 data/
-backup-pgdump.sql

docker-compose.yml

@@ -2,7 +2,7 @@ version: "2"
 
 services:
   server:
-    image: codeberg.org/forgejo-experimental/forgejo:1.20-rootless
+    image: gitea/gitea:latest-rootless
     restart: always
     volumes:
       - ./data:/var/lib/gitea
@@ -22,18 +22,18 @@ services:
     networks:
       - gitea
       - web
-    environment: {}
-      # GITEA__database__DB_TYPE: postgres
-      # GITEA__database__HOST: database:5432
-      # GITEA__database__NAME: gitea
-      # GITEA__database__USER: gitea
-      # GITEA__database__PASSWD__FILE: /run/secrets/pg_password
-      # GITEA__mailer__ENABLED: 'true'
-      # GITEA__mailer__FROM: git@tams.tech
-      # GITEA__mailer__PROTOCOL: smtps
-      # GITEA__mailer__SMTP_ADDR: in-v3.mailjet.com
-      # GITEA__mailer__USER__FILE: /run/secrets/mail_api_key
-      # GITEA__mailer__PASSWD__FILE: /run/secrets/mail_secret
+    environment:
+      GITEA__database__DB_TYPE: postgres
+      GITEA__database__HOST: database:5432
+      GITEA__database__NAME: gitea
+      GITEA__database__USER: gitea
+      GITEA__database__PASSWD__FILE: /run/secrets/pg_password
+      GITEA__mailer__ENABLED: 'true'
+      GITEA__mailer__FROM: git@tams.tech
+      GITEA__mailer__PROTOCOL: smtps
+      GITEA__mailer__SMTP_ADDR: in-v3.mailjet.com
+      GITEA__mailer__USER__FILE: /run/secrets/mail_api_key
+      GITEA__mailer__PASSWD__FILE: /run/secrets/mail_secret
     depends_on:
       - database
     secrets: