Compare commits

..

No commits in common. "main" and "renovate/dawidd6-action-ansible-playbook-3.x" have entirely different histories.

5 changed files with 41 additions and 62 deletions

View File

@ -4,7 +4,7 @@ services:
traefik:
container_name: traefik
# The official v2 Traefik docker image
image: traefik:v3.4
image: traefik:v3.1
restart: unless-stopped
depends_on:
- crowdsec
@ -25,7 +25,6 @@ services:
- --experimental.plugins.crowdsec-bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin
- --experimental.plugins.crowdsec-bouncer.version=v1.2.1
# - "--certificatesresolvers.myresolver.acme.tlschallenge=true"
- --accesslog=true
ports:
# The HTTP port
- "80:80"
@ -72,7 +71,7 @@ services:
# Schedule: "*/5 * * * *" #optional
# TZ: Canada/Eastern #optional
dokuwiki:
image: linuxserver/dokuwiki:version-2025-05-14a
image: bitnami/dokuwiki:20240206
restart: unless-stopped
container_name: dokuwiki
ports:
@ -90,7 +89,7 @@ services:
- "traefik.http.routers.dokuwiki.entrypoints=websecure"
- "traefik.http.routers.dokuwiki.tls.certresolver=myresolver"
- traefik.http.routers.dokuwiki.tls=true
#- "traefik.http.routers.dokuwiki.middlewares=crowdsec@docker"
- "traefik.http.routers.dokuwiki.middlewares=crowdsec@docker"
mail-server:
tty: true
stdin_open: true
@ -107,7 +106,7 @@ services:
volumes:
- ./stalwart-mail:/opt/stalwart-mail
container_name: stalwart-mail
image: stalwartlabs/mail-server:v0.11.6
image: stalwartlabs/mail-server:v0.10.6
labels:
- "traefik.enable=true"
- "traefik.http.routers.stalwart.rule=Host(`stalwart.mycomputer.party`)"
@ -180,7 +179,7 @@ services:
timeout: 3s
authentik-server:
container_name: authentik-server
image: ghcr.io/goauthentik/server:2025.6.2
image: ghcr.io/goauthentik/server:2025.2.2
restart: unless-stopped
command: server
environment:
@ -214,7 +213,7 @@ services:
- "traefik.http.routers.authentik.middlewares=crowdsec@docker"
authentik-worker:
container_name: authentik-worker
image: ghcr.io/goauthentik/server:2025.6.2
image: ghcr.io/goauthentik/server:2025.2.2
restart: unless-stopped
command: worker
environment:
@ -240,7 +239,7 @@ services:
depends_on:
- redis
changedetection:
image: ghcr.io/dgtlmoon/changedetection.io:0.49.7
image: ghcr.io/dgtlmoon/changedetection.io:0.47.06
container_name: changedetection
hostname: changedetection
volumes:
@ -372,7 +371,7 @@ services:
- "traefik.http.services.healthchecks-http.loadbalancer.server.port=8000"
- "traefik.http.routers.healthchecks.middlewares=authchain@docker"
apache:
image: php:8.4-apache
image: php:7.2-apache
volumes:
- ./apache:/var/www/html
ports:
@ -389,7 +388,7 @@ services:
networks:
- backend
apache2:
image: php:8.4-apache
image: php:7.2-apache
volumes:
- ./apache:/var/www/html
ports:
@ -405,23 +404,6 @@ services:
# - traefik.http.routers.apache2.middlewares=authchain@docker
networks:
- backend
cocktails:
image: php:8.4-apache
volumes:
- ./cocktails_static:/var/www/html
ports:
- 8017:80
container_name: cocktails
labels:
- "traefik.enable=true"
- "traefik.http.routers.cocktails.rule=Host(`cocktails.mycomputer.party`)"
- "traefik.http.routers.cocktails.entrypoints=websecure"
- "traefik.http.routers.cocktails.tls.certresolver=myresolver"
- "traefik.http.routers.cocktails.tls=true"
- "traefik.http.services.cocktails-http.loadbalancer.server.port=80"
# - traefik.http.routers.cocktails.middlewares=authchain@docker
networks:
- backend
# wireguard:
# image: lscr.io/linuxserver/wireguard
@ -446,7 +428,7 @@ services:
# - net.ipv4.conf.all.src_valid_mark=1
# restart: unless-stopped
crowdsec:
image: crowdsecurity/crowdsec:v1.6.9
image: crowdsecurity/crowdsec:v1.6.3
container_name: crowdsec
environment:
PGID: "1001"
@ -473,7 +455,7 @@ services:
- proxy
- backend
ddns-updater:
image: docker.io/qmcgaw/ddns-updater:v2.9
image: docker.io/qmcgaw/ddns-updater:v2.8
container_name: ddns-updater
ports:
- 8014:8000
@ -522,7 +504,7 @@ services:
- ./bookstack_db_data:/config
restart: unless-stopped
wikijs:
image: ghcr.io/requarks/wiki:2.5.307
image: ghcr.io/requarks/wiki:2.5.305
container_name: wikijs
environment:
DB_TYPE: postgres
@ -551,22 +533,21 @@ services:
- traefik.http.routers.plik.tls=true
- "traefik.http.routers.plik.entrypoints=websecure"
- "traefik.http.routers.plik.tls.certresolver=myresolver"
#cmg:
# image: gitea.mycomputer.party/justus/cmg:latest
# container_name: cmg
# volumes:
# - ./cmg/static:/usr/local/app/static
# - ./cmg/templates:/usr/local/app/templates
# - ./cmg/menu:/usr/local/app/menu
# ports:
# - 8016:5000
# restart: unless-stopped
# labels:
# - "traefik.http.routers.cmg.rule=Host(`cocktailmenu.mycomputer.party`)"
# - traefik.http.routers.cmg.tls=true
# - "traefik.http.routers.cmg.entrypoints=websecure"
# - "traefik.http.routers.cmg.tls.certresolver=myresolver"
cmg:
image: gitea.mycomputer.party/justus/cmg:latest
container_name: cmg
volumes:
- ./cmg/static:/usr/local/app/static
- ./cmg/templates:/usr/local/app/templates
- ./cmg/menu:/usr/local/app/menu
ports:
- 8016:5000
restart: unless-stopped
labels:
- "traefik.http.routers.cmg.rule=Host(`cocktailmenu.mycomputer.party`)"
- traefik.http.routers.cmg.tls=true
- "traefik.http.routers.cmg.entrypoints=websecure"
- "traefik.http.routers.cmg.tls.certresolver=myresolver"

View File

@ -3,9 +3,8 @@ services:
traefik:
container_name: traefik
# The official v2 Traefik docker image
image: traefik:v3.4
image: traefik:v2.11
# Enables the web UI and tells Traefik to listen to docker
restart: unless-stopped
command:
- --api.insecure=true
- --providers.docker
@ -60,7 +59,7 @@ services:
volumes:
- redisdata:/data
paperless-webserver:
image: ghcr.io/paperless-ngx/paperless-ngx:2.16.3
image: ghcr.io/paperless-ngx/paperless-ngx:2.13.5
container_name: paperless-webserver
restart: unless-stopped
depends_on:
@ -73,9 +72,8 @@ services:
- media:/usr/src/paperless/media
- export:/usr/src/paperless/export
- consume:/usr/src/paperless/consume
#env_file: docker-compose.env
environment:
PAPERLESS_DATE_ORDER: MDY
env_file: docker-compose.env
# environment:
labels:
- "traefik.http.routers.paperless.rule=Host(`paperless.injust.us`)"
- "traefik.http.routers.paperless.entrypoints=websecure"
@ -161,7 +159,7 @@ services:
redis:
container_name: immich_redis
image: docker.io/redis:6.2-alpine@sha256:148bb5411c184abd288d9aaed139c98123eeb8824c5d3fce03cf721db58066d8
image: docker.io/redis:6.2-alpine@sha256:eaba718fecd1196d88533de7ba49bf903ad33664a92debb24660a922ecd9cac8
healthcheck:
test: redis-cli ping || exit 1
restart: always

View File

@ -11,7 +11,7 @@ volumes:
services:
server:
image: gitea/gitea:1.23.5
image: gitea/gitea:1.22.3
container_name: gitea
restart: unless-stopped
environment:

View File

@ -10,7 +10,7 @@
- name: Delete existing netplan
ansible.builtin.command: rm -f /etc/netplan/*
- name: Copy netplan
ansible.builtin.template:
src: assets/{{ inventory_hostname }}/01-netcfg.yaml.j2
@ -71,7 +71,7 @@
backup: true
- name: Configure Docker hosts
hosts:
hosts:
- docker
vars:
tags:
@ -95,7 +95,7 @@
ansible.builtin.shell: docker image prune -f
- name: Homeserver wireguard
hosts:
hosts:
- docker-ext
tags:
- bastion

View File

@ -6,7 +6,7 @@ all:
ungrouped:
hosts:
bastion:
ansible_host: 51.222.155.202
ansible_host: 51.222.155.202
ansible_ssh_user: root
docker:
@ -16,14 +16,14 @@ docker:
docker-int:
ansible_ssh_user: root
basementpi:
ansible_host: 10.11.1.10
ansible_host: 10.11.1.10
ansible_ssh_user: root
gitea:
ansible_ssh_user: root
#wireguard:
# hosts:
# wireguard:
wireguard:
hosts:
wireguard:
external_access:
hosts: