Page MenuHomeDevCentral
Files F3780265

D1681.diff
No OneTemporary
Actions

D1681.diff
View Options

diff --git a/pillar/paas/docker.sls b/pillar/paas/docker.sls
--- a/pillar/paas/docker.sls
+++ b/pillar/paas/docker.sls
@@ -88,3 +88,23 @@
- 7777 # File transfer proxy
- 9090 # Web administration server
- 9091 # Web administration server with THLS
+
+ # -------------------------------------------------------------
+ # Zemke-Rhyne clients
+ #
+ # This section should list all the Docker engines server
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+zr_clients:
+ - key: 2
+ allowedConnectionFrom:
+ - 172.27.26.49
+ - dwellers.nasqueron.drake
+ - dwellers.nasqueron.org
+ restrictCommand:
+ comment: Zemke-Rhyne
+ - key: 123
+ allowedConnectionFrom:
+ - equatower.nasqueron.org
+ restrictCommand:
+ comment: Zemke-Rhyne
diff --git a/pillar/top.sls b/pillar/top.sls
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -24,6 +24,7 @@
- saas.phpbb
ysul:
- devserver.repos
+ - paas.docker
- saas.mediawiki
- viperserv.bots
- viperserv.fantoir
diff --git a/roles/saltmaster/zemke-rhyne/data.sls b/roles/saltmaster/zemke-rhyne/data.sls
new file mode 100644
--- /dev/null
+++ b/roles/saltmaster/zemke-rhyne/data.sls
@@ -0,0 +1,16 @@
+# -------------------------------------------------------------
+# Salt — Provision Docker engine
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# Created: 2018-09-08
+# License: Trivial work, not eligible to copyright
+# -------------------------------------------------------------
+
+# If we pass the JSON as contents, it will be converted into Python,
+# so we've a template to call directly the method.
+
+/home/zr/data/servers.json:
+ file.managed:
+ - source: salt://roles/saltmaster/zemke-rhyne/files/servers.json.jinja
+ - template: jinja
+ - user: zr
diff --git a/roles/saltmaster/zemke-rhyne/files/servers.json.jinja b/roles/saltmaster/zemke-rhyne/files/servers.json.jinja
new file mode 100644
--- /dev/null
+++ b/roles/saltmaster/zemke-rhyne/files/servers.json.jinja
@@ -0,0 +1 @@
+{{ salt['convert.to_json_from_pillar_key']('zr_clients') }}
diff --git a/roles/saltmaster/zemke-rhyne/init.sls b/roles/saltmaster/zemke-rhyne/init.sls
new file mode 100644
--- /dev/null
+++ b/roles/saltmaster/zemke-rhyne/init.sls
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------
+# Salt — Provision Docker engine
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# Created: 2018-09-08
+# License: Trivial work, not eligible to copyright
+#
+# ___ ___ ___ ___ ___
+# / /\ / /\ /__/\ /__/| / /\
+# / /::| / /:/_ | |::\ | |:| / /:/_
+# / /:/:| / /:/ /\ | |:|:\ | |:| / /:/ /\
+# / /:/|:|__ / /:/ /:/_ __|__|:|\:\ __| |:| / /:/ /:/_
+# /__/:/ |:| /\ /__/:/ /:/ /\ /__/::::| \:\ /__/\_|:|____ /__/:/ /:/ /\
+# \__\/ |:|/:/ \ \:\/:/ /:/ \ \:\~~\__\/ \ \:\/:::::/ \ \:\/:/ /:/
+# | |:/:/ \ \::/ /:/ \ \:\ \ \::/~~~~ \ \::/ /:/
+# | |::/ \ \:\/:/ \ \:\ \ \:\ \ \:\/:/
+# | |:/ \ \::/ \ \:\ \ \:\ \ \::/
+# |__|/ ___ \__\/ ___ \__\/ \__\/ ___ \__\/ ___
+# / /\ /__/\ ___ /__/\ / /\
+# / /::\ \ \:\ /__/| \ \:\ / /:/_
+# / /:/\:\ \__\:\ | |:| \ \:\ / /:/ /\
+# / /:/~/:/ ___ / /::\ | |:| _____\__\:\ / /:/ /:/_
+# /__/:/ /:/___ /__/\ /:/\:\ __|__|:| /__/::::::::\ /__/:/ /:/ /\
+# \ \:\/:::::/ \ \:\/:/__\/ /__/::::\ \ \:\~~\~~\/ \ \:\/:/ /:/
+# \ \::/~~~~ \ \::/ ~\~~\:\ \ \:\ ~~~ \ \::/ /:/
+# \ \:\ \ \:\ \ \:\ \ \:\ \ \:\/:/
+# \ \:\ \ \:\ \__\/ \ \:\ \ \::/
+# \__\/ \__\/ \__\/ \__\/
+#
+# Support tools for a Docker <--> Phabricator bridge.
+#
+# Use the Zemke-Rhyne account to build Docker containers for
+# Nasqueron applications, fetching information from DevCentral.
+#
+# -------------------------------------------------------------
+
+include:
+ - .data

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 26, 12:43 (20 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2264626
Default Alt Text
D1681.diff (4 KB)

Event Timeline

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