Compare commits

...

2 Commits

Author SHA1 Message Date
786ddc20eb Add znc capability back!
- tested and working
- had to move http vs irc protos to different ports for ease of
- routing
- eventually i should vc the resultant znc.conf dirs, just not sure
- the best way to do that yet.
2020-05-07 14:31:49 -05:00
05c3722d39 Try out adding a public network to fix routing issue. 2020-05-06 19:43:59 -05:00
3 changed files with 51 additions and 16 deletions

View File

@ -44,23 +44,23 @@
# name: jsondiff
# Update the app git repos
# - name: update the mojo git repo
# git:
# repo: 'https://git.awful.club/hosted/mojojojo-bot.git'
# dest: /home/josiah/apps/mojo/
# version: master
- name: update the mojo git repo
git:
repo: 'https://git.awful.club/hosted/mojojojo-bot.git'
dest: /home/josiah/apps/mojo/
version: master
# - name: update the arke git repo
# git:
# repo: 'https://git.awful.club/hosted/arke.git'
# dest: /home/josiah/apps/arke/
# version: master
- name: update the arke git repo
git:
repo: 'https://git.awful.club/hosted/arke.git'
dest: /home/josiah/apps/arke/
version: master
# - name: update the znc git repo
# git:
# repo: 'https://git.awful.club/hosted/znc-docker.git'
# dest: /home/josiah/apps/znc/
# version: master
- name: update the znc git repo
git:
repo: 'https://git.awful.club/hosted/znc-docker.git'
dest: /home/josiah/apps/znc/
version: master
- name: copy over awful-All config files
template:

View File

@ -3,6 +3,8 @@ version: '3'
networks:
gitea:
external: false
pubnet:
external: false
volumes:
nextcloud:
@ -20,9 +22,11 @@ services:
- "443:443"
- "222:222" # gitea ssh
- "8080:8080"
- "5000:5000" # bouncer default port
environment:
DO_AUTH_TOKEN: "{{ DO_AUTH_TOKEN }}"
networks:
pubnet:
gitea:
volumes:
- "/home/josiah/apps/awful/letsencrypt/:/letsencrypt"
@ -44,6 +48,8 @@ services:
- "traefik.http.routers.whoami.entrypoints=websecure"
- "traefik.http.routers.whoami.tls.certresolver=awful-letsencrypt"
- "traefik.http.routers.whoami.tls=true"
networks:
pubnet:
nginx:
image: nginx:1.17.10
@ -57,6 +63,8 @@ services:
- "traefik.http.routers.nginx.rule=Host(`awful.club`)||Host(`jowj.net`)"
- "traefik.http.routers.nginx.entrypoints=websecure"
- "traefik.http.routers.nginx.tls.certresolver=awful-letsencrypt"
networks:
pubnet:
gitea-server:
image: gitea/gitea:latest
@ -106,3 +114,28 @@ services:
volumes:
- /mnt/volume_sfo2_01/psql:/var/lib/postgresql/data
bouncer:
build:
context: /home/josiah/apps/znc/
dockerfile: Dockerfile
image: znc
volumes:
- /mnt/volume_sfo2_znc/:/znc-data
networks:
pubnet:
labels:
- "traefik.enable=true"
# handle web ui
- "traefik.http.routers.bouncer-web.rule=Host(`bouncer.awful.club`)"
- "traefik.http.routers.bouncer-web.entrypoints=websecure"
- "traefik.http.routers.bouncer-web.tls.certresolver=awful-letsencrypt"
- "traefik.http.routers.bouncer-web.service=bouncer-web-svc"
- "traefik.http.routers.bouncer-web.tls=true"
- "traefik.http.services.bouncer-web-svc.loadbalancer.server.port=5001"
# handle irc
- "traefik.tcp.routers.bouncer-irc.rule=HostSNI(`*`)"
- "traefik.tcp.routers.bouncer-irc.entrypoints=irc"
- "traefik.tcp.routers.bouncer-irc.service=bouncer-irc-svc"
- "traefik.tcp.services.bouncer-irc-svc.loadbalancer.server.port=5000"

View File

@ -12,6 +12,8 @@ api:
entryPoints:
ssh:
address: ":222"
irc:
address: ":5000"
gitea-web:
address: ":3000"
web: