Page MenuHomeDevCentral
Files F3769486

No OneTemporary
Actions

View Options

diff --git a/pillar/devserver/datacubes.sls b/pillar/devserver/datacubes.sls
index 3cc9a40..fd3f909 100644
--- a/pillar/devserver/datacubes.sls
+++ b/pillar/devserver/datacubes.sls
@@ -1,41 +1,57 @@
# -------------------------------------------------------------
# Salt configuration for Nasqueron servers
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
# -------------------------------------------------------------
# Datacubes
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
datacubes:
bak: &default {}
git: *default
t: *default
dereckson_bak: &dck
user: dereckson
zfs_user: dereckson
zfs_auto_snapshot: True
xcombelle:
user: xcombelle
zfs_user: xcombelle
zfs_auto_snapshot: True
# -------------------------------------------------------------
# Other directories needed by development work
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
devserver_directories:
/var/dataroot:
user: root
group: ops
mode: 775
/var/dataroot/mediawiki.dereckson.be:
user: web-be-dereckson-mw
group: dereckson
mode: 771
+
+ # Staging area for Zed
+
+ /var/dataroot/zed:
+ user: dereckson
+ mode: 711
+
+ /var/dataroot/zed/cache:
+ user: web-be-dereckson-zed51
+ group: dereckson
+ mode: 771
+
+ /var/dataroot/zed/content:
+ user: web-be-dereckson-zed51
+ group: dereckson
+ mode: 771
diff --git a/pillar/paas/alkane/windriver/main.sls b/pillar/paas/alkane/windriver/main.sls
index 65f6fb5..6756f17 100644
--- a/pillar/paas/alkane/windriver/main.sls
+++ b/pillar/paas/alkane/windriver/main.sls
@@ -1,108 +1,119 @@
# -------------------------------------------------------------
# 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
- 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
+ - zed51
nasqueron.org:
- api51
- tools51
- www51
diff --git a/roles/webserver-alkane/nginx/files/vhosts/hypership.space/www.conf b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/zed51.conf
similarity index 52%
copy from roles/webserver-alkane/nginx/files/vhosts/hypership.space/www.conf
copy to roles/webserver-alkane/nginx/files/vhosts/dereckson.be/zed51.conf
index ae51768..f92a281 100644
--- a/roles/webserver-alkane/nginx/files/vhosts/hypership.space/www.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/dereckson.be/zed51.conf
@@ -1,103 +1,91 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Site: hypership.space
+# Site: zed51.dereckson.be
+# Description: Staging area for hypership.space
# License: Trivial work, not eligible to copyright
-# Source file: roles/webserver-alkane/nginx/files/vhosts/hypership.space/www.conf
+# Source file: roles/webserver-alkane/nginx/files/vhosts/dereckson.be/zed51.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>
# -------------------------------------------------------------
-# Main application
+# Redirect from port 80
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
server {
- server_name hypership.space;
+ listen 80;
+ listen [::]:80;
+ server_name zed51.dereckson.be;
+
+ include includes/letsencrypt;
+
+ location / {
+ return 301 https://zed51.dereckson.be$request_uri;
+ }
+}
+
+# -------------------------------------------------------------
+# Development and staging area
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+server {
+ 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;
+ ssl_certificate /usr/local/etc/letsencrypt/live/zed51.dereckson.be/fullchain.pem;
+ ssl_certificate_key /usr/local/etc/letsencrypt/live/zed51.dereckson.be/privkey.pem;
- error_log /var/log/www/hypership.space/www-error.log;
- access_log /var/log/www/hypership.space/www-access.log;
+ include includes/letsencrypt;
location /content {
return 403;
}
location /content/users {
- alias /srv/zed/content/users;
+ alias /var/dataroot/zed/content/users;
}
location /content/scenes {
- alias /srv/zed/content/scenes;
+ alias /var/dataroot/zed/content/scenes;
location ~ \.tpl$ {
# This folder contains templates intended to be rendered,
# and not directly served.
return 403;
}
}
location / {
- return 503;
- }
-}
-
-# -------------------------------------------------------------
-# Redirects from port 80 and alternative domains
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-server {
- listen 80;
- listen [::]:80;
- server_name hypership.space;
-
- include includes/letsencrypt;
-
- location / {
- return 301 https://hypership.space$request_uri;
- }
-}
-
-server {
- listen 80;
- listen [::]:80;
- server_name www.hypership.space zed.dereckson.be;
+ root /var/51-wwwroot/zed;
- 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;
-
- include includes/letsencrypt;
+ # Currently not try_files as we use this block to add caching information in prod
+ if (-f $request_filename) {
+ break;
+ }
- location / {
- return 301 https://hypership.space$request_uri;
+ # Sends all non existing file or directory requests to index.php
+ if (!-e request_filename) {
+ rewrite ^/api\.php /api.php last;
+ rewrite ^/do\.php /do.php last;
+ rewrite ^(.+)$ /index.php last;
+ }
}
-}
-# -------------------------------------------------------------
-# Development and staging area
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-server {
- listen 80;
- listen [::]:80;
- server_name zed51.dereckson.be;
+ #location ~ [^/]\.php(/|$) {
+ location ~ \.php$ {
+ fastcgi_pass unix:/var/run/web/zed51.dereckson.be/php-fpm.sock;
+ fastcgi_param SCRIPT_FILENAME /var/51-wwwroot/zed$fastcgi_script_name;
+ include includes/fastcgi;
+ fastcgi_index index.php;
- include includes/tls;
- ssl_certificate /usr/local/etc/letsencrypt/live/zed51.dereckson.be/fullchain.pem;
- ssl_certificate_key /usr/local/etc/letsencrypt/live/zed51.dereckson.be/privkey.pem;
-
- include includes/letsencrypt;
-
- location / {
- return 503;
+ # fastcgi_split_path_info ^((?U).+\.php)(.*)$;
+ # fastcgi_param PATH_INFO $fastcgi_path_info;
+ # fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
}
}
diff --git a/roles/webserver-alkane/nginx/files/vhosts/hypership.space/www.conf b/roles/webserver-alkane/nginx/files/vhosts/hypership.space/www.conf
index ae51768..bc16b7b 100644
--- a/roles/webserver-alkane/nginx/files/vhosts/hypership.space/www.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/hypership.space/www.conf
@@ -1,103 +1,114 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Site: hypership.space
# License: Trivial work, not eligible to copyright
# Source file: roles/webserver-alkane/nginx/files/vhosts/hypership.space/www.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>
# -------------------------------------------------------------
# Main application
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
server {
server_name hypership.space;
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/www-error.log;
access_log /var/log/www/hypership.space/www-access.log;
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 / {
+ location /buildergate {
return 503;
+
+ # Serve through Apache
+
+ #rewrite /buildergate/(.*) /$1 break;
+ #proxy_pass http://localhost:3200;
+ #proxy_redirect off;
+ #proxy_set_header Host builder.zed.dereckson.be;
+ #proxy_set_header X-Real-IP $remote_addr;
+ #proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ }
+
+ location / {
+ # Serves static files if they exists, with one month cache
+ if (-f $request_filename) {
+ expires 30d;
+ break;
+ }
+
+ # Sends all non existing file or directory requests to index.php
+ if (!-e request_filename) {
+ rewrite ^/api\.php /api.php last;
+ rewrite ^/do\.php /do.php last;
+ rewrite ^(.+)$ /index.php last;
+ }
+ }
+
+ 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;
}
}
# -------------------------------------------------------------
# Redirects from port 80 and alternative domains
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
server {
listen 80;
listen [::]:80;
server_name hypership.space;
include includes/letsencrypt;
location / {
return 301 https://hypership.space$request_uri;
}
}
server {
listen 80;
listen [::]:80;
server_name www.hypership.space zed.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;
include includes/letsencrypt;
location / {
return 301 https://hypership.space$request_uri;
}
}
-
-# -------------------------------------------------------------
-# Development and staging area
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-server {
- listen 80;
- listen [::]:80;
- server_name zed51.dereckson.be;
-
- include includes/tls;
- ssl_certificate /usr/local/etc/letsencrypt/live/zed51.dereckson.be/fullchain.pem;
- ssl_certificate_key /usr/local/etc/letsencrypt/live/zed51.dereckson.be/privkey.pem;
-
- include includes/letsencrypt;
-
- location / {
- return 503;
- }
-}

File Metadata

Mime Type
text/x-diff
Expires
Mon, Nov 25, 14:53 (1 d, 2 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2257497
Default Alt Text
(13 KB)

Event Timeline

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