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

View File

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

View File

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

View File

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

View File

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