Page Menu
Home
DevCentral
Search
Configure Global Search
Log In
Files
F56987334
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
4 KB
Referenced Files
None
Subscribers
None
View Options
diff --git a/pillar/webserver/wwwroot51.sls b/pillar/webserver/wwwroot51.sls
index 4806a0a..5d95794 100644
--- a/pillar/webserver/wwwroot51.sls
+++ b/pillar/webserver/wwwroot51.sls
@@ -1,22 +1,25 @@
# -------------------------------------------------------------
# Salt — Sites to provision on the devserver wwwroot51
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
wwwroot51_basedir: /var/51-wwwroot
wwwroot51_directories:
api:
user: dereckson
group: dereckson
repository: ssh://vcs@devcentral.nasqueron.org:5022/source/api.git
+ rain:
+ user: dereckson
+ group: dereckson
tools:
user: dereckson
group: dereckson
repository: ssh://vcs@devcentral.nasqueron.org:5022/source/tools.git
www:
user: dereckson
group: dereckson
repository: ssh://vcs@devcentral.nasqueron.org:5022/source/www.git
diff --git a/roles/devserver/webserver-wwwroot51/init.sls b/roles/devserver/webserver-wwwroot51/init.sls
index 11674a6..51f6662 100644
--- a/roles/devserver/webserver-wwwroot51/init.sls
+++ b/roles/devserver/webserver-wwwroot51/init.sls
@@ -1,34 +1,36 @@
# -------------------------------------------------------------
# Salt — Webserver wwwroot51 content
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2018-02-11
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
{% set basedir = pillar['wwwroot51_basedir'] %}
# -------------------------------------------------------------
# Base directory
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{ basedir }}:
file.directory:
- dir_mode: 711
# -------------------------------------------------------------
# 51 sites
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% for sitename, site in pillar['wwwroot51_directories'].items() %}
{{ basedir }}/{{ sitename }}:
file.directory:
- 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
index 0000000..97093ce
--- /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
Details
Attached
Mime Type
text/x-diff
Expires
Sat, Nov 14, 12:35 (4 d, 4 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4249971
Default Alt Text
(4 KB)
Attached To
Mode
rOPS Nasqueron Operations
Attached
Detach File
Event Timeline
Log In to Comment