Compare commits

...

2 commits

13 changed files with 50 additions and 47 deletions

View file

@ -5,8 +5,8 @@ After=docker.service
[Service] [Service]
WorkingDirectory=/opt/dns-proxy WorkingDirectory=/opt/dns-proxy
ExecStart=/usr/bin/docker-compose --project-name dns-proxy up ExecStart=/usr/bin/docker compose --project-name dns-proxy up
ExecStop=/usr/bin/docker-compose --project-name dns-proxy down ExecStop=/usr/bin/docker compose --project-name dns-proxy down
TimeoutStartSec=0 TimeoutStartSec=0
Restart=on-failure Restart=on-failure
StartLimitIntervalSec=60 StartLimitIntervalSec=60

View file

@ -0,0 +1,15 @@
[Unit]
Description=Forgejo (Compose Service)
Requires=docker.service
After=docker.service
[Service]
WorkingDirectory=/opt/forgejo
ExecStart=/usr/bin/docker compose --project-name forgejo up
ExecStop=/usr/bin/docker compose --project-name forgejo down
TimeoutStartSec=0
Restart=on-failure
StartLimitBurst=3
[Install]
WantedBy=multi-user.target

View file

@ -1,15 +0,0 @@
[Unit]
Description=Gitea (Compose Service)
Requires=docker.service
After=docker.service
[Service]
WorkingDirectory=/opt/gitea
ExecStart=/usr/bin/docker-compose --project-name gitea up
ExecStop=/usr/bin/docker-compose --project-name gitea down
TimeoutStartSec=0
Restart=on-failure
StartLimitBurst=3
[Install]
WantedBy=multi-user.target

View file

@ -5,8 +5,8 @@ After=docker.service
[Service] [Service]
WorkingDirectory=/opt/kanboard WorkingDirectory=/opt/kanboard
ExecStart=/usr/bin/docker-compose --project-name kanboard up ExecStart=/usr/bin/docker compose --project-name kanboard up
ExecStop=/usr/bin/docker-compose --project-name kanboard down ExecStop=/usr/bin/docker compose --project-name kanboard down
TimeoutStartSec=0 TimeoutStartSec=0
Restart=on-failure Restart=on-failure
StartLimitBurst=3 StartLimitBurst=3

View file

@ -5,8 +5,8 @@ After=docker.service
[Service] [Service]
WorkingDirectory=/opt/mailu WorkingDirectory=/opt/mailu
ExecStart=/usr/bin/docker-compose --project-name mailu up ExecStart=/usr/bin/docker compose --project-name mailu up
ExecStop=/usr/bin/docker-compose --project-name mailu down ExecStop=/usr/bin/docker compose --project-name mailu down
TimeoutStartSec=0 TimeoutStartSec=0
Restart=on-failure Restart=on-failure
StartLimitBurst=3 StartLimitBurst=3

View file

@ -5,8 +5,8 @@ After=docker.service
[Service] [Service]
WorkingDirectory=/opt/mpa_wordpress WorkingDirectory=/opt/mpa_wordpress
ExecStart=/usr/bin/docker-compose --project-name mpa-wp up ExecStart=/usr/bin/docker compose --project-name mpa-wp up
ExecStop=/usr/bin/docker-compose --project-name mpa-wp down ExecStop=/usr/bin/docker compose --project-name mpa-wp down
TimeoutStartSec=0 TimeoutStartSec=0
Restart=on-failure Restart=on-failure
StartLimitBurst=3 StartLimitBurst=3

View file

@ -5,8 +5,8 @@ After=docker.service
[Service] [Service]
WorkingDirectory=/opt/mumble WorkingDirectory=/opt/mumble
ExecStart=/usr/bin/docker-compose --project-name mumble up ExecStart=/usr/bin/docker compose --project-name mumble up
ExecStop=/usr/bin/docker-compose --project-name mumble down ExecStop=/usr/bin/docker compose --project-name mumble down
TimeoutStartSec=0 TimeoutStartSec=0
Restart=on-failure Restart=on-failure
StartLimitBurst=3 StartLimitBurst=3

View file

@ -5,8 +5,8 @@ After=docker.service
[Service] [Service]
WorkingDirectory=/opt/openldap WorkingDirectory=/opt/openldap
ExecStart=/usr/bin/docker-compose --project-name openldap up ExecStart=/usr/bin/docker compose --project-name openldap up
ExecStop=/usr/bin/docker-compose --project-name openldap down ExecStop=/usr/bin/docker compose --project-name openldap down
TimeoutStartSec=0 TimeoutStartSec=0
Restart=on-failure Restart=on-failure
StartLimitBurst=3 StartLimitBurst=3

View file

@ -5,8 +5,8 @@ After=docker.service
[Service] [Service]
WorkingDirectory=/opt/syncthing WorkingDirectory=/opt/syncthing
ExecStart=/usr/bin/docker-compose --project-name syncthing up ExecStart=/usr/bin/docker compose --project-name syncthing up
ExecStop=/usr/bin/docker-compose --project-name syncthing down ExecStop=/usr/bin/docker compose --project-name syncthing down
TimeoutStartSec=0 TimeoutStartSec=0
Restart=on-failure Restart=on-failure
StartLimitBurst=3 StartLimitBurst=3

View file

@ -5,8 +5,8 @@ After=docker.service
[Service] [Service]
WorkingDirectory=/opt/vaultwarden WorkingDirectory=/opt/vaultwarden
ExecStart=/usr/bin/docker-compose --project-name vaultwarden up ExecStart=/usr/bin/docker compose --project-name vaultwarden up
ExecStop=/usr/bin/docker-compose --project-name vaultwarden down ExecStop=/usr/bin/docker compose --project-name vaultwarden down
TimeoutStartSec=0 TimeoutStartSec=0
Restart=on-failure Restart=on-failure
StartLimitBurst=3 StartLimitBurst=3

View file

@ -5,8 +5,8 @@ After=docker.service
[Service] [Service]
WorkingDirectory=/opt/website WorkingDirectory=/opt/website
ExecStart=/usr/bin/docker-compose --project-name website up ExecStart=/usr/bin/docker compose --project-name website up
ExecStop=/usr/bin/docker-compose --project-name website down ExecStop=/usr/bin/docker compose --project-name website down
TimeoutStartSec=0 TimeoutStartSec=0
Restart=on-failure Restart=on-failure
StartLimitBurst=3 StartLimitBurst=3

View file

@ -5,8 +5,8 @@ After=docker.service
[Service] [Service]
WorkingDirectory=/opt/yopass WorkingDirectory=/opt/yopass
ExecStart=/usr/bin/docker-compose --project-name yopass up ExecStart=/usr/bin/docker compose --project-name yopass up
ExecStop=/usr/bin/docker-compose --project-name yopass down ExecStop=/usr/bin/docker compose --project-name yopass down
TimeoutStartSec=0 TimeoutStartSec=0
Restart=on-failure Restart=on-failure
StartLimitBurst=3 StartLimitBurst=3

View file

@ -1,16 +1,17 @@
version: "3.0" ---
networks: networks:
gitea: forgejo:
external: false external: false
services: services:
server: server:
image: gitea/gitea:1.21.5 image: codeberg.org/forgejo/forgejo:9.0.3
restart: always restart: always
environment: environment:
USER_UID: 1000 USER_UID: 1000
USER_GID: 1000 USER_GID: 1000
GITEA____APP_NAME: JILITS Git
GITEA____APP_SLOGAN: Cloud Solutions with Integrity
GITEA__database__DB_TYPE: postgres GITEA__database__DB_TYPE: postgres
GITEA__database__HOST: db:5432 GITEA__database__HOST: db:5432
GITEA__database__NAME: ${POSTGRES_DB} GITEA__database__NAME: ${POSTGRES_DB}
@ -24,16 +25,18 @@ services:
GITEA__service__DISABLE_REGISTRATION: "true" GITEA__service__DISABLE_REGISTRATION: "true"
GITEA__service__NO_REPLY_ADDRESS: noreply.git.jilits.se GITEA__service__NO_REPLY_ADDRESS: noreply.git.jilits.se
GITEA__mailer__ENABLED: "true" GITEA__mailer__ENABLED: "true"
GITEA__mailer__MAILER_TYPE: smtp GITEA__mailer__PROTOCOL: smtp
GITEA__mailer__HOST: mail.jilits.se:587 GITEA__mailer__SMTP_ADDR: mail.jilits.se
GITEA__mailer__FROM: Gitea <git@jilits.se> GITEA__mailer__SMTP_PORT: 587
GITEA__mailer__FROM: Forgejo <git@jilits.se>
GITEA__mailer__USER: ${SMTP_USER} GITEA__mailer__USER: ${SMTP_USER}
GITEA__mailer__PASSWD: ${SMTP_PASS} GITEA__mailer__PASSWD: ${SMTP_PASS}
GITEA__time__FORMAT: "2006-01-02 15:04:05" GITEA__time__FORMAT: "2007-01-02 15:04:05"
GITEA__other__SHOW_FOOTER_VERSION: "false"
networks: networks:
- gitea - forgejo
volumes: volumes:
- gitea:/data - forgejo:/data
- /etc/timezone:/etc/timezone:ro - /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
ports: ports:
@ -50,10 +53,10 @@ services:
POSTGRES_USER: ${POSTGRES_USER} POSTGRES_USER: ${POSTGRES_USER}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
networks: networks:
- gitea - forgejo
volumes: volumes:
- db:/var/lib/postgresql/data - db:/var/lib/postgresql/data
volumes: volumes:
gitea: forgejo:
db: db: