diff --git a/ansible/roles/awfulAll/tasks/main.yml b/ansible/roles/awfulAll/tasks/main.yml index 85c9533..5d3ad8f 100644 --- a/ansible/roles/awfulAll/tasks/main.yml +++ b/ansible/roles/awfulAll/tasks/main.yml @@ -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: diff --git a/ansible/roles/awfulAll/templates/awful-compose.yml b/ansible/roles/awfulAll/templates/awful-compose.yml index 5251615..7979ac2 100644 --- a/ansible/roles/awfulAll/templates/awful-compose.yml +++ b/ansible/roles/awfulAll/templates/awful-compose.yml @@ -20,8 +20,9 @@ services: ports: - "80:80" - "443:443" - - "222:222" # gitea ssh + - "222:222" # gitea ssh - "8080:8080" + - "5000:5000" # bouncer default port environment: DO_AUTH_TOKEN: "{{ DO_AUTH_TOKEN }}" networks: @@ -112,4 +113,29 @@ services: ipv4_address: 172.28.1.3 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" diff --git a/ansible/roles/awfulAll/templates/traefik.yml b/ansible/roles/awfulAll/templates/traefik.yml index c7f4b45..bd865de 100644 --- a/ansible/roles/awfulAll/templates/traefik.yml +++ b/ansible/roles/awfulAll/templates/traefik.yml @@ -12,6 +12,8 @@ api: entryPoints: ssh: address: ":222" + irc: + address: ":5000" gitea-web: address: ":3000" web: