diff --git a/pillar/webserver/sites.sls b/pillar/webserver/sites.sls index b2fa380..b987c7b 100644 --- a/pillar/webserver/sites.sls +++ b/pillar/webserver/sites.sls @@ -1,190 +1,193 @@ # ------------------------------------------------------------- # Salt — Sites to provision on the legacy web server # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Project: Nasqueron # License: Trivial work, not eligible to copyright # ------------------------------------------------------------- # ------------------------------------------------------------- # Domains we deploy # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - web_domains: # # Directly managed by Nasqueron # nasqueron: - nasqueron.org # # Nasqueron members # nasqueron_members: - dereckson.be # # Projects ICT is managed by Nasqueron # espacewin: - espace-win.org wolfplex: - wolfplex.org # ------------------------------------------------------------- # Static sites # # Sites to deploy from the staging repository # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - web_static_sites: + dereckson.be: + - assets nasqueron.org: - www - assets - docker - ftp - packages - trustspace wolfplex.org: - www + - assets # ------------------------------------------------------------- # PHP sites # # Username must be unique and use max 31 characters. # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - php_custom_builds: php56: mode: release version: 5.6.38 hash: d65b231bbdd63be4439ef5ced965cfd63e62983429dbd4dfcfb49981593ebc03 php_fpm_instances: # PHP 7.2, generally installed as package/port prod: command: /usr/local/sbin/php-fpm # PHP 5.6, installed through php-builder unit legacy: command: /opt/php/php56/sbin/php-fpm web_php_sites: # Nasqueron members mediawiki.dereckson.be: domain: dereckson.be subdomain: mediawiki user: web-be-dereckson-mw php-fpm: prod www.dereckson.be: domain: dereckson.be subdomain: www user: web-be-dereckson-www source: wwwroot/dereckson.be/www target: /var/wwwroot/dereckson.be/www php-fpm: prod www51.dereckson.be: domain: dereckson.be subdomain: www51 user: web-be-dereckson-www51 php-fpm: prod # Directly managed by Nasqueron api.nasqueron.org: domain: nasqueron.org subdomain: api user: web-org-nasqueron-api-serverslog php-fpm: prod env: SERVERS_LOG_FILE: /srv/api/data/servers-log-all.json wikis.nasqueron.org: domain: nasqueron.org subdomain: wikis user: mediawiki php-fpm: prod skipCreateAccount: True env: MEDIAWIKI_ENTRY_POINT: /srv/mediawiki/index.php DB_HOST: localhost DB_USER: mediawiki-saas # Espace Win www.espace-win.org: domain: espace-win.org subdomain: www user: web-org-espacewin-www source: wwwroot/espace-win.org/www target: /var/wwwroot/espace-win.org/www php-fpm: legacy www51.espace-win.org: domain: espace-win.org subdomain: www51 user: web-org-espacewin-www51 php-fpm: prod # Wolfplex Hackerspace www.wolfplex.org: domain: wolfplex.org subdomain: www user: web-org-wolfplex-www php-fpm: prod env: DATASTORE: /var/dataroot/wolfplex CREDENTIAL_PATH_DATASOURCES_SECURITYDATA: /var/dataroot/wolfplex/secrets.json # ------------------------------------------------------------- # States # # Sites with states documenting how to build them # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - web_content_sls: # # Eglide # shellserver: # Third party sites hosted to Eglide - .com/paysannerebelle # Directly managed by Eglide project - .org/eglide # # Nasqueron servers # mastodon: - .org/nasqueron/social webserver-legacy: # Nasqueron members - .be/dereckson # Projects hosted - .space/hypership # Directly managed by Nasqueron - .org/nasqueron/api - .org/nasqueron/daeghrefn - .org/nasqueron/docs - .org/nasqueron/infra - .org/nasqueron/labs - .org/nasqueron/rain # Wolfplex Hackerspace - .org/wolfplex/api - .org/wolfplex/www # ------------------------------------------------------------- # Tweaks # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - web_autochmod: - /var/wwwroot/dereckson.be/www diff --git a/roles/webserver-legacy/nginx/files/vhosts/dereckson.be/assets.conf b/roles/webserver-legacy/nginx/files/vhosts/dereckson.be/assets.conf new file mode 100644 index 0000000..3e3723a --- /dev/null +++ b/roles/webserver-legacy/nginx/files/vhosts/dereckson.be/assets.conf @@ -0,0 +1,31 @@ +# ------------------------------------------------------------- +# Webserver +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Site: assets.dereckson.be +# License: Trivial work, not eligible to copyright +# Source file: roles/webserver-legacy/nginx/files/vhosts/dereckson.be/assets.conf +# ------------------------------------------------------------- +# +# +# This file is managed by our rOPS SaltStack repository. +# +# Changes to this file may cause incorrect behavior +# and will be lost if the state is redeployed. +# + +server { + listen 80; + listen [::]:80; + server_name assets.dereckson.be; + + include includes/tls; + ssl_certificate /usr/local/etc/letsencrypt/live/assets.dereckson.be/fullchain.pem; + ssl_certificate_key /usr/local/etc/letsencrypt/live/assets.dereckson.be/privkey.pem; + + error_log /var/log/www/dereckson.be/assets-error.log; + access_log /var/log/www/dereckson.be/assets-access.log; + + root /var/wwwroot/dereckson.be/assets; + + include includes/letsencrypt; +} diff --git a/roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/assets.conf b/roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/assets.conf new file mode 100644 index 0000000..322545c --- /dev/null +++ b/roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/assets.conf @@ -0,0 +1,31 @@ +# ------------------------------------------------------------- +# Webserver +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Site: assets.wolfplex.org +# License: Trivial work, not eligible to copyright +# Source file: roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/assets.conf +# ------------------------------------------------------------- +# +# +# This file is managed by our rOPS SaltStack repository. +# +# Changes to this file may cause incorrect behavior +# and will be lost if the state is redeployed. +# + +server { + listen 80; + listen [::]:80; + server_name assets.wolfplex.org assets.wolfplex.be; + + include includes/tls; + ssl_certificate /usr/local/etc/letsencrypt/live/assets.wolfplex.org/fullchain.pem; + ssl_certificate_key /usr/local/etc/letsencrypt/live/assets.wolfplex.org/privkey.pem; + + error_log /var/log/www/wolfplex.org/assets-error.log; + access_log /var/log/www/wolfplex.org/assets-access.log; + + root /var/wwwroot/wolfplex.org/assets; + + include includes/letsencrypt; +}