Page MenuHomeDevCentral
Files F11722567

No OneTemporary
Actions

View Options

diff --git a/pillar/top.sls b/pillar/top.sls
index 3f6061c..58bff06 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -1,21 +1,22 @@
# -------------------------------------------------------------
# Salt configuration for Nasqueron servers
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2016-04-10
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
base:
'*':
- core.users
- core.groups
- certificates.certificates
- nodes.nodes
- nodes.forests
- hotfixes.roles
- webserver.sites
ysul:
- viperserv.bots
- viperserv.fantoir
+ - webserver.labs
- webserver.wwwroot51
diff --git a/roles/webserver-content/init.sls b/pillar/webserver/labs.sls
similarity index 52%
copy from roles/webserver-content/init.sls
copy to pillar/webserver/labs.sls
index c6026a4..73aa82b 100644
--- a/roles/webserver-content/init.sls
+++ b/pillar/webserver/labs.sls
@@ -1,15 +1,10 @@
# -------------------------------------------------------------
-# Salt — Webserver content
+# Salt — Sites to provision on the devserver labs
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Project: Eglide
-# Created: 2017-11-23
+# Project: Nasqueron
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
-include:
- - .be/dereckson
- - .com/paysannerebelle
- - .org/eglide
- - .org/nasqueron/api
- - .org/nasqueron/docs
- - .org/nasqueron/social
+web_labs:
+ - HexGL
+ - corporate-name-generator
diff --git a/pillar/webserver/sites.sls b/pillar/webserver/sites.sls
index 2b192f4..f51818c 100644
--- a/pillar/webserver/sites.sls
+++ b/pillar/webserver/sites.sls
@@ -1,108 +1,109 @@
# -------------------------------------------------------------
# Salt — Sites to provision on the legacy web server
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
# -------------------------------------------------------------
# Domains we deploy
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
web_domains:
#
# Directly managed by Nasqueron
#
nasqueron:
- nasqueron.org
#
# Nasqueron members
#
nasqueron_members:
- dereckson.be
#
# Wolfplex
#
wolfplex:
- wolfplex.be
# -------------------------------------------------------------
# Static sites
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
web_static_sites:
nasqueron.org:
- www
- assets
- docker
- ftp
- infra
- trustspace
# -------------------------------------------------------------
# PHP sites
#
# Username must be unique and use max 31 characters.
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
php_fpm_instances:
# PHP 7.1, generally installed as package/port
prod:
command: /usr/local/sbin/php-fpm
web_php_sites:
# Nasqueron members
www.dereckson.be:
domain: dereckson.be
subdomain: www
user: web-be-dereckson-www
source: wwwroot/dereckson.be/www
target: /var/wwwroot/dereckson.be/www
php-fpm: prod
# Directly managed by Nasqueron
api.nasqueron.org:
domain: nasqueron.org
subdomain: api
user: web-org-nasqueron-api-serverslog
php-fpm: prod
env:
SERVERS_LOG_FILE: /srv/api/data/servers-log-all.json
# -------------------------------------------------------------
# States
#
# Sites with states documenting how to build them
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
web_content_sls:
#
# Eglide
#
shellserver:
# Third party sites hosted to Eglide
- .com/paysannerebelle
# Directly managed by Eglide project
- .org/eglide
#
# Nasqueron servers
#
mastodon:
- .org/nasqueron/social
webserver-legacy:
# Nasqueron members
- .be/dereckson
# Directly managed by Nasqueron
- .org/nasqueron/api
- .org/nasqueron/docs
+ - .org/nasqueron/labs
# -------------------------------------------------------------
# Tweaks
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
web_autochmod:
- /var/wwwroot/dereckson.be/www
diff --git a/roles/webserver-content/init.sls b/roles/webserver-content/init.sls
index c6026a4..19ddc26 100644
--- a/roles/webserver-content/init.sls
+++ b/roles/webserver-content/init.sls
@@ -1,15 +1,16 @@
# -------------------------------------------------------------
# Salt — Webserver content
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Eglide
# Created: 2017-11-23
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
include:
- .be/dereckson
- .com/paysannerebelle
- .org/eglide
- .org/nasqueron/api
- .org/nasqueron/docs
+ - .org/nasqueron/labs
- .org/nasqueron/social
diff --git a/roles/webserver-content/org/nasqueron/labs.sls b/roles/webserver-content/org/nasqueron/labs.sls
new file mode 100644
index 0000000..289938b
--- /dev/null
+++ b/roles/webserver-content/org/nasqueron/labs.sls
@@ -0,0 +1,48 @@
+# -------------------------------------------------------------
+# Salt — Provision labs.nasqueron.org website
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# License: Trivial work, not eligible to copyright
+# -------------------------------------------------------------
+
+{% if salt['node.has_web_content'](".org/nasqueron/labs") %}
+
+# -------------------------------------------------------------
+# Base directory
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+/var/wwwroot/nasqueron.org/labs:
+ file.directory:
+ - user: deploy
+ - group: web
+ - dir_mode: 755
+
+labs_base_directory_content:
+ file.recurse:
+ - name: /var/wwwroot/nasqueron.org/labs
+ - source: salt://wwwroot/nasqueron.org/labs/public
+ - exclude_pat: E@.git
+ - user: deploy
+ - group: web
+ - dir_mode: 755
+ - file_mode: 644
+ - clean: False
+
+# -------------------------------------------------------------
+# Labs directories
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+{% for lab in pillar['web_labs'] %}
+labs_lab_directory_{{ lab }}:
+ file.recurse:
+ - name: /var/wwwroot/nasqueron.org/labs/{{ lab }}
+ - source: salt://software/{{ lab }}
+ - exclude_pat: E@.git
+ - user: deploy
+ - group: web
+ - dir_mode: 755
+ - file_mode: 644
+ - clean: False
+{% endfor %}
+
+{% endif %}

File Metadata

Mime Type
text/x-diff
Expires
Thu, Sep 18, 03:36 (23 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2989925
Default Alt Text
(6 KB)

Event Timeline

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