Page MenuHomeDevCentral

No OneTemporary

diff --git a/pillar/paas/docker.sls b/pillar/paas/docker.sls
index 6b12327..12560ad 100644
--- a/pillar/paas/docker.sls
+++ b/pillar/paas/docker.sls
@@ -1,90 +1,110 @@
# -------------------------------------------------------------
# Salt — Provision Docker engine
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2018-03-10
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
# -------------------------------------------------------------
# Images and containers
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# You can append a :tag (by default, latest is used).
# You can't directly specify a Docker library images.
# See https://docs.saltstack.com/en/latest/ref/states/all/salt.states.docker_image.html
docker_images:
'*':
- certbot/certbot
dwellers:
# Core services
- nasqueron/rabbitmq
# Infrastructure and development services
- dereckson/cachet
- nasqueron/notifications
equatower:
# Core services
- nasqueron/mysql
# Infrastructure and development services
- nasqueron/aphlict
- nasqueron/etherpad
- nasqueron/phabricator
# Continuous deployment jobs
- jenkinsci/jenkins
- nasqueron/jenkins-slave-php
# phpBB SaaS
- nasqueron/mysql
docker_containers:
equatower:
# MySQL
mysql:
acquisitariat: {}
phpbb_db: {}
# CD
jenkins:
host: cd.nasqueron.org
app_port: 38080
jenkins_slave:
apsile:
ip: 172.17.0.100
elapsi:
ip: 172.17.0.101
# Infrastructure and development services
phabricator:
devcentral: {}
aphlict: {}
etherpad:
app_port: 34080
mysql_link: acquisitariat
plugins:
- ep_ether-o-meter
- ep_author_neat
# phpBB SaaS
# The SaaS uses a MySQL instance, declared in the MySQL section.
# Openfire
openfire:
host: xmpp.nasqueron.org
# -------------------------------------------------------------
# Ports listened by XMPP
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
xmpp_ports:
- 3478
- 5222 # Client to server
- 5223 # Client to server (Encrypted (legacy-mode) connections)
- 5262 # Cnnections managers
- 5269 # Server to server
- 5275 # External components
- 5276 # External components (Encrypted (legacy-mode) connections)
- 7070 # HTTP binding
- 7443 # HTTP binding with TLS
- 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
index 2adfc56..0a40f0b 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -1,31 +1,32 @@
# -------------------------------------------------------------
# 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
dwellers:
- paas.docker
eglide:
- shellserver.quassel
equatower:
- paas.docker
- saas.phpbb
ysul:
- devserver.repos
+ - paas.docker
- saas.mediawiki
- viperserv.bots
- viperserv.fantoir
- webserver.labs
- webserver.wwwroot51
diff --git a/roles/saltmaster/zemke-rhyne/data.sls b/roles/saltmaster/zemke-rhyne/data.sls
new file mode 100644
index 0000000..98f94c7
--- /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
index 0000000..dc024c9
--- /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
index 0000000..681623f
--- /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/x-diff
Expires
Sun, Nov 15, 01:59 (4 d, 21 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4258442
Default Alt Text
(7 KB)

Event Timeline