diff --git a/playbooks/game.yml b/playbooks/game.yml index 54ca394..1ed50fd 100755 --- a/playbooks/game.yml +++ b/playbooks/game.yml @@ -28,7 +28,7 @@ env: JRE_XMX: 6G JRE_XMS: 3G - FORGE_PACK_ZIP: "https://media.forgecdn.net/files/3293/967/Valhelsia+3-3.3.1-SERVER.zip" + FORGE_PACK_ZIP: "https://srv.9iron.club/files/packs/1.16.5-valhelsia/server.zip" ports: - "25565:25565/tcp" - "25565:25565/udp" diff --git a/playbooks/vars/desultd-apache.yml b/playbooks/vars/desultd-apache.yml index 673ce0b..dab8fdc 100644 --- a/playbooks/vars/desultd-apache.yml +++ b/playbooks/vars/desultd-apache.yml @@ -17,12 +17,9 @@ apache_vhosts: extra_parameters: | Redirect permanent / https://nc.desu.ltd/ # 9iron.club - - servername: 9iron.club + - servername: srv.9iron.club extra_parameters: | - Redirect permanent / https://www.9iron.club/ - - servername: www.9iron.club - extra_parameters: | - Redirect permanent / https://www.9iron.club/ + Redirect permanent / https://srv.9iron.club/ # otwstudios.org - servername: otwstudios.org extra_parameters: | @@ -37,48 +34,39 @@ apache_vhosts_ssl: 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 + certificate_file: /etc/letsencrypt/live/srv.9iron.club/fullchain.pem + certificate_key_file: /etc/letsencrypt/live/srv.9iron.club/privkey.pem + certificate_chain_file: /etc/letsencrypt/live/srv.9iron.club/chain.pem - servername: git.desu.ltd extra_parameters: | ProxyPreserveHost On ProxyRequests Off ProxyPass / http://127.0.0.1:3000/ 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 + certificate_file: /etc/letsencrypt/live/srv.9iron.club/fullchain.pem + certificate_key_file: /etc/letsencrypt/live/srv.9iron.club/privkey.pem + certificate_chain_file: /etc/letsencrypt/live/srv.9iron.club/chain.pem - servername: nc.desu.ltd extra_parameters: | Header always set Strict-Transport-Security "max-age=31536000" documentroot: /var/www/nc.desu.ltd - 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 + certificate_file: /etc/letsencrypt/live/srv.9iron.club/fullchain.pem + certificate_key_file: /etc/letsencrypt/live/srv.9iron.club/privkey.pem + certificate_chain_file: /etc/letsencrypt/live/srv.9iron.club/chain.pem # 9iron.club - - servername: 9iron.club - extra_parameters: | - Redirect permanent / https://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 - - servername: www.9iron.club - extra_parameters: | - ProxyPreserveHost On - ProxyRequests Off - ProxyPass / http://127.0.0.1:8001/ 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 + - servername: srv.9iron.club + documentroot: /var/www/srv.9iron.club + certificate_file: /etc/letsencrypt/live/srv.9iron.club/fullchain.pem + certificate_key_file: /etc/letsencrypt/live/srv.9iron.club/privkey.pem + certificate_chain_file: /etc/letsencrypt/live/srv.9iron.club/chain.pem # otwstudios.org - servername: otwstudios.org extra_parameters: | Redirect permanent / https://www.otwstudios.org/ - 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 + certificate_file: /etc/letsencrypt/live/srv.9iron.club/fullchain.pem + certificate_key_file: /etc/letsencrypt/live/srv.9iron.club/privkey.pem + certificate_chain_file: /etc/letsencrypt/live/srv.9iron.club/chain.pem - servername: www.otwstudios.org documentroot: /var/www/www.otwstudios.org - 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 + certificate_file: /etc/letsencrypt/live/srv.9iron.club/fullchain.pem + certificate_key_file: /etc/letsencrypt/live/srv.9iron.club/privkey.pem + certificate_chain_file: /etc/letsencrypt/live/srv.9iron.club/chain.pem diff --git a/playbooks/vars/desultd-certbot.yml b/playbooks/vars/desultd-certbot.yml index 820ca51..11f7443 100644 --- a/playbooks/vars/desultd-certbot.yml +++ b/playbooks/vars/desultd-certbot.yml @@ -6,11 +6,9 @@ certbot_create_standalone_stop_services: - apache2 certbot_certs: - domains: - - desu.ltd + - srv.9iron.club - git.desu.ltd - nc.desu.ltd - web1.desu.ltd - - 9iron.club - - www.9iron.club - otwstudios.org - www.otwstudios.org diff --git a/playbooks/web.yml b/playbooks/web.yml index 835a3be..3c97276 100755 --- a/playbooks/web.yml +++ b/playbooks/web.yml @@ -59,6 +59,7 @@ - /data - /var/lib/gitea - /var/www/nc.desu.ltd + - /var/www/srv.9iron.club - /srv/desu.ltd backup_s3backup_exclude_list_extra: - /var/lib/gitea/log