Page MenuHomeDevCentral
Files F3784483

D1391.id.diff
No OneTemporary
Actions

D1391.id.diff
View Options

diff --git a/pillar/webserver/wwwroot51.sls b/pillar/webserver/wwwroot51.sls
--- a/pillar/webserver/wwwroot51.sls
+++ b/pillar/webserver/wwwroot51.sls
@@ -12,6 +12,9 @@
user: dereckson
group: dereckson
repository: ssh://vcs@devcentral.nasqueron.org:5022/source/api.git
+ rain:
+ user: dereckson
+ group: dereckson
tools:
user: dereckson
group: dereckson
diff --git a/roles/devserver/webserver-wwwroot51/init.sls b/roles/devserver/webserver-wwwroot51/init.sls
--- a/roles/devserver/webserver-wwwroot51/init.sls
+++ b/roles/devserver/webserver-wwwroot51/init.sls
@@ -26,9 +26,11 @@
- dir_mode: 711
- user: {{ site['user'] }}
- group: {{ site['group'] }}
+{% if 'repository' in site %}
git.latest:
- name: {{ site['repository'] }}
- target: {{ basedir }}/{{ sitename }}
- user: {{ site['user'] }}
- update_head: False
+{% endif %}
{% endfor %}
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/rain.conf b/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/rain.conf
new file mode 100644
--- /dev/null
+++ b/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/rain.conf
@@ -0,0 +1,61 @@
+# -------------------------------------------------------------
+# Webserver
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# Site: rain.nasqueron.org
+# License: Trivial work, not eligible to copyright
+# Source file: roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/rain.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 rain.nasqueron.org;
+
+ include includes/letsencrypt;
+
+ return 301 https://rain.nasqueron.org$request_uri;
+}
+
+server {
+ server_name rain.nasqueron.org;
+
+ include includes/tls;
+ ssl_certificate /usr/local/etc/letsencrypt/live/rain.nasqueron.org/fullchain.pem;
+ ssl_certificate_key /usr/local/etc/letsencrypt/live/rain.nasqueron.org/privkey.pem;
+
+ error_log /var/log/www/nasqueron.org/rain-error.log;
+ access_log /var/log/www/nasqueron.org/rain-access.log;
+
+ root /var/wwwroot/nasqueron.org/rain;
+}
+
+server {
+ listen 80;
+ listen [::]:80;
+ server_name rain51.nasqueron.org;
+
+ include includes/letsencrypt;
+
+ return 301 https://rain51.nasqueron.org$request_uri;
+}
+
+server {
+ server_name rain51.nasqueron.org;
+
+ include includes/tls;
+ ssl_certificate /usr/local/etc/letsencrypt/live/rain.nasqueron.org/fullchain.pem;
+ ssl_certificate_key /usr/local/etc/letsencrypt/live/rain.nasqueron.org/privkey.pem;
+
+ error_log /var/log/www/nasqueron.org/rain51-error.log;
+ access_log /var/log/www/nasqueron.org/rain51-access.log;
+
+ root /var/51-wwwroot/rain;
+}

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 27, 05:58 (17 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2266198
Default Alt Text
D1391.id.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