Compare commits

...

4 Commits

@ -12,7 +12,6 @@ volumes:
nginx_logs: nginx_logs:
services: services:
traefik: traefik:
image: "traefik:v2.2" image: "traefik:v2.2"
ports: ports:

@ -53,7 +53,7 @@
- name: ensure the app folders exist - name: ensure the app folders exist
file: state=directory path={{ item }} owner=josiah group=josiah mode=0700 file: state=directory path={{ item }} owner=josiah group=josiah mode=0700
loop: [ '/home/josiah/apps/smokeping/', '/home/josiah/apps/smokeping/config/', '/home/josiah/apps/letsencrypt/', '/home/josiah/apps/smokeping/config/', '/home/josiah/apps/smokeping/data' ] loop: [ '/home/josiah/apps/smokeping/', '/home/josiah/apps/letsencrypt/', '/home/josiah/apps/smokeping/config/', '/home/josiah/apps/smokeping/data', '/home/josiah/apps/overseerr/config/' ]
- name: copy over awful-All config files - name: copy over awful-All config files
template: template:
@ -62,8 +62,23 @@
mode: 0777 mode: 0777
with_items: with_items:
- {src: 'halo-compose.yml', dest: '/home/josiah/apps/halo-compose.yml'} - {src: 'halo-compose.yml', dest: '/home/josiah/apps/halo-compose.yml'}
- {src: 'traefik.yml', dest: '/home/josiah/apps/traefik.yml'} - {src: 'traefik.yml', dest: '/home/josiah/apps/traefik/traefik.yml'}
- {src: 'Targets', dest: '/home/josiah/apps/smokeping/config/Targets'} - {src: 'Targets', dest: '/home/josiah/apps/smokeping/config/Targets'}
# you have to force remove the whole stack for some changes to take effect
# I have no idea which ones, but this solved a problem for me with traefik conifgs + multi networks.
- name: Remove the mediaserver stack
block:
- name: Remove the mediaserver stack
docker_stack:
state: absent
name: mediaserver
compose:
- /home/josiah/apps/halo/halo-compose.yml
- name: Pause so the network gets deleted too
pause:
seconds: 15
- name: Deploy halo stack - name: Deploy halo stack
docker_stack: docker_stack:

@ -1,8 +1,6 @@
version: '3' version: '3'
networks: networks:
gitea:
external: false
pubnet: pubnet:
external: false external: false
@ -11,7 +9,7 @@ volumes:
traefik_logs: traefik_logs:
services: services:
traefik: justice:
image: "traefik:v2.2" image: "traefik:v2.2"
ports: ports:
- "80:80" - "80:80"
@ -23,7 +21,7 @@ services:
volumes: volumes:
- "/home/josiah/apps/letsencrypt/:/letsencrypt" - "/home/josiah/apps/letsencrypt/:/letsencrypt"
- "/var/run/docker.sock:/var/run/docker.sock:ro" - "/var/run/docker.sock:/var/run/docker.sock:ro"
- "/home/josiah/apps/traefik.yml:/etc/traefik/traefik.yml" - "/home/josiah/apps/traefik/traefik.yml:/etc/traefik/traefik.yml"
- traefik_logs:/log - traefik_logs:/log
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
@ -31,6 +29,12 @@ services:
- "traefik.http.routers.edge.entrypoints=web" - "traefik.http.routers.edge.entrypoints=web"
- "traefik.http.routers.edge.middlewares=redirect-to-https" - "traefik.http.routers.edge.middlewares=redirect-to-https"
- "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https" - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"
deploy:
mode: global
placement:
constraints:
- node.role == manager
smokeping: smokeping:
image: lscr.io/linuxserver/smokeping:latest image: lscr.io/linuxserver/smokeping:latest
@ -48,7 +52,29 @@ services:
# global rules # global rules
- "traefik.enable=true" - "traefik.enable=true"
# the web ui # the web ui
- "traefik.http.routers.freshrss.rule=Host(`monitor.awful.club`)" - "traefik.http.routers.smokeping.rule=Host(`monitor.awful.club`)"
- "traefik.http.routers.freshrss.entrypoints=websecure" - "traefik.http.routers.smokeping.entrypoints=websecure"
- "traefik.http.routers.freshrss.tls=true" - "traefik.http.routers.smokeping.tls=true"
- "traefik.http.routers.freshrss.tls.certresolver=awful-letsencrypt" - "traefik.http.routers.smokeping.tls.certresolver=awful-letsencrypt"
overseerr:
image: lscr.io/linuxserver/overseerr:latest
networks:
pubnet:
environment:
- PUID=1000
- PGID=1000
- TZ=America/Chicago
volumes:
- /home/josiah/apps/overseerr/config/:/config
restart: unless-stopped
labels:
# global rules
- "traefik.enable=true"
# the web ui
- "traefik.http.routers.overseerr.rule=Host(`requests.awful.club`)"
- "traefik.http.routers.overseerr.entrypoints=websecure"
- "traefik.http.routers.overseerr.tls=true"
- "traefik.http.routers.overseerr.tls.certresolver=awful-letsencrypt"
- "traefik.http.routers.overseerr.service=overseerr-web-svc"
- "traefik.http.services.overseerr-web-svc.loadbalancer.server.port=5055"

@ -15,6 +15,12 @@ entryPoints:
websecure: websecure:
address: ":443" address: ":443"
log:
level: debug
format: common
accessLog:
format: common
providers: providers:
docker: docker:
watch: true watch: true

@ -43,7 +43,7 @@ services:
hydra2: hydra2:
image: linuxserver/hydra2:latest image: linuxserver/nzbhydra2:latest
networks: networks:
- pubnet - pubnet
volumes: volumes:

Loading…
Cancel
Save