View Options

	diff --git a/pillar/paas/docker.sls b/pillar/paas/docker.sls
	index 25059ee..c3e7c11 100644
	--- a/pillar/paas/docker.sls
	+++ b/pillar/paas/docker.sls
	@@ -1,115 +1,116 @@
	# -------------------------------------------------------------
	# 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: {}
	cachet:
	app_port: 39080
	host: status.nasqueron.org
	mysql_link: acquisitariat
	etherpad:
	app_port: 34080
	+ host: pad.nasqueron.org
	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:
	app_port: 9090
	host: xmpp.nasqueron.org

	# -------------------------------------------------------------
	# Ports listened by XMPP
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	xmpp_ports:
	- 3478
	- 5222 # Client to server
	- 5223 # Client to server (Encrypted (legacy-mode) connections)
	- 5262 # Connections 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 TLS

	# -------------------------------------------------------------
	# 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/roles/paas-docker/nginx/files/vhosts/etherpad.conf b/roles/paas-docker/nginx/files/vhosts/etherpad.conf
	new file mode 100644
	index 0000000..c4b0b13
	--- /dev/null
	+++ b/roles/paas-docker/nginx/files/vhosts/etherpad.conf
	@@ -0,0 +1,48 @@
	+# -------------------------------------------------------------
	+# Configuration for Docker PaaS front-end nginx
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	+# Author: Sébastien Santoro aka Dereckson
	+# Created: 2018-09-08
	+# Source file: roles/paas-docker/nginx/files/vhosts/etherpad.conf
	+# -------------------------------------------------------------
	+#
	+# <auto-generated>
	+# This file is managed by our rOPS SaltStack repository.
	+#
	+# Changes to this file may cause incorrect behavior
	+# and will be lost if the state is redeployed.
	+# </auto-generated>
	+
	+server {
	+ listen 80;
	+ listen [::]:80;
	+ server_name {{ fqdn }};
	+
	+ include includes/letsencrypt;
	+
	+ return 301 https://$host$request_uri;
	+}
	+
	+server {
	+ server_name {{ fqdn }};
	+
	+ include includes/tls;
	+ ssl_certificate /srv/letsencrypt/etc/live/{{ fqdn }}/fullchain.pem;
	+ ssl_certificate_key /srv/letsencrypt/etc/live/{{ fqdn }}/privkey.pem;
	+
	+ include includes/letsencrypt;
	+
	+ location / {
	+ proxy_pass http://localhost:{{ app_port }};
	+
	+ include includes/proxy_params;
	+ proxy_buffering off;
	+ proxy_http_version 1.1;
	+ proxy_set_header Upgrade $http_upgrade;
	+ proxy_set_header Connection $connection_upgrade;
	+ }
	+
	+ root /var/wwwroot-502/$server_name;
	+ error_page 502 /502.html;
	+ location /502.html {}
	+}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Nov 16, 13:07 (1 d, 12 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 3170398
Default Alt Text: (5 KB)

No OneTemporary
Actions

View Options

File Metadata

Event Timeline

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions