diff --git a/docker/pi5/docker-compose.yaml b/docker/pi5/docker-compose.yaml index 3bf4a23..03d3271 100755 --- a/docker/pi5/docker-compose.yaml +++ b/docker/pi5/docker-compose.yaml @@ -1,5 +1,6 @@ --- services: + portainer: image: portainer/portainer-ce:latest container_name: portainer @@ -101,10 +102,6 @@ services: - PGID=1000 network_mode: "service:gluetun" restart: always - depends_on: - gluetun: - condition: service_healthy - restart: true jellyfin: image: lscr.io/linuxserver/jellyfin:latest @@ -211,24 +208,21 @@ services: ports: - '3000:3000' - '222:22' - - nginx-proxy-manager: - image: jc21/nginx-proxy-manager:latest - container_name: nginx-proxy-manager + nginx: + image: nginx:latest + container_name: nginx-proxy ports: - "80:80" - "443:443" - - "81:81" volumes: - - /config/nginx/data:/data - - /config/nginx/letsencrypt:/etc/letsencrypt - restart: unless-stopped + - /config/nginx/nginx.conf:/etc/nginx/nginx.conf + - /config/nginx/certs:/etc/nginx/certs networks: forgejo: external: false - #default: - # external: true - + default: + external: true +# name: nginx-proxy-net volumes: model-cache: diff --git a/infra_conf/backup.sh b/infra_conf/backup.sh deleted file mode 100755 index e00ef87..0000000 --- a/infra_conf/backup.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -DestDir="/mnt/data/backups/arch-griffix/griffix/" - -rsync -avuz --exclude ".local/share/Steam" --exclude "Games" --exclude "Téléchargements" /home/griffix/ $DestDir -rsync -avuz /mnt/pi5data/backups/pi5 /mnt/data/backups/ -rsync -avuz /mnt/pi5data/backups/immich /mnt/data/backups/ -rsync -avuz --exclude ".local/share/Steam" --exclude "Games" --exclude "Téléchargements" /home/griffix /mnt/pi5data/backups/ -exit $? diff --git a/infra_conf/backup_pi5.sh b/infra_conf/backup_pi5.sh deleted file mode 100755 index 8e8a5f9..0000000 --- a/infra_conf/backup_pi5.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -DestDir="/media/Seagate/backups/pi5/config/" - -echo "docker compose stop" -docker compose -f /config/compose.yaml stop - -echo "rsync /config" -rsync -avuz /config/ $DestDir - -echo "rsync immich" -rsync -avuz /media/Seagate/immich /media/Seagate/backups/immich - -echo "docker compose start" -docker compose -f /config/compose.yaml start - -echo "done" -exit $? diff --git a/infra_conf/backups.pptx b/infra_conf/backups.pptx deleted file mode 100644 index e2e32f2..0000000 Binary files a/infra_conf/backups.pptx and /dev/null differ diff --git a/infra_conf/home_backup.sh b/infra_conf/home_backup.sh deleted file mode 100755 index e69de29..0000000