diff --git a/.env.pg b/.env.pg new file mode 100644 index 0000000..488ca00 --- /dev/null +++ b/.env.pg @@ -0,0 +1,7 @@ +#!/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 + diff --git a/.gitignore b/.gitignore index a85f069..23160c0 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ db/ config/ data/ +backup-pgdump.sql diff --git a/docker-compose.yml b/docker-compose.yml index 1479453..5cd5660 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "2" services: server: - image: gitea/gitea:latest-rootless + image: codeberg.org/forgejo-experimental/forgejo:1.20-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: