Move desultd to its own container

This commit is contained in:
Salt 2021-04-08 14:31:29 -05:00
parent 6fa8c8ff6d
commit a3c052d13b
2 changed files with 16 additions and 4 deletions

View File

@ -33,7 +33,10 @@ apache_vhosts:
apache_vhosts_ssl: apache_vhosts_ssl:
# desu.ltd # desu.ltd
- servername: desu.ltd - servername: desu.ltd
documentroot: /var/www/desu.ltd extra_parameters: |
ProxyPreserveHost On
ProxyRequests Off
ProxyPass / http://127.0.0.1:8002/ nocanon retry=1
certificate_file: /etc/letsencrypt/live/desu.ltd/fullchain.pem certificate_file: /etc/letsencrypt/live/desu.ltd/fullchain.pem
certificate_key_file: /etc/letsencrypt/live/desu.ltd/privkey.pem certificate_key_file: /etc/letsencrypt/live/desu.ltd/privkey.pem
certificate_chain_file: /etc/letsencrypt/live/desu.ltd/chain.pem certificate_chain_file: /etc/letsencrypt/live/desu.ltd/chain.pem
@ -64,7 +67,6 @@ apache_vhosts_ssl:
ProxyPreserveHost On ProxyPreserveHost On
ProxyRequests Off ProxyRequests Off
ProxyPass / http://127.0.0.1:8001/ nocanon retry=1 ProxyPass / http://127.0.0.1:8001/ nocanon retry=1
documentroot: /var/www/www.9iron.club
certificate_file: /etc/letsencrypt/live/desu.ltd/fullchain.pem certificate_file: /etc/letsencrypt/live/desu.ltd/fullchain.pem
certificate_key_file: /etc/letsencrypt/live/desu.ltd/privkey.pem certificate_key_file: /etc/letsencrypt/live/desu.ltd/privkey.pem
certificate_chain_file: /etc/letsencrypt/live/desu.ltd/chain.pem certificate_chain_file: /etc/letsencrypt/live/desu.ltd/chain.pem

View File

@ -26,6 +26,18 @@
volumes: volumes:
- /data/9iron/files:/var/www/html/files - /data/9iron/files:/var/www/html/files
tags: [ docker, 9iron ] tags: [ docker, 9iron ]
- name: docker deploy desultd
docker_container:
name: desultd
state: started
image: rehashedsalt/desultd:latest
restart_policy: unless-stopped
pull: yes
ports:
- 8002:80
volumes:
- /data/9iron/files:/var/www/html/files
tags: [ docker, 9iron ]
- name: docker deploy gulagbot - name: docker deploy gulagbot
docker_container: docker_container:
name: gulagbot name: gulagbot
@ -70,8 +82,6 @@
- role: git - role: git
vars: vars:
git_repos: git_repos:
- repo: https://git.desu.ltd/salt/desultd
dest: /var/www/desu.ltd
- repo: https://git.9iron.club/KidiroInfiniti/OTW_Site - repo: https://git.9iron.club/KidiroInfiniti/OTW_Site
dest: /var/www/www.otwstudios.org dest: /var/www/www.otwstudios.org
- repo: https://git.desu.ltd/salt/gitea-custom - repo: https://git.desu.ltd/salt/gitea-custom