diff --git a/pillar/webserver/sites.sls b/pillar/webserver/sites.sls --- a/pillar/webserver/sites.sls +++ b/pillar/webserver/sites.sls @@ -108,7 +108,17 @@ target: /var/wwwroot/hypership.space/www php-fpm: prod env: - CACHE_DIR: /var/cache/zed + CACHE_DIR: /var/cache/zed/hypership.space + CONTENT_DIR: /srv/zed/content + + # Zed + zed51.dereckson.be: + domain: dereckson.be + subdomain: zed51 + user: web-be-dereckson-zed + php-fpm: prod + env: + CACHE_DIR: /var/cache/zed/zed51.dereckson.be CONTENT_DIR: /srv/zed/content # ------------------------------------------------------------- @@ -137,6 +147,7 @@ webserver-legacy: # Nasqueron members - .be/dereckson + - .be/dereckson/zed51 # Projects hosted - .space/hypership diff --git a/pillar/webserver/wwwroot51.sls b/pillar/webserver/wwwroot51.sls --- a/pillar/webserver/wwwroot51.sls +++ b/pillar/webserver/wwwroot51.sls @@ -34,3 +34,7 @@ user: dereckson group: dereckson repository: ssh://vcs@devcentral.nasqueron.org:5022/source/www.git + zed: + user: dereckson + group: dereckson + repository: git@github.com:dereckson/zed.git diff --git a/roles/webserver-content/be/dereckson/init.sls b/roles/webserver-content/be/dereckson/init.sls --- a/roles/webserver-content/be/dereckson/init.sls +++ b/roles/webserver-content/be/dereckson/init.sls @@ -7,3 +7,4 @@ include: - .assets + - .zed51 diff --git a/roles/webserver-content/space/hypership/www.sls b/roles/webserver-content/be/dereckson/zed51.sls copy from roles/webserver-content/space/hypership/www.sls copy to roles/webserver-content/be/dereckson/zed51.sls --- a/roles/webserver-content/space/hypership/www.sls +++ b/roles/webserver-content/be/dereckson/zed51.sls @@ -5,32 +5,20 @@ # License: Trivial work, not eligible to copyright # ------------------------------------------------------------- -{% if salt['node.has_web_content'](".space/hypership") %} - -/srv/zed: - file.directory - -# ------------------------------------------------------------- -# Content -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -zed_content: - git.latest: - - name: https://github.com/hypership/content.git - - target: /srv/zed/content +{% if salt['node.has_web_content'](".be/dereckson/zed51") %} # ------------------------------------------------------------- # Cache # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -/var/cache/zed: +/var/cache/zed/zed51.dereckson.be: file.directory: - - user: web-space-hypership-www + - user: web-be-dereckson-zed {% for subdir in ['compiled', 'openid', 'sessions'] %} -/var/cache/zed/{{ subdir }}: +/var/cache/zed/zed51.dereckson.be/{{ subdir }}: file.directory: - - user: web-space-hypership-www + - user: web-be-dereckson-zed {% endfor %} {% endif %} diff --git a/roles/webserver-content/space/hypership/www.sls b/roles/webserver-content/space/hypership/www.sls --- a/roles/webserver-content/space/hypership/www.sls +++ b/roles/webserver-content/space/hypership/www.sls @@ -24,11 +24,14 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /var/cache/zed: + file.directory + +/var/cache/zed/hypership.space: file.directory: - user: web-space-hypership-www {% for subdir in ['compiled', 'openid', 'sessions'] %} -/var/cache/zed/{{ subdir }}: +/var/cache/zed/hypership.space/{{ subdir }}: file.directory: - user: web-space-hypership-www {% endfor %} diff --git a/roles/webserver-legacy/nginx/files/vhosts/hypership.space/www.conf b/roles/webserver-legacy/nginx/files/vhosts/hypership.space/www.conf --- a/roles/webserver-legacy/nginx/files/vhosts/hypership.space/www.conf +++ b/roles/webserver-legacy/nginx/files/vhosts/hypership.space/www.conf @@ -117,9 +117,58 @@ listen [::]:80; server_name zed51.dereckson.be; + include includes/tls; + ssl_certificate /usr/local/etc/letsencrypt/live/hypership.space/fullchain.pem; + ssl_certificate_key /usr/local/etc/letsencrypt/live/hypership.space/privkey.pem; + + error_log /var/log/www/hypership.space/zed51-error.log; + access_log /var/log/www/hypership.space/zed51-access.log; + + root /var/51-wwwroot/zed; + index index.html index.php; + include includes/letsencrypt; + location /content { + return 403; + } + + location /content/users { + alias /srv/zed/content/users; + } + + location /content/scenes { + alias /srv/zed/content/scenes; + + location ~ \.tpl$ { + # This folder contains templates intended to be rendered, + # and not directly served. + return 403; + } + } + + location = /tour { + return 302 /tour.html; + } + location / { - return 503; + try_files $uri $uri/ @app; + + location ~ [^/]\.php(/|$) { + fastcgi_pass unix:/var/run/web/hypership.space/php-fpm.sock; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include includes/fastcgi_params; + + fastcgi_split_path_info ^((?U).+\.php)(.*)$; + fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info; + } + } + + location @app { + fastcgi_pass unix:/var/run/web/hypership.space/php-fpm.sock; + fastcgi_param SCRIPT_FILENAME /var/51-wwwroot/zed/index.php; + include includes/fastcgi_params; } }