Page MenuHomeDevCentral
Files F12301542

D3770.diff
No OneTemporary
Actions

D3770.diff
View Options

diff --git a/pillar/credentials/vault.sls b/pillar/credentials/vault.sls
--- a/pillar/credentials/vault.sls
+++ b/pillar/credentials/vault.sls
@@ -278,6 +278,7 @@
webserver-alkane-dev:
- ops/secrets/dbserver/cluster-B/users/dereckson_www51
+ - ops/secrets/dbserver/cluster-B/users/obsidian51
webserver-legacy:
diff --git a/pillar/paas/alkane/windriver/obsidian.sls b/pillar/paas/alkane/windriver/obsidian.sls
new file mode 100644
--- /dev/null
+++ b/pillar/paas/alkane/windriver/obsidian.sls
@@ -0,0 +1,41 @@
+# -------------------------------------------------------------
+# Salt — PaaS Alkane :: PHP and static sites [development]
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# License: Trivial work, not eligible to copyright
+# Site: https://obsidian51.nasqueron.org
+# -------------------------------------------------------------
+
+# -------------------------------------------------------------
+# PHP sites
+#
+# Username must be unique and use max 31 characters.
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+web_php_sites:
+ obsidian51.nasqueron.org:
+ domain: nasqueron.org
+ subdomain: obsidian51
+ user: web-org-nasqueron-obsidian51
+ php-fpm: prod
+
+# -------------------------------------------------------------
+# Vhosts
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+nginx_vhosts:
+ nasqueron.org:
+ - obsidian51
+
+# -------------------------------------------------------------
+# .env configuration files
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+webserver_content_dotenv:
+ /var/51-wwwroot/obsidian/.env:
+ user: web-org-nasqueron-obsidian51
+ db:
+ service: db-B
+ credentials: dbserver/cluster-B/users/obsidian51
+ extra_values:
+ DB_NAME: obsidian51
diff --git a/pillar/webserver/wwwroot51.sls b/pillar/webserver/wwwroot51.sls
--- a/pillar/webserver/wwwroot51.sls
+++ b/pillar/webserver/wwwroot51.sls
@@ -47,6 +47,10 @@
user: dereckson
group: dereckson
+ obsidian:
+ user: dereckson
+ group: dereckson
+
rain:
user: dereckson
group: dereckson
diff --git a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/obsidian51.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/obsidian51.conf
new file mode 100644
--- /dev/null
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/obsidian51.conf
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------
+# Webserver
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# Site: obsidian51.nasqueron.org
+# License: Trivial work, not eligible to copyright
+# Source file: roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/obsidian51.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
+ # Development environment for Obsidian Workspaces
+
+ listen 80;
+ listen [::]:80;
+ server_name obsidian51.nasqueron.org;
+
+ include includes/tls;
+ ssl_certificate /usr/local/etc/letsencrypt/live/obsidian51.nasqueron.org/fullchain.pem;
+ ssl_certificate_key /usr/local/etc/letsencrypt/live/obsidian51.nasqueron.org/privkey.pem;
+
+ error_log /var/log/www/nasqueron.org/obsidian51-error.log;
+ access_log /var/log/www/nasqueron.org/obsidian51-access.log;
+
+ include includes/letsencrypt;
+
+ root /var/51-wwwroot/obsidian/workspaces/src;
+ index index.html index.php index.htm;
+
+ include includes/pluton;
+}

File Metadata

Mime Type
text/plain
Expires
Tue, Oct 21, 19:18 (20 h, 22 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3093454
Default Alt Text
D3770.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