Page MenuHomeDevCentral
Files F3913440

D2418.diff
No OneTemporary
Actions

D2418.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
@@ -173,6 +173,7 @@
# Directly managed by Nasqueron
- .org/nasqueron/api
+ - .org/nasqueron/autoconfig
- .org/nasqueron/daeghrefn
- .org/nasqueron/docs
- .org/nasqueron/infra
diff --git a/roles/webserver-content/init.sls b/roles/webserver-content/init.sls
--- a/roles/webserver-content/init.sls
+++ b/roles/webserver-content/init.sls
@@ -10,6 +10,7 @@
- .be/dereckson
- .org/eglide
- .org/nasqueron/api
+ - .org/nasqueron/autoconfig
- .org/nasqueron/docs
- .org/nasqueron/labs
- .org/nasqueron/social
diff --git a/roles/webserver-content/org/nasqueron/autoconfig.sls b/roles/webserver-content/org/nasqueron/autoconfig.sls
new file mode 100644
--- /dev/null
+++ b/roles/webserver-content/org/nasqueron/autoconfig.sls
@@ -0,0 +1,29 @@
+# -------------------------------------------------------------
+# Salt — Provision autoconfig.nasqueron.org website
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# License: Trivial work, not eligible to copyright
+# -------------------------------------------------------------
+
+{% if salt['node.has_web_content'](".org/nasqueron/autoconfig") %}
+
+# -------------------------------------------------------------
+# Base directory
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+/var/wwwroot/nasqueron.org/autoconfig:
+ file.directory:
+ - user: deploy
+ - group: web
+ - dir_mode: 755
+
+# -------------------------------------------------------------
+# Deploy through Jenkins CD
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+www_autoconfig_build:
+ module.run:
+ - name: jenkins.build_job
+ - m_name: deploy-website-nasqueron-www1-autoconfig
+
+{% endif %}
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/autoconfig.conf b/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/autoconfig.conf
new file mode 100644
--- /dev/null
+++ b/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/autoconfig.conf
@@ -0,0 +1,40 @@
+# -------------------------------------------------------------
+# Webserver
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# Site: autoconfig.nasqueron.org
+# License: Trivial work, not eligible to copyright
+# Source file: roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/autoconfig.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 autoconfig.nasqueron.org;
+
+ include includes/letsencrypt;
+
+ return 301 https://autoconfig.nasqueron.org$request_uri;
+}
+
+server {
+ server_name autoconfig.nasqueron.org;
+
+ include includes/tls;
+ ssl_certificate /usr/local/etc/letsencrypt/live/autoconfig.nasqueron.org/fullchain.pem;
+ ssl_certificate_key /usr/local/etc/letsencrypt/live/autoconfig.nasqueron.org/privkey.pem;
+
+ error_log /var/log/www/nasqueron.org/autoconfig-error.log;
+ access_log /var/log/www/nasqueron.org/autoconfig-access.log;
+
+ root /var/wwwroot/nasqueron.org/autoconfig;
+
+ include includes/letsencrypt;
+}

File Metadata

Mime Type
text/plain
Expires
Fri, Dec 20, 10:06 (5 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2307940
Default Alt Text
D2418.diff (3 KB)

Event Timeline

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