diff --git a/Makefile b/Makefile index ebd4b75..f9e7d16 100644 --- a/Makefile +++ b/Makefile @@ -13,10 +13,10 @@ DOCKER := docker -PROFILES := caddy wordpress adminer backup transmission syncthing gitea gitea-runner uptime-kuma jellyfin watchtower +PROFILES := caddy wordpress adminer backup transmission syncthing uptime-kuma jellyfin qbittorrent psitransfer PROFILE_CMD := $(addprefix --profile ,$(PROFILES)) -# qbittorrent +# gitea-runner watchtower gitea COMPOSE_FILES := $(shell find docker-compose*.yml | sed -e 's/^/--file /') diff --git a/README.md b/README.md index 1ad418e..38cd4d9 100644 --- a/README.md +++ b/README.md @@ -121,6 +121,7 @@ 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. @@ -132,6 +133,12 @@ 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: diff --git a/caddy/bensuperpc.org/Caddyfile b/caddy/bensuperpc.org/Caddyfile index 14c4cb0..67498f1 100644 --- a/caddy/bensuperpc.org/Caddyfile +++ b/caddy/bensuperpc.org/Caddyfile @@ -63,6 +63,10 @@ jellyfin.bensuperpc.org { reverse_proxy jellyfin:8096 } +psitransfer.bensuperpc.org { + reverse_proxy psitransfer:3000 +} + syncthing.bensuperpc.org { reverse_proxy syncthing:8384 { header_up Host {upstream_hostport} @@ -89,7 +93,7 @@ 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 /chanteur https://youtu.be/HXdP15Ubu6M?si=N0qvhqo--3pmSGmb permanent + redir /lechanteur 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 diff --git a/docker-compose.psitransfer.yml b/docker-compose.psitransfer.yml new file mode 100644 index 0000000..9e70591 --- /dev/null +++ b/docker-compose.psitransfer.yml @@ -0,0 +1,22 @@ +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 + +volumes: + psitransfer_data: + name: psitransfer_data \ No newline at end of file diff --git a/env/backup.env b/env/backup.env index 138647a..32ce056 100644 --- a/env/backup.env +++ b/env/backup.env @@ -1,4 +1,4 @@ -BACKUP_CRON=0 2 * * * +BACKUP_CRON=0 * * * * RESTIC_REPOSITORY=/mnt/restic RESTIC_BACKUP_SOURCES=/data RESTIC_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ diff --git a/env/gitea.env b/env/gitea.env index deda923..02adb62 100644 --- a/env/gitea.env +++ b/env/gitea.env @@ -5,7 +5,7 @@ GITEA__database__HOST=database_gitea:3306 GITEA__database__NAME=gitea GITEA__database__USER=bensuperpc GITEA__database__PASSWD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j -#GITEA__security__SECRET_KEY= +GITEA__security__SECRET_KEY=ykcZt23an1E4lFHWvrCKdAyt16WAiK9c #GITEA__security__INTERNAL_TOKEN= GITEA__server__DOMAIN=git.bensuperpc.org GITEA__server__SSH_DOMAIN=git.bensuperpc.org diff --git a/env/psitransfer.env b/env/psitransfer.env new file mode 100644 index 0000000..8fcc960 --- /dev/null +++ b/env/psitransfer.env @@ -0,0 +1 @@ +PSITRANSFER_ADMIN_PASS=n9jLVNT9QUotTJTT91JqH4GyBTg9pvEn