Page MenuHomeDevCentral
Files F3690104

D3174.id8092.diff
No OneTemporary
Actions

D3174.id8092.diff
View Options

diff --git a/pillar/paas/alkane/windriver/main.sls b/pillar/paas/alkane/windriver/main.sls
--- a/pillar/paas/alkane/windriver/main.sls
+++ b/pillar/paas/alkane/windriver/main.sls
@@ -105,3 +105,4 @@
nasqueron.org:
- api51
- tools51
+ - www51
diff --git a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www.conf
--- a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www.conf
@@ -36,25 +36,3 @@
proxy_pass https://api.nasqueron.org/sites.json;
}
}
-
-# -------------------------------------------------------------
-# 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;
-
- include includes/letsencrypt;
-
- root /var/51-wwwroot/www;
- index index.html index.php index.htm;
-
- # We intentionally skip /sites.json, as we want to use directly in JS code api.n.o/sites.json
-}
diff --git a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www51.conf
copy from roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www.conf
copy to roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www51.conf
--- a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www51.conf
@@ -14,29 +14,6 @@
# 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;
-
- 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;
- }
-}
-
# -------------------------------------------------------------
# Staging area
# Maintained by Dereckson

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 25, 19:26 (22 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2214889
Default Alt Text
D3174.id8092.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