diff --git a/pillar/paas/alkane/windriver/main.sls b/pillar/paas/alkane/windriver/main.sls index 468beb6..c44f053 100644 --- a/pillar/paas/alkane/windriver/main.sls +++ b/pillar/paas/alkane/windriver/main.sls @@ -1,136 +1,139 @@ # ------------------------------------------------------------- # Salt — PaaS Alkane :: PHP and static sites [development] # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Project: Nasqueron # License: Trivial work, not eligible to copyright # ------------------------------------------------------------- web_aliases: services: - &db-B 172.27.27.9 # ------------------------------------------------------------- # Domains we deploy # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - web_domains: # # Directly managed by Nasqueron # nasqueron: - nasqueron.org - ook.space # # Nasqueron members # nasqueron_members: - dereckson.be - hypership.space # # 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: nasqueron.org: - docker51 - packages - rain51 - www51 # ------------------------------------------------------------- # PHP sites # # Username must be unique and use max 31 characters. # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - php_fpm_instances: # PHP current version, generally installed as package/port prod: command: /usr/local/sbin/php-fpm web_php_sites: # Nasqueron tools51.nasqueron.org: domain: nasqueron.org subdomain: tools51 user: web-org-nasqueron-tools51 php-fpm: prod # Nasqueron members mediawiki.dereckson.be: domain: dereckson.be subdomain: mediawiki user: web-be-dereckson-mw php-fpm: prod www51.dereckson.be: domain: dereckson.be subdomain: www51 user: web-be-dereckson-www51 php-fpm: prod # Zed zed51.dereckson.be: domain: dereckson.be subdomain: zed51 user: web-be-dereckson-zed51 php-fpm: prod env: CACHE_DIR: /var/dataroot/zed/cache CONTENT_DIR: /var/dataroot/zed/content # Espace Win www51.espace-win.org: domain: espace-win.org subdomain: www51 user: web-org-espacewin-www51 php-fpm: prod # ------------------------------------------------------------- # nginx configuration # # Configuration files to provision to vhosts/ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - nginx_vhosts: dereckson.be: - mediawiki - scherzo - www51 - zed51 + espace-win.org: + - grip + nasqueron.org: - api51 - grafana - packages - tools51 - www51 # ------------------------------------------------------------- # Credentials # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - webserver_content_dotenv: /var/51-wwwroot/dereckson-www/.env: user: web-be-dereckson-www51 db: service: db-B credentials: dbserver/cluster-B/users/dereckson_www51 diff --git a/roles/webserver-alkane/nginx/files/vhosts/espace-win.org/grip.conf b/roles/webserver-alkane/nginx/files/vhosts/espace-win.org/grip.conf new file mode 100644 index 0000000..5f6c22d --- /dev/null +++ b/roles/webserver-alkane/nginx/files/vhosts/espace-win.org/grip.conf @@ -0,0 +1,43 @@ +# ------------------------------------------------------------- +# Webserver +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Site: grip.espace-win.org +# License: Trivial work, not eligible to copyright +# Source file: roles/webserver-alkane/nginx/files/vhosts/espace-win.org/grip.conf +# ------------------------------------------------------------- +# +# <auto-generated> +# 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. +# </auto-generated> + +server { + listen 80; + listen [::]:80; + server_name grip.espace-win.org grip.espace-win.net; + + include includes/tls; + ssl_certificate /usr/local/etc/letsencrypt/live/grip.espace-win.org/fullchain.pem; + ssl_certificate_key /usr/local/etc/letsencrypt/live/grip.espace-win.org/privkey.pem; + + error_log /var/log/www/espace-win.org/grip-error.log; + access_log /var/log/www/espace-win.org/grip-access.log; + + include includes/letsencrypt; + + location = / { + return 301 https://dereckson.hotglue.me/grip; + } + + location /doc/apps { + alias /usr/local/share/doc; + autoindex on; + default_type text/plain; + } + + location = /doc/apps/cmake/cmake-properties.txt { + return 302 https://cmake.org/cmake/help/git-master/manual/cmake-properties.7.html; + } +}