diff --git a/playbooks/vars/desultd-apache.yml b/playbooks/vars/desultd-apache.yml index 84e4102..673ce0b 100644 --- a/playbooks/vars/desultd-apache.yml +++ b/playbooks/vars/desultd-apache.yml @@ -33,7 +33,10 @@ apache_vhosts: apache_vhosts_ssl: # 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_key_file: /etc/letsencrypt/live/desu.ltd/privkey.pem certificate_chain_file: /etc/letsencrypt/live/desu.ltd/chain.pem @@ -64,7 +67,6 @@ apache_vhosts_ssl: ProxyPreserveHost On ProxyRequests Off 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_key_file: /etc/letsencrypt/live/desu.ltd/privkey.pem certificate_chain_file: /etc/letsencrypt/live/desu.ltd/chain.pem diff --git a/playbooks/web.yml b/playbooks/web.yml index 105d858..1ab927d 100755 --- a/playbooks/web.yml +++ b/playbooks/web.yml @@ -26,6 +26,18 @@ volumes: - /data/9iron/files:/var/www/html/files 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 docker_container: name: gulagbot @@ -70,8 +82,6 @@ - role: git vars: git_repos: - - repo: https://git.desu.ltd/salt/desultd - dest: /var/www/desu.ltd - repo: https://git.9iron.club/KidiroInfiniti/OTW_Site dest: /var/www/www.otwstudios.org - repo: https://git.desu.ltd/salt/gitea-custom