Add DNS

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>

.gitea/workflows/gitea-ci.yaml

@@ -1,15 +0,0 @@
-name: Build And Test
-run-name: ${{ gitea.actor }} is runs ci pipeline
-on: [ push ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - run: ls
-publish:
-    runs-on: cth-ubuntu-latest
-    needs: build
-    if: gitea.ref == 'refs/heads/main'
-    steps:
-      - run: ls

Makefile

@@ -13,11 +13,9 @@
 
 DOCKER := docker
 
-PROFILES := caddy wordpress adminer syncthing uptime-kuma jellyfin qbittorrent psitransfer gitea watchtower
+PROFILES := caddy wordpress adminer uptime-kuma qbittorrent gitea jellyfin watchtower backup openssh dns-server syncthing
 PROFILE_CMD := $(addprefix --profile ,$(PROFILES))
 
-# gitea-runner transmission
-
 COMPOSE_FILES :=  $(shell find docker-compose*.yml | sed -e 's/^/--file /')
 
 .PHONY: build all

README.md

@@ -19,7 +19,7 @@ If you have any **questions** or **suggestions**, feel free to open an issue or
 - [x] Jellyfin (Media server)
 - [x] Gitea (Git server)
 - [x] Uptime Kuma (Monitoring)
-- [x] qbittorrent server
+- [x] Torrent server
 
 ## Screenshots
 
@@ -31,7 +31,7 @@ If you have any **questions** or **suggestions**, feel free to open an issue or
 - [Docker Compose](https://docs.docker.com/compose/install/)
 - [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
 - [Web domain](https://www.ovh.com/world/domains/) (I use OVH)
-- [Open port 80, 443, 2222 on your router](http://192.168.0.1/)
+- [Open port 80 and 443 on your router](http://192.168.0.1/) (I use a SFR box with default IP)
 
 ***To avoid get rate limit from letsencrypt (10 certificates per 3 hours), you need to disable some certificates in the caddyfiles and enable them 3h later...***
 
@@ -66,12 +66,12 @@ And then, caddy will generate the certificate for you and renew it automatically
 | [bensuperpc.org](https://bensuperpc.org) | Main | Main domain |
 | [adminer.bensuperpc.org](https://adminer.bensuperpc.org) | Sub | Adminer for MariaDB for wordpress only |
 | [uptimekuma.bensuperpc.org](https://uptimekuma.bensuperpc.org) | Sub | Uptime Kuma for monitoring |
-| [qbittorrent.bensuperpc.org](https://qbittorrent.bensuperpc.org) | Sub | Torrent client/server |
+| [torrent.bensuperpc.org](https://torrent.bensuperpc.org) | Sub | Torrent server |
 | [git.bensuperpc.org](https://git.bensuperpc.org) | Sub | Gitea for git |
 | [link.bensuperpc.org](https://link.bensuperpc.org) | Sub | For link shortener |
 | [jellyfin.bensuperpc.org](https://jellyfin.bensuperpc.org) | Sub | Jellyfin for media server |
 | [syncthing.bensuperpc.org](https://syncthing.bensuperpc.org) | Sub | SyncThing for file synchronization |
-| [psitransfer.bensuperpc.org](https://psitransfer.bensuperpc.org) | Sub | PsiTransfer for file sharing |
+| [ssh.bensuperpc.org](https://ssh.bensuperpc.org) | Sub | Openssh for ssh |
 | bensuperpc.com | Main | Redirect to bensuperpc.org |
 | bensuperpc.fr | Main | Redirect to bensuperpc.org |
 | bensuperpc.net | Main | Redirect to bensuperpc.org |
@@ -122,7 +122,6 @@ GITEA__database__HOST=database_gitea:3306
 GITEA__database__NAME=gitea
 GITEA__database__USER=bensuperpc
 GITEA__database__PASSWD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j
-GITEA__security__SECRET_KEY=ykcZt23an1E4lFHWvrCKdAyt16WAiK9c
 ```
 
 For [gitea_db.env](env/gitea_db.env) file, you need to change the password(s) and user for the database.
@@ -134,12 +133,6 @@ MYSQL_PASSWORD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j
 MYSQL_DATABASE=gitea
 ```
 
-For [psitransfer.env](env/psitransfer.env) file, you need to change the password(s) and user for the database.
-
-```sh
-PSITRANSFER_ADMIN_PASS=n9jLVNT9QUotTJTT91JqH4GyBTg9pvEn
-```
-
 ### Start the infrastructure
 
 Start the website with:
@@ -169,16 +162,14 @@ You can find all services on the [docker-compose.yml](docker-compose.yml) file o
 | Wordpress | Wordpress website | [bensuperpc.org](https://bensuperpc.org) and [www.bensuperpc.org](https://www.bensuperpc.org) |
 | Adminer | Adminer for MariaDB | [adminer.bensuperpc.org](https://adminer.bensuperpc.org) |
 | Uptime Kuma | Uptime Kuma for monitoring | [uptimekuma.bensuperpc.org](https://uptimekuma.bensuperpc.org) |
-| qbittorrent | qbittorrent server | [qbittorrent.bensuperpc.org](https://qbittorrent.bensuperpc.org) |
+| Torrent | Torrent server | [torrent.bensuperpc.org](https://torrent.bensuperpc.org) |
 | Gitea | Gitea for git | [git.bensuperpc.org](https://git.bensuperpc.org) |
 | Jellyfin | Jellyfin for media server | [jellyfin.bensuperpc.org](https://jellyfin.bensuperpc.org) |
 | SyncThing | SyncThing for file synchronization | [syncthing.bensuperpc.org](https://syncthing.bensuperpc.org) |
-| PsiTransfer | PsiTransfer for file sharing | [psitransfer.bensuperpc.org](https://psitransfer.bensuperpc.org) |
+| Openssh | Openssh for ssh | [ssh.bensuperpc.org](https://ssh.bensuperpc.org) |
 
 You can disable some services by removing the service name in PROFILES variable in the [Makefile](Makefile) file.
 
-To enable the gitea CI: https://medium.com/@lokanx/how-to-build-docker-containers-using-gitea-runners-600729555e07
-
 ## Build with
 
 - [Wordpress](https://wordpress.org/)

caddy/Caddyfile

@@ -4,12 +4,12 @@
 
 	log {
 		output file /data/logs/access.log
-		format json
+		format console
 	}
 }
 
-import bensuperpc.org/*
-import bensuperpc.com/*
-import bensuperpc.net/*
-import bensuperpc.ovh/*
-import bensuperpc.fr/*
+import bensuperpc.org/Caddyfile
+import bensuperpc.com/Caddyfile
+import bensuperpc.net/Caddyfile
+import bensuperpc.ovh/Caddyfile
+import bensuperpc.fr/Caddyfile

caddy/bensuperpc.net/Caddyfile

@@ -5,15 +5,3 @@ bensuperpc.net {
 www.bensuperpc.net {
 	redir https://www.bensuperpc.org{uri} permanent
 }
-
-git.bensuperpc.net {
-	redir https://git.bensuperpc.org{uri} permanent
-}
-
-jellyfin.bensuperpc.net {
-	redir https://jellyfin.bensuperpc.org{uri} permanent
-}
-
-uptimekuma.bensuperpc.net {
-	redir https://uptimekuma.bensuperpc.org{uri} permanent
-}

caddy/bensuperpc.org/Caddyfile

@@ -51,18 +51,6 @@ torrent.bensuperpc.org {
 	reverse_proxy qbittorrent:8080
 }
 
-qbittorrent.bensuperpc.org {
-	redir https://torrent.bensuperpc.org permanent
-}
-
-transmission.bensuperpc.org {
-	reverse_proxy transmission:9091
-}
-
-gitea.bensuperpc.org {
-	redir https://git.bensuperpc.org permanent
-}
-
 git.bensuperpc.org {
 	reverse_proxy gitea:3000
 }
@@ -71,12 +59,8 @@ jellyfin.bensuperpc.org {
 	reverse_proxy jellyfin:8096
 }
 
-transfer.bensuperpc.org {
-	reverse_proxy psitransfer:3000
-}
-
-psitransfer.bensuperpc.org {
-	redir https://transfer.bensuperpc.org{uri} permanent
+ssh.bensuperpc.org {
+	reverse_proxy openssh:2222
 }
 
 syncthing.bensuperpc.org {
@@ -85,6 +69,10 @@ syncthing.bensuperpc.org {
 	}
 }
 
+dns.bensuperpc.org {
+	reverse_proxy dns-server:5380
+}
+
 link.bensuperpc.org {
 	# TODO: Use service with database
 	# Friendly links
@@ -105,10 +93,9 @@ link.bensuperpc.org {
 	redir /scpfb https://youtu.be/9zrKk-1E8zM?si=8R_ZBVG3GzMUYOe8&t=36 permanent
 	redir /mother https://youtu.be/w3NyycHR3fE?si=rNNSW9zYv0bcO2Eu permanent
 	redir /cpu https://www.youtube.com/watch?v=y39D4529FM4 permanent
-	redir /lechanteur https://youtu.be/HXdP15Ubu6M?si=N0qvhqo--3pmSGmb permanent
+	redir /chanteur https://youtu.be/HXdP15Ubu6M?si=N0qvhqo--3pmSGmb permanent
 	redir /bna https://youtu.be/3T3ofoKfEoY?si=_7HkGQXMC7rBng8O permanent
 	redir /jojo https://youtu.be/U0TXIXTzJEY?si=2acWJWX06ju2w4uj permanent
 	redir /patapon https://youtu.be/H6CbNHLHkmk?si=ZvU8SzrOK-oCUXT5 permanent
 	redir /darkwater https://youtu.be/Tr8ZgF4Dc0E?si=CEOmm2J6Jp5rdbbt permanent
-	redir /train https://youtu.be/l8mScKWj3kQ?si=BV07uJ9eP3kzV9Kl permanent
 }

config/gitea_runner/config.yaml

@@ -1,98 +0,0 @@
-# Example configuration file, it's safe to copy this as the default config file without any modification.
-
-# You don't have to copy this file to your instance,
-# just run `./act_runner generate-config > config.yaml` to generate a config file.
-
-log:
-  # The level of logging, can be trace, debug, info, warn, error, fatal
-  level: info
-
-runner:
-  # Where to store the registration result.
-  file: .runner
-  # Execute how many tasks concurrently at the same time.
-  capacity: 1
-  # Extra environment variables to run jobs.
-  envs:
-    A_TEST_ENV_NAME_1: a_test_env_value_1
-    A_TEST_ENV_NAME_2: a_test_env_value_2
-  # Extra environment variables to run jobs from a file.
-  # It will be ignored if it's empty or the file doesn't exist.
-  env_file: .env
-  # The timeout for a job to be finished.
-  # Please note that the Gitea instance also has a timeout (3h by default) for the job.
-  # So the job could be stopped by the Gitea instance if it's timeout is shorter than this.
-  timeout: 3h
-  # Whether skip verifying the TLS certificate of the Gitea instance.
-  insecure: false
-  # The timeout for fetching the job from the Gitea instance.
-  fetch_timeout: 5s
-  # The interval for fetching the job from the Gitea instance.
-  fetch_interval: 2s
-  # The labels of a runner are used to determine which jobs the runner can run, and how to run them.
-  # Like: "macos-arm64:host" or "ubuntu-latest:docker://gitea/runner-images:ubuntu-latest"
-  # Find more images provided by Gitea at https://gitea.com/gitea/runner-images .
-  # If it's empty when registering, it will ask for inputting labels.
-  # If it's empty when execute `daemon`, will use labels in `.runner` file.
-  labels:
-    - "ubuntu-latest:docker://gitea/runner-images:ubuntu-latest"
-    - "ubuntu-22.04:docker://gitea/runner-images:ubuntu-22.04"
-    - "ubuntu-20.04:docker://gitea/runner-images:ubuntu-20.04"
-
-cache:
-  # Enable cache server to use actions/cache.
-  enabled: true
-  # The directory to store the cache data.
-  # If it's empty, the cache data will be stored in $HOME/.cache/actcache.
-  dir: ""
-  # The host of the cache server.
-  # It's not for the address to listen, but the address to connect from job containers.
-  # So 0.0.0.0 is a bad choice, leave it empty to detect automatically.
-  host: ""
-  # The port of the cache server.
-  # 0 means to use a random available port.
-  port: 0
-  # The external cache server URL. Valid only when enable is true.
-  # If it's specified, act_runner will use this URL as the ACTIONS_CACHE_URL rather than start a server by itself.
-  # The URL should generally end with "/".
-  external_server: ""
-
-container:
-  # Specifies the network to which the container will connect.
-  # Could be host, bridge or the name of a custom network.
-  # If it's empty, act_runner will create a network automatically.
-  network: ""
-  # Whether to use privileged mode or not when launching task containers (privileged mode is required for Docker-in-Docker).
-  privileged: false
-  # And other options to be used when the container is started (eg, --add-host=my.gitea.url:host-gateway).
-  options:
-  # The parent directory of a job's working directory.
-  # NOTE: There is no need to add the first '/' of the path as act_runner will add it automatically. 
-  # If the path starts with '/', the '/' will be trimmed.
-  # For example, if the parent directory is /path/to/my/dir, workdir_parent should be path/to/my/dir
-  # If it's empty, /workspace will be used.
-  workdir_parent:
-  # Volumes (including bind mounts) can be mounted to containers. Glob syntax is supported, see https://github.com/gobwas/glob
-  # You can specify multiple volumes. If the sequence is empty, no volumes can be mounted.
-  # For example, if you only allow containers to mount the `data` volume and all the json files in `/src`, you should change the config to:
-  # valid_volumes:
-  #   - data
-  #   - /src/*.json
-  # If you want to allow any volume, please use the following configuration:
-  # valid_volumes:
-  #   - '**'
-  valid_volumes: []
-  # overrides the docker client host with the specified one.
-  # If it's empty, act_runner will find an available docker host automatically.
-  # If it's "-", act_runner will find an available docker host automatically, but the docker host won't be mounted to the job containers and service containers.
-  # If it's not empty or "-", the specified docker host will be used. An error will be returned if it doesn't work.
-  docker_host: ""
-  # Pull docker image(s) even if already present
-  force_pull: true
-  # Rebuild docker image(s) even if already present
-  force_rebuild: false
-
-host:
-  # The parent directory of a job's working directory.
-  # If it's empty, $HOME/.cache/act/ will be used.
-  workdir_parent:

docker-compose.adminer.yml

@@ -1,3 +1,5 @@
+version: '3.9'
+
 services:
   # Adminer
   adminer:
@@ -5,7 +7,7 @@ services:
     container_name: adminer
     profiles:
       - adminer
-    restart: on-failure:5
+    restart: on-failure
     env_file: 
       - env/adminer.env
     depends_on:

docker-compose.backup.yml

@@ -0,0 +1,35 @@
+version: '3.9'
+
+services:
+  # Backup
+  backup:
+    image: offen/docker-volume-backup:latest
+    container_name: backup
+    profiles:
+      - backup
+    restart: on-failure
+    env_file:
+      - env/backup.env
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - backup:/archive
+      - caddy_data:/backup/caddy_data:ro
+      - caddy_config:/backup/caddy_config:ro
+#      - gitea_data:/backup/gitea_data:ro
+#      - gitea_config:/backup/gitea_config:ro
+#      - wordpress_db:/backup/wordpress_db:ro
+#      - wordpress:/backup/wordpress:ro
+#      - jellyfin_config:/backup/jellyfin_config:ro
+#      - jellyfin_data:/backup/jellyfin_data:ro
+#      - jellyfin_cache:/backup/jellyfin_cache:ro
+#      - qbittorrent_config:/backup/qbittorrent_config:ro
+#      - qbittorrent_data:/backup/qbittorrent_data:ro
+#      - uptimekuma_data:/backup/uptimekuma_data:ro
+    networks:
+      - infra-network
+    security_opt:
+      - no-new-privileges:true
+
+volumes:
+  backup:
+    name: backup

docker-compose.caddy.yml

@@ -1,3 +1,5 @@
+version: '3.9'
+
 services:
   # Caddy
   caddy:
@@ -5,7 +7,7 @@ services:
     container_name: caddy
     profiles:
       - caddy
-    restart: on-failure:5
+    restart: on-failure
     ports:
       - 80:80
       - 443:443
@@ -18,12 +20,19 @@ services:
       - infra-network
     env_file:
       - env/caddy.env
-    security_opt:
-      - no-new-privileges:true
-    #cap_drop:
-    #  - ALL
     cap_add:
       - NET_ADMIN
+    security_opt:
+      - no-new-privileges:true
+    #    cap_drop:
+    #      - ALL
+    #    cap_add:
+    #      - CHOWN
+    #      - FOWNER
+    #      - DAC_OVERRIDE
+    #      - SETGID
+    #      - SETUID
+    #      - NET_BIND_SERVICE
     healthcheck:
       test: pidof caddy || exit 1
       interval: 120s

docker-compose.dns.yml

@@ -0,0 +1,23 @@
+version: '3.9'
+
+services:
+  dns-server:
+    container_name: dns-server
+    hostname: dns-server
+    profiles:
+      - dns-server
+    image: technitium/dns-server:latest
+    restart: on-failure
+    networks:
+      - infra-network
+    security_opt:
+      - no-new-privileges:true
+    volumes:
+      - dns-config:/etc/dns
+    env_file:
+      - env/technitium.env
+
+volumes:
+  dns-config:
+    name: dns-config
+

docker-compose.gitea.yml

@@ -1,3 +1,5 @@
+version: '3.9'
+
 services:
   # Gitea
   gitea:
@@ -5,12 +7,9 @@ services:
     container_name: gitea
     profiles:
       - gitea
-    restart: on-failure:5
+    restart: on-failure
     depends_on:
-      - database_gitea
       - caddy
-    ports:
-      - "22:22"
     env_file:
       - env/gitea.env
     volumes:
@@ -30,7 +29,9 @@ services:
     profiles:
       - database
       - gitea
-    restart: on-failure:5
+    depends_on:
+      - gitea
+    restart: on-failure
     volumes:
       - gitea_db:/var/lib/mysql:rw
     env_file:
@@ -41,26 +42,6 @@ services:
     security_opt:
       - no-new-privileges:true
 
-  # Gitea-runner
-  gitea-runner:
-    image: gitea/act_runner:latest
-    container_name: gitea-runner
-    profiles:
-      - gitea-runner
-    depends_on:
-      - gitea
-    restart: on-failure:5
-    env_file:
-      - env/gitea-runner.env
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - gitea_runner:/data
-      - ./config/gitea_runner/config.yaml:/config.yaml:ro
-    networks:
-      - infra-network
-    security_opt:
-      - no-new-privileges:true
-
 volumes:
   gitea_data:
     name: gitea_data
@@ -68,5 +49,3 @@ volumes:
     name: gitea_config
   gitea_db:
     name: gitea_db
-  gitea_runner:
-    name: gitea_runner

docker-compose.jellyfin.yml

@@ -1,3 +1,5 @@
+version: '3.9'
+
 services:
   # Jellyfin
   jellyfin:
@@ -5,20 +7,13 @@ services:
     container_name: jellyfin
     profiles:
       - jellyfin
-    restart: on-failure:5
+    restart: on-failure
     depends_on:
       - caddy
     volumes:
       - jellyfin_config:/config
-      - jellyfin_data_movies:/movies:rw
-      - jellyfin_data_series:/series:rw
-      - jellyfin_data_documentaries:/documentaries:rw
-      - jellyfin_data_musics:/musics:rw
-      - jellyfin_data_personal:/personal:rw
+      - jellyfin_data:/movies:ro
       - jellyfin_cache:/cache
-    # Hardware acceleration (For Intel and AMD GPUs)
-    devices:
-      - /dev/dri:/dev/dri
     networks:
       - infra-network
     security_opt:
@@ -27,15 +22,7 @@ services:
 volumes:
   jellyfin_config:
     name: jellyfin_config
-  jellyfin_data_movies:
-    name: jellyfin_data_movies
-  jellyfin_data_series:
-    name: jellyfin_data_series
-  jellyfin_data_documentaries:
-    name: jellyfin_data_documentaries
-  jellyfin_data_musics:
-    name: jellyfin_data_musics
-  jellyfin_data_personal:
-    name: jellyfin_data_personal
+  jellyfin_data:
+    name: jellyfin_data
   jellyfin_cache:
     name: jellyfin_cache

docker-compose.networks.yml

@@ -1,3 +1,5 @@
+version: '3.9'
+
 networks:
   infra-network:
     driver: bridge

docker-compose.openssh.yml

@@ -0,0 +1,25 @@
+version: '3.9'
+
+services:
+  # Openssh
+  openssh:
+    image: linuxserver/openssh-server:latest
+    container_name: openssh
+    profiles:
+      - openssh
+    restart: on-failure
+    env_file:
+      - env/openssh.env
+    volumes:
+      - openssh_config:/config
+      - openssh_data:/data
+    networks:
+      - infra-network
+    security_opt:
+      - no-new-privileges:true
+
+volumes:
+  openssh_config:
+    name: openssh_config
+  openssh_data:
+    name: openssh_data

docker-compose.psitransfer.yml

@@ -1,30 +0,0 @@
-services:
-  # psitransfer
-  psitransfer:
-    image: psitrax/psitransfer:latest
-    container_name: psitransfer
-    profiles:
-      - psitransfer
-    restart: on-failure:5
-    depends_on:
-      - caddy
-    env_file:
-      - env/psitransfer.env
-    volumes:
-      - psitransfer_data:/data
-    networks:
-      - infra-network
-    security_opt:
-      - no-new-privileges:true
-    deploy:
-      resources:
-        limits:
-          cpus: '0.5'
-          memory: 512M
-        reservations:
-          cpus: '0.001'
-          memory: 20M
-
-volumes:
-  psitransfer_data:
-    name: psitransfer_data

docker-compose.qbittorrent.yml

@@ -1,3 +1,5 @@
+version: '3.9'
+
 services:
   # qBittorrent
   qbittorrent:
@@ -5,7 +7,7 @@ services:
     container_name: qbittorrent
     profiles:
       - qbittorrent
-    restart: on-failure:5
+    restart: on-failure
     depends_on:
       - caddy
     env_file:

docker-compose.syncthing.yml

@@ -1,3 +1,5 @@
+version: '3.9'
+
 services:
   # syncthing
   syncthing:
@@ -5,9 +7,7 @@ services:
     container_name: syncthing
     profiles:
       - syncthing
-    depends_on:
-      - caddy
-    restart: on-failure:5
+    restart: on-failure
     env_file:
       - env/syncthing.env
     volumes:

docker-compose.transmission.yml

@@ -1,28 +0,0 @@
-services:
-  # transmission
-  transmission:
-    image: lscr.io/linuxserver/transmission:latest
-    container_name: transmission
-    profiles:
-      - transmission
-    restart: on-failure:5
-    depends_on:
-      - caddy
-    env_file:
-      - env/transmission.env
-    volumes:
-      - transmission_config:/config
-      - transmission_data:/downloads
-      - transmission_watch:/watch
-    networks:
-      - infra-network
-    security_opt:
-      - no-new-privileges:true
-
-volumes:
-  transmission_config:
-    name: transmission_config
-  transmission_data:
-    name: transmission_data
-  transmission_watch:
-    name: transmission_watch

docker-compose.uptime-kuma.yml

@@ -1,3 +1,5 @@
+version: '3.9'
+
 services:
   # Uptime Kuma
   uptime-kuma:
@@ -7,9 +9,7 @@ services:
       - uptime-kuma
     volumes:
       - uptimekuma_data:/app/data
-    restart: on-failure:5
-    depends_on:
-      - caddy
+    restart: on-failure
     networks:
       - infra-network
     security_opt:

docker-compose.volumes.yml

@@ -1,3 +1,5 @@
+version: '3.9'
+
 volumes:
   uptimekuma_data:
     name: uptimekuma_data

docker-compose.watchtower.yml

@@ -1,3 +1,5 @@
+version: '3.9'
+
 services:
   # Watchtower
   watchtower:
@@ -5,9 +7,7 @@ services:
     container_name: watchtower
     profiles:
       - watchtower
-    depends_on:
-      - caddy
-    restart: on-failure:5
+    restart: on-failure
     networks:
       - infra-network
     volumes:

docker-compose.wordpress.yml

@@ -1,3 +1,5 @@
+version: '3.9'
+
 services:
   # Wordpress
   wordpress:
@@ -5,7 +7,7 @@ services:
     container_name: wordpress
     profiles:
       - wordpress
-    restart: on-failure:5
+    restart: on-failure
     depends_on:
       - wordpress_db
       - caddy
@@ -28,7 +30,7 @@ services:
       - wordpress
     depends_on:
       - caddy
-    restart: on-failure:5
+    restart: on-failure
     volumes:
       - wordpress_db:/var/lib/mysql:rw
     env_file:
@@ -39,29 +41,8 @@ services:
     security_opt:
       - no-new-privileges:true
 
-  wordpress_backup:
-    image: mazzolino/restic:latest
-    container_name: wordpress_backup
-    profiles:
-      - wordpress
-    depends_on:
-      - wordpress
-    restart: on-failure:5
-    env_file:
-      - env/backup.env
-    volumes:
-      - wordpress_backup:/mnt/restic
-      - wordpress_db:/data/wordpress_db:ro
-      - wordpress:/data/wordpress:ro
-    networks:
-      - infra-network
-    security_opt:
-      - no-new-privileges:true
-
 volumes:
   wordpress_db:
     name: wordpress_db
   wordpress:
-    name: wordpress
-  wordpress_backup:
-    name: wordpress_backup
+    name: wordpress

env/backup.env

@@ -1,9 +1,4 @@
-#RUN_ON_STARTUP=true
-BACKUP_CRON=*/30 * * * *
-RESTIC_REPOSITORY=/mnt/restic
-RESTIC_BACKUP_SOURCES=/data
-RESTIC_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
-RESTIC_BACKUP_ARGS=--tag docker-volumes --verbose
-RESTIC_FORGET_ARGS=--prune --keep-last 8 --keep-daily 7 --keep-weekly 5 --keep-monthly 12 --keep-yearly 4
-#RESTIC_PRUNE_ARGS=
-RESTIC_CHECK_ARGS=--read-data-subset=20%
+BACKUP_COMPRESSION="zst"
+BACKUP_CRON_EXPRESSION="0 2 * * *"
+# BACKUP_RETENTION_DAYS: '7'
+# BACKUP_FILENAME="backup-%Y-%m-%dT%H-%M-%S.{{ .Extension }}"

env/gitea-runner.env

@@ -1,5 +0,0 @@
-GITEA_INSTANCE_URL=https://git.bensuperpc.org
-GITEA_RUNNER_REGISTRATION_TOKEN=TBGzS0m823Xk732zRqjrbcSWFTEPajj5V5OFzXWP
-GITEA_RUNNER_NAME=runner-1
-#GITEA_RUNNER_LABELS=
-CONFIG_FILE=/config.yaml

env/gitea.env

@@ -4,12 +4,4 @@ GITEA__database__DB_TYPE=mysql
 GITEA__database__HOST=database_gitea:3306
 GITEA__database__NAME=gitea
 GITEA__database__USER=bensuperpc
-GITEA__database__PASSWD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j
-GITEA__security__SECRET_KEY=ykcZt23an1E4lFHWvrCKdAyt16WAiK9c
-#GITEA__security__INTERNAL_TOKEN=
-GITEA__server__DOMAIN=git.bensuperpc.org
-GITEA__server__SSH_DOMAIN=git.bensuperpc.org
-GITEA__server__HTTP_PORT=3000
-GITEA__server__SSH_LISTEN_PORT=22
-GITEA__server__SSH_PORT=22
-GITEA__server__ROOT_URL=https://git.bensuperpc.org
+GITEA__database__PASSWD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j

env/openssh.env

@@ -0,0 +1,11 @@
+PUID=1000
+PGID=1000
+PUBLIC_KEY=
+# PUBLIC_KEY_FILE=
+# PUBLIC_KEY_DIR=
+# PUBLIC_KEY_URL=
+SUDO_ACCESS=false
+PASSWORD_ACCESS=false
+# USER_PASSWORD=
+# USER_PASSWORD_FILE=
+# USER_NAME=

env/psitransfer.env

@@ -1,2 +0,0 @@
-PSITRANSFER_ADMIN_PASS=n9jLVNT9QUotTJTT91JqH4GyBTg9pvEn
-#PSITRANSFER_PORT=3000

env/technitium.env

@@ -0,0 +1,18 @@
+DNS_SERVER_DOMAIN=dns-server
+DNS_SERVER_ADMIN_PASSWORD=fddsdfF548TjSNbi490fzZspmLSDf
+# DNS_SERVER_ADMIN_PASSWORD_FILE=password.txt
+# DNS_SERVER_PREFER_IPV6=false
+# DNS_SERVER_WEB_SERVICE_HTTP_PORT=5380
+# DNS_SERVER_WEB_SERVICE_HTTPS_PORT=53443
+# DNS_SERVER_WEB_SERVICE_ENABLE_HTTPS=true
+# DNS_SERVER_WEB_SERVICE_USE_SELF_SIGNED_CERT=false
+# DNS_SERVER_OPTIONAL_PROTOCOL_DNS_OVER_HTTP=true
+# DNS_SERVER_RECURSION=AllowOnlyForPrivateNetworks
+# DNS_SERVER_RECURSION_DENIED_NETWORKS=1.1.1.0/24
+# DNS_SERVER_RECURSION_ALLOWED_NETWORKS=127.0.0.1, 192.168.1.0/24
+# DNS_SERVER_ENABLE_BLOCKING=false
+# DNS_SERVER_ALLOW_TXT_BLOCKING_REPORT=false
+# DNS_SERVER_BLOCK_LIST_URLS=
+# DNS_SERVER_FORWARDERS=1.1.1.1, 8.8.8.8
+# DNS_SERVER_FORWARDER_PROTOCOL=Tcp
+# DNS_SERVER_LOG_USING_LOCAL_TIME=true

env/transmission.env

@@ -1,5 +0,0 @@
-PUID=1000
-PGID=1000
-TZ=Etc/UTC
-USER=admin
-PASS=4vqXCNGG09JUBe7rXkuQS8MG7ovE6Vxj