Page MenuHomeDevCentral
Files F3694629

D3108.id7935.diff
No OneTemporary
Actions

D3108.id7935.diff
View Options

diff --git a/pillar/webserver/sites.sls b/pillar/paas/alkane/web-001/main.sls
copy from pillar/webserver/sites.sls
copy to pillar/paas/alkane/web-001/main.sls
--- a/pillar/webserver/sites.sls
+++ b/pillar/paas/alkane/web-001/main.sls
@@ -1,5 +1,5 @@
# -------------------------------------------------------------
-# Salt — Sites to provision on the legacy web server
+# Salt — PaaS Alkane :: PHP and static sites [production]
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
@@ -75,12 +75,6 @@
web_php_sites:
# Nasqueron members
- mediawiki.dereckson.be:
- domain: dereckson.be
- subdomain: mediawiki
- user: web-be-dereckson-mw
- php-fpm: prod
-
www.dereckson.be:
domain: dereckson.be
subdomain: www
@@ -91,12 +85,6 @@
capabilities:
- wordpress
- www51.dereckson.be:
- domain: dereckson.be
- subdomain: www51
- user: web-be-dereckson-www51
- php-fpm: prod
-
# Directly managed by Nasqueron
api.nasqueron.org:
domain: nasqueron.org
@@ -126,12 +114,6 @@
target: /var/wwwroot/espace-win.org/www
php-fpm: prod
- www51.espace-win.org:
- domain: espace-win.org
- subdomain: www51
- user: web-org-espacewin-www51
- php-fpm: prod
-
# Wolfplex Hackerspace
www.wolfplex.org:
domain: wolfplex.org
@@ -151,64 +133,3 @@
env:
CACHE_DIR: /var/cache/zed/hypership.space
CONTENT_DIR: /srv/zed/content
-
-# -------------------------------------------------------------
-# States
-#
-# Sites with states documenting how to build them
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-web_content_sls:
- #
- # Eglide
- #
- shellserver:
- # Directly managed by Eglide project
- - .org/eglide
-
- #
- # Nasqueron servers
- #
- mastodon:
- - .org/nasqueron/social
-
- webserver-legacy:
- # Nasqueron members
- - .be/dereckson
-
- # Projects hosted
- - .space/hypership
-
- # Directly managed by Nasqueron
- - .org/nasqueron/api
- - .org/nasqueron/autoconfig
- - .org/nasqueron/daeghrefn
- - .org/nasqueron/docs
- - .org/nasqueron/infra
- - .org/nasqueron/labs
- - .org/nasqueron/rain
-
- # Wolfplex Hackerspace
- - .org/wolfplex/api
- - .org/wolfplex/www
-
-# -------------------------------------------------------------
-# Sites deployed through Jenkins CD
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-web_content_jenkins_cd:
- webserver-legacy:
- - api
- - assets
- - autoconfig
- - docker
- - docs
- - launch
- - www
-
-# -------------------------------------------------------------
-# Tweaks
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-web_autochmod:
- - /var/wwwroot/dereckson.be/www
diff --git a/pillar/paas/alkane/windriver/main.sls b/pillar/paas/alkane/windriver/main.sls
new file mode 100644
--- /dev/null
+++ b/pillar/paas/alkane/windriver/main.sls
@@ -0,0 +1,86 @@
+# -------------------------------------------------------------
+# Salt — PaaS Alkane :: PHP and static sites [development]
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# License: Trivial work, not eligible to copyright
+# -------------------------------------------------------------
+
+web_aliases:
+ services:
+ - &db-B 172.27.27.9
+
+# -------------------------------------------------------------
+# Domains we deploy
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+web_domains:
+
+ #
+ # Directly managed by Nasqueron
+ #
+
+ nasqueron:
+ - nasqueron.org
+ - ook.space
+
+ #
+ # Nasqueron members
+ #
+
+ nasqueron_members:
+ - dereckson.be
+ - hypership.space
+
+ #
+ # Projects ICT is managed by Nasqueron
+ #
+
+ espacewin:
+ - espace-win.org
+
+ wolfplex:
+ - wolfplex.org
+
+# -------------------------------------------------------------
+# Static sites
+#
+# Sites to deploy from the staging repository
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+web_static_sites:
+ nasqueron.org:
+ - docker51
+ - rain51
+ - www51
+
+# -------------------------------------------------------------
+# PHP sites
+#
+# Username must be unique and use max 31 characters.
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+php_fpm_instances:
+ # PHP current version, generally installed as package/port
+ prod:
+ command: /usr/local/sbin/php-fpm
+
+web_php_sites:
+ # Nasqueron members
+ mediawiki.dereckson.be:
+ domain: dereckson.be
+ subdomain: mediawiki
+ user: web-be-dereckson-mw
+ php-fpm: prod
+
+ www51.dereckson.be:
+ domain: dereckson.be
+ subdomain: www51
+ user: web-be-dereckson-www51
+ php-fpm: prod
+
+ # Espace Win
+ www51.espace-win.org:
+ domain: espace-win.org
+ subdomain: www51
+ user: web-org-espacewin-www51
+ php-fpm: prod
diff --git a/pillar/tower.sls b/pillar/tower.sls
--- a/pillar/tower.sls
+++ b/pillar/tower.sls
@@ -9,4 +9,5 @@
# -------------------------------------------------------------
base:
+ - paas/alkane/{{ minion_id }}/*.sls
- paas/docker/{{ minion_id }}/*.sls
diff --git a/pillar/webserver/sites.sls b/pillar/webserver/sites.sls
--- a/pillar/webserver/sites.sls
+++ b/pillar/webserver/sites.sls
@@ -5,153 +5,6 @@
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
-web_aliases:
- services:
- - &db-B 172.27.27.9
-
-# -------------------------------------------------------------
-# Domains we deploy
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-web_domains:
-
- #
- # Directly managed by Nasqueron
- #
-
- nasqueron:
- - nasqueron.org
- - ook.space
-
- #
- # Nasqueron members
- #
-
- nasqueron_members:
- - dereckson.be
- - hypership.space
-
- #
- # Projects ICT is managed by Nasqueron
- #
-
- espacewin:
- - espace-win.org
-
- wolfplex:
- - wolfplex.org
-
-# -------------------------------------------------------------
-# Static sites
-#
-# Sites to deploy from the staging repository
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-web_static_sites:
- dereckson.be:
- - assets
- nasqueron.org:
- - www
- - assets
- - docker
- - ftp
- - launch
- - packages
- - trustspace
- wolfplex.org:
- - www
- - assets
-
-# -------------------------------------------------------------
-# PHP sites
-#
-# Username must be unique and use max 31 characters.
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-php_fpm_instances:
- # PHP current version, generally installed as package/port
- prod:
- command: /usr/local/sbin/php-fpm
-
-web_php_sites:
- # Nasqueron members
- mediawiki.dereckson.be:
- domain: dereckson.be
- subdomain: mediawiki
- user: web-be-dereckson-mw
- php-fpm: prod
-
- 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
- capabilities:
- - wordpress
-
- www51.dereckson.be:
- domain: dereckson.be
- subdomain: www51
- user: web-be-dereckson-www51
- 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
-
- wikis.nasqueron.org:
- domain: nasqueron.org
- subdomain: wikis
- user: mediawiki
- php-fpm: prod
- skipCreateUser: True
- env:
- MEDIAWIKI_ENTRY_POINT: /srv/mediawiki/index.php
- DB_HOST: *db-B
- DB_USER: saas-mediawiki
-
- # Espace Win
- www.espace-win.org:
- domain: espace-win.org
- subdomain: www
- user: web-org-espacewin-www
- source: wwwroot/espace-win.org/www
- target: /var/wwwroot/espace-win.org/www
- php-fpm: prod
-
- www51.espace-win.org:
- domain: espace-win.org
- subdomain: www51
- user: web-org-espacewin-www51
- php-fpm: prod
-
- # Wolfplex Hackerspace
- www.wolfplex.org:
- domain: wolfplex.org
- subdomain: www
- user: web-org-wolfplex-www
- php-fpm: prod
- env:
- DATASTORE: /var/dataroot/wolfplex
- CREDENTIAL_PATH_DATASOURCES_SECURITYDATA: /var/dataroot/wolfplex/secrets.json
-
- # Zed - HyperShip
- hypership.space:
- domain: hypership.space
- subdomain: www
- user: web-space-hypership-www
- php-fpm: prod
- env:
- CACHE_DIR: /var/cache/zed/hypership.space
- CONTENT_DIR: /srv/zed/content
-
# -------------------------------------------------------------
# States
#

File Metadata

Mime Type
text/plain
Expires
Sun, Oct 27, 17:26 (20 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2217712
Default Alt Text
D3108.id7935.diff (8 KB)

Event Timeline

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