No OneTemporary
Actions

Size

8 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/pillar/credentials/zr.sls b/pillar/credentials/zr.sls
	index 6fb9c16..781ba71 100644
	--- a/pillar/credentials/zr.sls
	+++ b/pillar/credentials/zr.sls
	@@ -1,24 +1,25 @@
	# -------------------------------------------------------------
	# Salt configuration for Nasqueron servers
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	# Project: Nasqueron
	# Created: 2018-09-12
	# License: Trivial work, not eligible to copyright
	# -------------------------------------------------------------

	zr_credentials:

	#
	# Credentials used by Nasqueron services
	#

	nasqueron:

	# status.nasqueron.org
	cachet:
	mysql: 47
	+ app_key: 126

	# pad.nasqueron.org
	etherpad:
	# This API key is used by Wolfplex API to access to the pad lists
	api: 125
	diff --git a/pillar/paas/docker.sls b/pillar/paas/docker.sls
	index da37f6f..bb1028f 100644
	--- a/pillar/paas/docker.sls
	+++ b/pillar/paas/docker.sls
	@@ -1,207 +1,208 @@
	# -------------------------------------------------------------
	# Salt — Provision Docker engine
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	# Project: Nasqueron
	# Created: 2018-03-10
	# License: Trivial work, not eligible to copyright
	# -------------------------------------------------------------

	docker_aliases:
	- &ipv4_equatower 51.255.124.10

	# -------------------------------------------------------------
	# Images
	#
	# You can append a :tag (by default, latest is used).
	#
	# It's not possible to specify Docker library images only by final name.
	# 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:production
	- nasqueron/phabricator
	# Continuous deployment jobs
	- jenkinsci/jenkins
	- nasqueron/jenkins-slave-php
	- nasqueron/jenkins-slave-rust
	# phpBB SaaS
	- nasqueron/mysql

	# -------------------------------------------------------------
	# Networks
	#
	# Containers can be grouped by network, instead to use links.
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	docker_networks:
	equatower:
	cd:
	subnet: 172.18.1.0/24

	# -------------------------------------------------------------
	# Containers
	#
	# The docker_containers entry allow to declare
	# containers by image by servers
	#
	# The hierarchy is so as following.
	#
	# docker_containers:
	# server with the Docker engine:
	# service codename:
	# instance name:
	# container properties
	#
	# The service codename must match a state file in
	# the roles/paas-docker/containers/ directory.
	#
	# The container will be run with the specified instance name.
	#
	# nginx
	#
	# The container properties can also describe the information
	# needed to configure nginx with the host and app_port key.
	#
	# In such case, a matching vhost file should be declared as
	# roles/paas-docker/nginx/files/vhosts/<service codename>.sls
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	docker_containers:

	#
	# Equatower is the current production engine
	#
	equatower:

	#
	# Core services
	#

	mysql:
	acquisitariat: {}
	phpbb_db: {}

	#
	# CD
	#

	jenkins:
	jenkins_cd:
	realm: cd
	host: cd.nasqueron.org
	app_port: 38080
	jnlp_port: 50000

	jenkins_slave:
	# Slaves for CD
	apsile: &php_for_cd
	image: php
	realm: cd

	elapsi: *php_for_cd

	rust_brown:
	image: rust
	realm: cd

	# Infrastructure and development services

	phabricator:
	devcentral:
	app_port: 31080
	host: devcentral.nasqueron.org
	aliases:
	- phabricator.nasqueron.org
	blogs:
	servers:
	host: servers.nasqueron.org
	aliases:
	- server.nasqueron.org
	- serveur.nasqueron.org
	- serveurs.nasqueron.org
	static_host: phabricator-files-for-devcentral-nasqueron.spacetechnology.net

	aphlict:
	aphlict:
	ports:
	client: 22280
	admin: 22281

	cachet:
	cachet:
	app_port: 39080
	host: status.nasqueron.org
	credential: nasqueron.cachet.mysql
	+ app_key: nasqueron.cachet.app_key
	mysql_link: acquisitariat

	etherpad:
	pad:
	app_port: 34080
	host: pad.nasqueron.org
	aliases:
	- pad.wolfplex.org
	- pad.wolfplex.be
	credential: nasqueron.etherpad.api
	mysql_link: acquisitariat

	# phpBB SaaS
	# The SaaS uses a MySQL instance, declared in the MySQL section.

	# Openfire
	openfire:
	openfire:
	ip: *ipv4_equatower
	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/containers/cachet.sls b/roles/paas-docker/containers/cachet.sls
	index e31d900..7439820 100644
	--- a/roles/paas-docker/containers/cachet.sls
	+++ b/roles/paas-docker/containers/cachet.sls
	@@ -1,37 +1,44 @@
	# -------------------------------------------------------------
	# Salt — Provision Docker engine
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	# Project: Nasqueron
	# Created: 2016-12-15
	# License: Trivial work, not eligible to copyright
	# -------------------------------------------------------------

	{% set containers = pillar['docker_containers'][grains['id']] %}

	{% for instance, container in containers['cachet'].items() %}

	# -------------------------------------------------------------
	# Container
	#
	# Image: dereckson/cachet
	# Description: PHP application to offer server status
	# information
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{{ instance }}:
	docker_container.running:
	- detach: True
	- interactive: True
	- - image: dereckson/cachet
	+ - image: cachethq/docker:latest
	- links: {{ container['mysql_link'] }}:mysql
	- environment:
	+ - DB_DRIVER: mysql
	- DB_HOST: mysql
	+ - DB_PORT: 3306
	- DB_DATABASE: cachet
	- DB_USERNAME: {{ salt['zr.get_username'](container['credential']) }}
	- DB_PASSWORD: {{ salt['zr.get_password'](container['credential']) }}
	+ - DB_PREFIX: ""
	+
	+ - APP_KEY: {{ salt['zr.get_token'](container['app_key']) }}
	+ - APP_LOG: errorlog
	+ - APP_DEBUG: "false"
	- ports:
	- - 80
	+ - 8000
	- port_bindings:
	- - {{ container['app_port'] }}:80
	+ - {{ container['app_port'] }}:8000

	{% endfor %}

File Metadata

Mime Type: text/x-diff
Expires: Mon, Nov 25, 18:38 (11 h, 50 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 2257877
Default Alt Text: (8 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions