Compare commits
1 Commits
ba3b781b78
...
fec82e31c1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fec82e31c1 |
@ -4,7 +4,7 @@ services:
|
||||
traefik:
|
||||
container_name: traefik
|
||||
# The official v2 Traefik docker image
|
||||
image: traefik:v3.4
|
||||
image: traefik:v3.3
|
||||
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
|
||||
@ -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:
|
||||
@ -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.6
|
||||
container_name: crowdsec
|
||||
environment:
|
||||
PGID: "1001"
|
||||
@ -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"
|
||||
|
||||
|
||||
|
||||
|
||||
@ -3,9 +3,8 @@ services:
|
||||
traefik:
|
||||
container_name: traefik
|
||||
# The official v2 Traefik docker image
|
||||
image: traefik:v3.4
|
||||
image: traefik:v3.3
|
||||
# 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.14.7
|
||||
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"
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
ansible==8.7.0
|
||||
ansible-core==2.18.7
|
||||
ansible-core==2.18.6
|
||||
#cffi==1.15.1
|
||||
#cryptography==39.0.0
|
||||
#Jinja2==3.1.2
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user