Disabled crowdsec on wiki.my for testing

fixed router name for cocktails container
Upgrade traefik on docker-ext
2025-07-06 08:15:13 -04:00 · 2025-07-06 08:10:11 -04:00 · 2025-07-06 07:57:39 -04:00 · 2025-07-06 07:47:40 -04:00 · 2025-07-04 07:04:31 -04:00 · 2025-07-04 06:57:58 -04:00
5 changed files with 62 additions and 41 deletions
--- a/ansible/assets/docker-ext/compose.yml.j2
+++ b/ansible/assets/docker-ext/compose.yml.j2
@ -4,7 +4,7 @@ services:
  traefik:
    container_name: traefik
    # The official v2 Traefik docker image
-    image: traefik:v3.1
+    image: traefik:v3.4
    restart: unless-stopped
    depends_on:
      - crowdsec
@ -25,6 +25,7 @@ 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"
@ -71,7 +72,7 @@ services:
      #      Schedule: "*/5 * * * *" #optional
      #      TZ: Canada/Eastern #optional
  dokuwiki:
-    image: bitnami/dokuwiki:20240206
+    image: linuxserver/dokuwiki:version-2025-05-14a
    restart: unless-stopped
    container_name: dokuwiki
    ports:
@ -89,7 +90,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
@ -106,7 +107,7 @@ services:
    volumes:
      - ./stalwart-mail:/opt/stalwart-mail
    container_name: stalwart-mail
-    image: stalwartlabs/mail-server:v0.10.6
+    image: stalwartlabs/mail-server:v0.11.6
    labels:
      - "traefik.enable=true"
      - "traefik.http.routers.stalwart.rule=Host(`stalwart.mycomputer.party`)"
@ -179,7 +180,7 @@ services:
      timeout: 3s
  authentik-server:
    container_name: authentik-server
-    image: ghcr.io/goauthentik/server:2025.2.2
+    image: ghcr.io/goauthentik/server:2025.6.2
    restart: unless-stopped
    command: server
    environment:
@ -213,7 +214,7 @@ services:
      - "traefik.http.routers.authentik.middlewares=crowdsec@docker"
  authentik-worker:
    container_name: authentik-worker
-    image: ghcr.io/goauthentik/server:2025.2.2
+    image: ghcr.io/goauthentik/server:2025.6.2
    restart: unless-stopped
    command: worker
    environment:
@ -239,7 +240,7 @@ services:
    depends_on:
      - redis
  changedetection:
-    image: ghcr.io/dgtlmoon/changedetection.io:0.47.06
+    image: ghcr.io/dgtlmoon/changedetection.io:0.49.7
    container_name: changedetection
    hostname: changedetection
    volumes:
@ -371,7 +372,7 @@ services:
      - "traefik.http.services.healthchecks-http.loadbalancer.server.port=8000"
      - "traefik.http.routers.healthchecks.middlewares=authchain@docker"
  apache:
-    image: php:7.2-apache
+    image: php:8.4-apache
    volumes:
      - ./apache:/var/www/html
    ports:
@ -388,7 +389,7 @@ services:
    networks:
      - backend
  apache2:
-    image: php:7.2-apache
+    image: php:8.4-apache
    volumes:
      - ./apache:/var/www/html
    ports:
@ -404,6 +405,23 @@ 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
@ -428,7 +446,7 @@ services:
      #    - net.ipv4.conf.all.src_valid_mark=1
      #  restart: unless-stopped
  crowdsec:
-    image: crowdsecurity/crowdsec:v1.6.3
+    image: crowdsecurity/crowdsec:v1.6.9
    container_name: crowdsec
    environment:
      PGID: "1001"
@ -455,7 +473,7 @@ services:
      - proxy
      - backend
  ddns-updater:
-    image: docker.io/qmcgaw/ddns-updater:v2.8
+    image: docker.io/qmcgaw/ddns-updater:v2.9
    container_name: ddns-updater
    ports:
      - 8014:8000
@ -504,7 +522,7 @@ services:
      - ./bookstack_db_data:/config
    restart: unless-stopped
  wikijs:
-    image: ghcr.io/requarks/wiki:2.5.305
+    image: ghcr.io/requarks/wiki:2.5.307
    container_name: wikijs
    environment:
      DB_TYPE: postgres
@ -533,21 +551,22 @@ 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"
+



--- a/ansible/assets/docker-int/compose.yml.j2
+++ b/ansible/assets/docker-int/compose.yml.j2
@ -3,8 +3,9 @@ services:
  traefik:
    container_name: traefik
    # The official v2 Traefik docker image
-    image: traefik:v2.11
+    image: traefik:v3.4
    # Enables the web UI and tells Traefik to listen to docker
+    restart: unless-stopped
    command:
      - --api.insecure=true
      - --providers.docker
@ -59,7 +60,7 @@ services:
    volumes:
      - redisdata:/data
  paperless-webserver:
-    image: ghcr.io/paperless-ngx/paperless-ngx:2.13.5
+    image: ghcr.io/paperless-ngx/paperless-ngx:2.16.3
    container_name: paperless-webserver
    restart: unless-stopped
    depends_on:
@ -72,8 +73,9 @@ services:
      - media:/usr/src/paperless/media
      - export:/usr/src/paperless/export
      - consume:/usr/src/paperless/consume
-    env_file: docker-compose.env
-    # environment:
+    #env_file: docker-compose.env
+    environment:
+      PAPERLESS_DATE_ORDER: MDY
    labels:
      - "traefik.http.routers.paperless.rule=Host(`paperless.injust.us`)"
      - "traefik.http.routers.paperless.entrypoints=websecure"
@ -159,7 +161,7 @@ services:

  redis:
    container_name: immich_redis
-    image: docker.io/redis:6.2-alpine@sha256:eaba718fecd1196d88533de7ba49bf903ad33664a92debb24660a922ecd9cac8
+    image: docker.io/redis:6.2-alpine@sha256:148bb5411c184abd288d9aaed139c98123eeb8824c5d3fce03cf721db58066d8
    healthcheck:
      test: redis-cli ping || exit 1
    restart: always
--- a/ansible/assets/git/compose.yml.j2
+++ b/ansible/assets/git/compose.yml.j2
@ -11,7 +11,7 @@ volumes:

 services:
  server:
-    image: gitea/gitea:1.22.3
+    image: gitea/gitea:1.23.5
    container_name: gitea
    restart: unless-stopped
    environment:
--- a/ansible/buildHomelab.yaml
+++ b/ansible/buildHomelab.yaml
@ -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
--- a/ansible/inventory/hosts.yaml
+++ b/ansible/inventory/hosts.yaml
@ -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:
Author	SHA1	Message	Date
Justus Grunow	738905f6dd	Disabled crowdsec on wiki.my for testing All checks were successful Ansible Deploy / Homelab-Deploy (ansible/buildHomelab.yaml) (push) Successful in 2m18s Details	2025-07-06 08:15:13 -04:00
Justus Grunow	39785d6661	fixed router name for cocktails container All checks were successful Ansible Deploy / Homelab-Deploy (ansible/buildHomelab.yaml) (push) Successful in 2m14s Details	2025-07-06 08:10:11 -04:00
Justus Grunow	ba89e1730d	Upgrade traefik on docker-ext All checks were successful Ansible Deploy / Homelab-Deploy (ansible/buildHomelab.yaml) (push) Successful in 2m27s Details	2025-07-06 07:57:39 -04:00
Justus Grunow	a345736d3c	Upgrade traefik Some checks failed Ansible Deploy / Homelab-Deploy (ansible/buildHomelab.yaml) (push) Failing after 2m13s Details	2025-07-06 07:47:40 -04:00
Justus Grunow	303e9fc542	Fixed container name for cocktails All checks were successful Ansible Deploy / Homelab-Deploy (ansible/buildHomelab.yaml) (push) Successful in 2m19s Details	2025-07-04 07:04:31 -04:00
Justus Grunow	7f68ebfd85	changed dokuwiki image to linuxserver since its no longer available from bitnami Some checks failed Ansible Deploy / Homelab-Deploy (ansible/buildHomelab.yaml) (push) Failing after 2m49s Details	2025-07-04 06:57:58 -04:00
Justus Grunow	23cefa5b75	Added static cocktails Some checks failed Ansible Deploy / Homelab-Deploy (ansible/buildHomelab.yaml) (push) Failing after 2m43s Details	2025-07-04 06:42:26 -04:00
Justus Grunow	dc7d886f57	Update crowdsec Some checks failed Ansible Deploy / Homelab-Deploy (ansible/buildHomelab.yaml) (push) Failing after 17m4s Details	2025-06-26 07:16:01 -04:00
Justus Grunow	932f931eb0	Updated Authentik Some checks failed Ansible Deploy / Homelab-Deploy (ansible/buildHomelab.yaml) (push) Failing after 17m6s Details	2025-06-18 06:32:51 -04:00
Justus Grunow	f4e8aefb63	Removed wireguard host from ansible inventory, deleted errant All checks were successful Ansible Deploy / Homelab-Deploy (ansible/buildHomelab.yaml) (push) Successful in 2m0s Details underscores	2025-06-17 06:51:29 -04:00
Justus Grunow	4e7e7a7f09	Restart traefik automatically on docker-int, enabled access logs on Some checks failed Ansible Deploy / Homelab-Deploy (ansible/buildHomelab.yaml) (push) Failing after 2m40s Details traefik@docker-ext	2025-06-17 06:41:12 -04:00
Justus Grunow	8b5e3e10bd	Changed Paperless date format Some checks failed Ansible Deploy / Homelab-Deploy (ansible/buildHomelab.yaml) (push) Failing after 2m6s Details	2025-06-14 08:26:12 -04:00
Justus Grunow	60406eaf34	Update Paperless Some checks failed Ansible Deploy / Homelab-Deploy (ansible/buildHomelab.yaml) (push) Failing after 16m8s Details	2025-06-13 06:33:59 -04:00
justus	b63a8b9171	Merge pull request 'Update traefik Docker tag to v3.3' (#23 ) from renovate/traefik-3.x into main Some checks failed Ansible Deploy / Homelab-Deploy (ansible/buildHomelab.yaml) (push) Failing after 2m22s Details Reviewed-on: #23	2025-03-24 12:30:45 -04:00
justus	ce7f566374	Merge pull request 'Update php Docker tag to v8' (#22 ) from renovate/php-8.x into main Some checks failed Ansible Deploy / Homelab-Deploy (ansible/buildHomelab.yaml) (push) Failing after 5m29s Details Reviewed-on: #22	2025-03-24 07:52:48 -04:00
justus	53822439a0	Merge pull request 'Update crowdsecurity/crowdsec Docker tag to v1.6.6' (#25 ) from renovate/crowdsecurity-crowdsec-1.x into main Some checks failed Ansible Deploy / Homelab-Deploy (ansible/buildHomelab.yaml) (push) Has been cancelled Details Reviewed-on: #25	2025-03-24 07:51:36 -04:00
justus	a8fbd55566	Merge pull request 'Update gitea/gitea Docker tag to v1.23.5' (#26 ) from renovate/gitea-gitea-1.x into main Some checks failed Ansible Deploy / Homelab-Deploy (ansible/buildHomelab.yaml) (push) Has been cancelled Details Reviewed-on: #26	2025-03-24 07:51:24 -04:00
justus	407956f095	Merge pull request 'Update stalwartlabs/mail-server Docker tag to v0.11.6' (#27 ) from renovate/stalwartlabs-mail-server-0.x into main Some checks failed Ansible Deploy / Homelab-Deploy (ansible/buildHomelab.yaml) (push) Has been cancelled Details Reviewed-on: #27	2025-03-24 07:50:49 -04:00
justus	eabe7158ce	Merge pull request 'Update ghcr.io/dgtlmoon/changedetection.io Docker tag to v0.49.7' (#30 ) from renovate/ghcr.io-dgtlmoon-changedetection.io-0.x into main Some checks failed Ansible Deploy / Homelab-Deploy (ansible/buildHomelab.yaml) (push) Has been cancelled Details Reviewed-on: #30	2025-03-24 07:50:24 -04:00
justus	32d6f70d0a	Merge pull request 'Update docker.io/redis:6.2-alpine Docker digest to 148bb54' (#34 ) from renovate/docker.io-redis-6.2-alpine into main Some checks failed Ansible Deploy / Homelab-Deploy (ansible/buildHomelab.yaml) (push) Has been cancelled Details Reviewed-on: #34	2025-03-24 07:49:53 -04:00
justus	e7ce0a338a	Merge pull request 'Update ghcr.io/requarks/wiki Docker tag to v2.5.307' (#35 ) from renovate/ghcr.io-requarks-wiki-2.x into main Some checks failed Ansible Deploy / Homelab-Deploy (ansible/buildHomelab.yaml) (push) Has been cancelled Details Reviewed-on: #35	2025-03-24 07:49:41 -04:00
justus	22e8845ddb	Merge pull request 'Update docker.io/qmcgaw/ddns-updater Docker tag to v2.9' (#36 ) from renovate/docker.io-qmcgaw-ddns-updater-2.x into main Some checks failed Ansible Deploy / Homelab-Deploy (ansible/buildHomelab.yaml) (push) Has been cancelled Details Reviewed-on: #36	2025-03-24 07:49:20 -04:00
justus	b69a89cc79	Merge pull request 'Update ghcr.io/paperless-ngx/paperless-ngx Docker tag to v2.14.7' (#37 ) from renovate/ghcr.io-paperless-ngx-paperless-ngx-2.x into main Some checks failed Ansible Deploy / Homelab-Deploy (ansible/buildHomelab.yaml) (push) Has been cancelled Details Reviewed-on: #37	2025-03-24 07:48:59 -04:00
justus	768cd85c67	Merge branch 'main' into renovate/ghcr.io-paperless-ngx-paperless-ngx-2.x	2025-03-24 07:48:47 -04:00
justus	23059ba9db	Merge pull request 'Update dawidd6/action-ansible-playbook action to v3' (#40 ) from renovate/dawidd6-action-ansible-playbook-3.x into main Some checks failed Ansible Deploy / Homelab-Deploy (ansible/buildHomelab.yaml) (push) Has been cancelled Details Reviewed-on: #40	2025-03-24 07:48:14 -04:00
Renovate Bot	68e658599b	Update ghcr.io/paperless-ngx/paperless-ngx Docker tag to v2.14.7	2025-03-24 11:26:36 +00:00
Renovate Bot	a51efe581b	Update docker.io/qmcgaw/ddns-updater Docker tag to v2.9	2025-03-24 11:26:22 +00:00
Renovate Bot	fb2d65e38b	Update ghcr.io/requarks/wiki Docker tag to v2.5.307	2025-03-24 11:26:18 +00:00
Renovate Bot	84216da14e	Update docker.io/redis:6.2-alpine Docker digest to 148bb54	2025-03-24 11:26:10 +00:00
Renovate Bot	6d4e0d523d	Update ghcr.io/dgtlmoon/changedetection.io Docker tag to v0.49.7	2025-03-24 04:00:49 +00:00
Renovate Bot	1b4146eb84	Update crowdsecurity/crowdsec Docker tag to v1.6.6	2025-03-21 04:00:44 +00:00
Renovate Bot	88f534fe0c	Update gitea/gitea Docker tag to v1.23.5	2025-03-05 05:01:00 +00:00
Renovate Bot	68ebb0a8b3	Update traefik Docker tag to v3.3	2025-02-07 11:48:49 +00:00
Renovate Bot	6766167fd9	Update php Docker tag to v8	2025-02-07 11:48:47 +00:00
Renovate Bot	799364580a	Update stalwartlabs/mail-server Docker tag to v0.11.6	2025-02-07 11:48:40 +00:00