Page MenuHomeDevCentral
Files F9562848

D1590.id4061.diff
No OneTemporary
Actions

D1590.id4061.diff
View Options

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
# -------------------------------------------------------------
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-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,54 @@
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;
+ }
+ }
+
+ 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;
}
}

File Metadata

Mime Type
text/plain
Expires
Sun, Jun 8, 17:21 (13 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2713812
Default Alt Text
D1590.id4061.diff (2 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator