Page Menu
Home
DevCentral
Search
Configure Global Search
Log In
Files
F3769818
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
5 KB
Referenced Files
None
Subscribers
None
View Options
diff --git a/pillar/webserver/sites.sls b/pillar/webserver/sites.sls
index aec21e9..34a9721 100644
--- a/pillar/webserver/sites.sls
+++ b/pillar/webserver/sites.sls
@@ -1,143 +1,146 @@
# -------------------------------------------------------------
# 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.org
# -------------------------------------------------------------
# Static sites
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
web_static_sites:
nasqueron.org:
- www
- assets
- docker
- ftp
- infra
- packages
- trustspace
wolfplex.org:
- www
# -------------------------------------------------------------
# PHP sites
#
# Username must be unique and use max 31 characters.
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
php_fpm_instances:
# PHP 7.2, 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
# 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
skipCreateAccount: True
env:
MEDIAWIKI_ENTRY_POINT: /srv/mediawiki/index.php
DB_HOST: localhost
DB_USER: mediawiki-saas
# 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
# -------------------------------------------------------------
# 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
+ # Projects hosted
+ - .space/hypership
+
# Directly managed by Nasqueron
- .org/nasqueron/api
- .org/nasqueron/docs
- .org/nasqueron/labs
# Wolfplex Hackerspace
- .org/wolfplex/api
- .org/wolfplex/www
# -------------------------------------------------------------
# Tweaks
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
web_autochmod:
- /var/wwwroot/dereckson.be/www
diff --git a/roles/webserver-content/init.sls b/roles/webserver-content/init.sls
index 02d766f..0f77247 100644
--- a/roles/webserver-content/init.sls
+++ b/roles/webserver-content/init.sls
@@ -1,18 +1,19 @@
# -------------------------------------------------------------
# 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
- .org/wolfplex/api
- .org/wolfplex/www
+ - .space/hypership
diff --git a/roles/webserver-content/space/hypership/init.sls b/roles/webserver-content/space/hypership/init.sls
new file mode 100644
index 0000000..503a016
--- /dev/null
+++ b/roles/webserver-content/space/hypership/init.sls
@@ -0,0 +1,9 @@
+# -------------------------------------------------------------
+# Salt — Hypership
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Zed
+# License: Trivial work, not eligible to copyright
+# -------------------------------------------------------------
+
+include:
+ - .www
diff --git a/roles/webserver-content/space/hypership/www.sls b/roles/webserver-content/space/hypership/www.sls
new file mode 100644
index 0000000..ba9f2e6
--- /dev/null
+++ b/roles/webserver-content/space/hypership/www.sls
@@ -0,0 +1,22 @@
+# -------------------------------------------------------------
+# Salt — Hypership
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Zed
+# License: Trivial work, not eligible to copyright
+# -------------------------------------------------------------
+
+{% if salt['node.has_web_content'](".space/hypership") %}
+
+/srv/zed:
+ file.directory
+
+# -------------------------------------------------------------
+# Content
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+zed_content:
+ git.latest:
+ - name: https://github.com/hypership/content.git
+ - target: /srv/zed/content
+
+{% endif %}
File Metadata
Details
Attached
Mime Type
text/x-diff
Expires
Mon, Nov 25, 17:04 (22 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2260621
Default Alt Text
(5 KB)
Attached To
Mode
rOPS Nasqueron Operations
Attached
Detach File
Event Timeline
Log In to Comment