diff --git a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/admin.mail.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/admin.mail.conf
index 0512a92..22c1bd8 100644
--- a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/admin.mail.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/admin.mail.conf
@@ -1,44 +1,47 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Site: mail.nasqueron.org
# License: Trivial work, not eligible to copyright
# Source file: roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/admin.mail.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 site
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
server {
listen 80;
listen [::]:80;
server_name admin.mail.nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/admin.mail.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/admin.mail.nasqueron.org/privkey.pem;
+ error_log /var/log/www/nasqueron.org/admin.mail-error.log;
+ access_log /var/log/www/nasqueron.org/admin.mail-access.log;
+
include includes/letsencrypt;
root /var/wwwroot/nasqueron.org/admin.mail/public;
location / {
try_files $uri $uri/ /index.php;
}
location ~ \.php$ {
fastcgi_pass unix:/var/run/web/admin.mail.nasqueron.org/php-fpm.sock;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME /var/wwwroot/nasqueron.org/admin.mail/public/index.php;
include includes/fastcgi;
}
}
diff --git a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/assets.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/assets.conf
index 661e924..4d2abab 100644
--- a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/assets.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/assets.conf
@@ -1,57 +1,60 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Site: assets.nasqueron.org
# License: Trivial work, not eligible to copyright
# Source file: roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/assets.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>
# -------------------------------------------------------------
# Fonts by user-agent
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
map $http_user_agent $font_extension {
~Mozilla with-woff2;
default with-ttf;
}
# -------------------------------------------------------------
# assets.nasqueron.org
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
server {
listen 80;
listen [::]:80;
server_name assets.nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/assets.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/assets.nasqueron.org/privkey.pem;
+ error_log /var/log/www/nasqueron.org/assets-error.log;
+ access_log /var/log/www/nasqueron.org/assets-access.log;
+
include includes/letsencrypt;
root /var/wwwroot/nasqueron.org/assets;
index index.html index.php index.htm;
location / {
location ~* \.(eot|otf|ttf|woff|woff2|css|js|json)$ {
add_header Access-Control-Allow-Origin *;
}
}
location /webfonts/css {
default_type text/css;
add_header Access-Control-Allow-Origin *;
add_header Assets-Font-Format $font_extension always;
try_files $uri $uri.$font_extension $uri/ =404;
}
}
diff --git a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/docker.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/docker.conf
index afcb4d5..9db1d36 100644
--- a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/docker.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/docker.conf
@@ -1,31 +1,34 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Site: docker.nasqueron.org
# License: Trivial work, not eligible to copyright
# Source file: roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/docker.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 docker.nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/docker.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/docker.nasqueron.org/privkey.pem;
+ error_log /var/log/www/nasqueron.org/docker-error.log;
+ access_log /var/log/www/nasqueron.org/docker-access.log;
+
include includes/letsencrypt;
root /var/wwwroot/nasqueron.org/docker;
index index.html index.php index.htm;
}
diff --git a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/drive.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/drive.conf
index d65fc9c..fb77c17 100644
--- a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/drive.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/drive.conf
@@ -1,134 +1,140 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Site: drive.nasqueron.org
# License: Trivial work, not eligible to copyright
# Source file: roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/drive.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 {
# Maintained by Dereckson
# NextCloud instance for WindRiver documents
listen 80;
listen [::]:80;
server_name drive.nasqueron.org;
+ error_log /var/log/www/nasqueron.org/drive-error.log;
+ access_log /var/log/www/nasqueron.org/drive-access.log;
+
include includes/letsencrypt;
return 301 https://$host$request_uri;
}
server {
server_name drive.nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/drive.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/drive.nasqueron.org/privkey.pem;
+ error_log /var/log/www/nasqueron.org/drive-error.log;
+ access_log /var/log/www/nasqueron.org/drive-access.log;
+
include includes/letsencrypt;
root /usr/local/www/nextcloud;
index index.html index.php index.htm;
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block";
add_header X-Robots-Tag none;
add_header X-Download-Options noopen;
add_header X-Permitted-Cross-Domain-Policies none;
client_max_body_size 16400M;
client_body_buffer_size 1048576k;
send_timeout 3000;
gzip on;
gzip_vary on;
gzip_comp_level 4;
gzip_min_length 256;
gzip_proxied expired no-cache no-store private no_last_modified no_etag auth;
gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy;
location / {
try_files $uri $uri/ /index.php$uri;
}
location = /.well-known/carddav {
return 301 $scheme://$host/remote.php/dav;
}
location = /.well-known/caldav {
return 301 $scheme://$host/remote.php/dav;
}
location = /.well-known/webfinger {
return 301 $scheme://$host/index.php/.well-known/webfinger;
}
location = /.well-known/nodeinfo {
return 301 $scheme://$host/index.php/.well-known/nodeinfo;
}
location /index.php {
fastcgi_pass unix:/var/run/web/drive.nasqueron.org/php-fpm.sock;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
include fastcgi_params;
}
location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)/ {
deny all;
}
location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console) {
deny all;
}
location ~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+)\.php(?:$|/) {
fastcgi_split_path_info ^(.+\.php)(/.*)$;
include includes/fastcgi;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_param HTTPS on;
fastcgi_param modHeadersAvailable true;
fastcgi_param front_controller_active true;
fastcgi_pass unix:/var/run/web/drive.nasqueron.org/php-fpm.sock;
fastcgi_intercept_errors on;
fastcgi_request_buffering off;
fastcgi_keep_conn off;
fastcgi_buffers 16 256K;
fastcgi_buffer_size 256k;
fastcgi_busy_buffers_size 256k;
fastcgi_temp_file_write_size 256k;
fastcgi_send_timeout 3000s;
fastcgi_read_timeout 3000s;
fastcgi_connect_timeout 3000s;
}
location ~ \.(?:css|js|woff|svg|gif)$ {
try_files $uri /index.php$uri$is_args$args;
add_header Cache-Control "public, max-age=15778463";
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block";
add_header X-Robots-Tag none;
add_header X-Download-Options noopen;
add_header X-Permitted-Cross-Domain-Policies none;
}
location ~ \.(?:png|html|ttf|ico|jpg|jpeg)$ {
try_files $uri /index.php$uri$is_args$args;
}
location ~ ^/(?:updater|ocs-provider)(?:$|/) {
try_files $uri/ =404;
index index.php;
}
}
diff --git a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/ftp.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/ftp.conf
index 15d64f5..486022b 100644
--- a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/ftp.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/ftp.conf
@@ -1,37 +1,40 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Site: ftp.nasqueron.org
# License: Trivial work, not eligible to copyright
# Source file: roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/ftp.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 ftp.nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/ftp.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/ftp.nasqueron.org/privkey.pem;
+ error_log /var/log/www/nasqueron.org/ftp-error.log;
+ access_log /var/log/www/nasqueron.org/ftp-access.log;
+
include includes/letsencrypt;
root /var/wwwroot/nasqueron.org/ftp;
index index.html index.php index.htm;
location /pub {
root /usr/jails/ftp/var/ftp;
}
autoindex on;
}
diff --git a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/tools51.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/tools51.conf
index 60bbf4e..1b9c892 100644
--- a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/tools51.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/tools51.conf
@@ -1,52 +1,55 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Site: tools51.nasqueron.org
# License: Trivial work, not eligible to copyright
# Source file: roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/tools51.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 {
# Maintained by Dereckson
# Staging area for https://tools.nasqueron.org
listen 80;
listen [::]:80;
server_name tools51.nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/tools51.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/tools51.nasqueron.org/privkey.pem;
+ error_log /var/log/www/nasqueron.org/tools51-error.log;
+ access_log /var/log/www/nasqueron.org/tools51-access.log;
+
include includes/letsencrypt;
root /var/51-wwwroot/tools;
index index.html index.php index.htm;
location ~* \.(js|jpg|gif|png|svg|css|txt|eot|woff|ttf)$ {
expires 30d;
}
location = /dl.php {
include includes/fastcgi;
fastcgi_param SCRIPT_FILENAME /var/51-wwwroot/tools/dl.php;
fastcgi_pass unix:/var/run/web/tools51.nasqueron.org/php-fpm.sock;
}
location / {
rewrite ^/color/screen/(.+)$ /?Topic=color-screen&Color=$1;
fastcgi_pass unix:/var/run/web/tools51.nasqueron.org/php-fpm.sock;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME /var/51-wwwroot/tools/index.php;
include includes/fastcgi;
}
}
diff --git a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/trustspace.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/trustspace.conf
index 1a796a9..34e0f4f 100644
--- a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/trustspace.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/trustspace.conf
@@ -1,31 +1,34 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Site: trustspace.nasqueron.org
# License: Trivial work, not eligible to copyright
# Source file: roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/trustspace.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 trustspace.nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/trustspace.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/trustspace.nasqueron.org/privkey.pem;
+ error_log /var/log/www/nasqueron.org/trustspace-error.log;
+ access_log /var/log/www/nasqueron.org/trustspace-access.log;
+
include includes/letsencrypt;
root /var/wwwroot/nasqueron.org/trustspace;
index index.html index.php index.htm;
}
diff --git a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www.conf
index fe93c71..040203c 100644
--- a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www.conf
@@ -1,52 +1,55 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Site: www.nasqueron.org
# License: Trivial work, not eligible to copyright
# Source file: roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/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 site
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
server {
listen 80;
listen [::]:80;
server_name www.nasqueron.org nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/www.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/www.nasqueron.org/privkey.pem;
+ error_log /var/log/www/nasqueron.org/www-error.log;
+ access_log /var/log/www/nasqueron.org/www-access.log;
+
include includes/letsencrypt;
root /var/wwwroot/nasqueron.org/www;
index index.html index.php index.htm;
location = /sites.json {
proxy_pass https://api.nasqueron.org/sites.json;
}
location = /software {
return 302 https://agora.nasqueron.org/Software;
}
location = /.well-known/host-meta {
include includes/cors-open;
default_type application/xrd+xml;
}
location = /.well-known/host-meta.json {
include includes/cors-open;
default_type application/json;
}
}
diff --git a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www51.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www51.conf
index 4b2fa20..89fec72 100644
--- a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www51.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www51.conf
@@ -1,47 +1,50 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Site: www.nasqueron.org
# License: Trivial work, not eligible to copyright
# Source file: roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www51.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>
# -------------------------------------------------------------
# Staging area
# Maintained by Dereckson
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
server {
listen 80;
listen [::]:80;
server_name www51.nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/www51.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/www51.nasqueron.org/privkey.pem;
+ error_log /var/log/www/nasqueron.org/www51-error.log;
+ access_log /var/log/www/nasqueron.org/www51-access.log;
+
include includes/letsencrypt;
root /var/51-wwwroot/www;
index index.html index.php index.htm;
location = /.well-known/host-meta {
include includes/cors-open;
default_type application/xrd+xml;
}
location = /.well-known/host-meta.json {
include includes/cors-open;
default_type application/json;
}
# We intentionally skip /sites.json, as we want to use directly in JS code api.n.o/sites.json
}