No OneTemporary
Actions

Size

27 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/pillar/nodes/nodes.sls b/pillar/nodes/nodes.sls
	index f488da1..324a997 100644
	--- a/pillar/nodes/nodes.sls
	+++ b/pillar/nodes/nodes.sls
	@@ -1,249 +1,277 @@
	# -------------------------------------------------------------
	# Salt — Nodes
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	# Project: Nasqueron
	# Created: 2017-10-20
	# License: Trivial work, not eligible to copyright
	# -------------------------------------------------------------

	nodes_aliases:
	netmasks:
	intranought: &intranought_netmask 255.255.255.240

	nodes:

	##
	## Forest: Nasqueron
	## Semantic field: https://devcentral.nasqueron.org/P27
	##

	cloudhugger:
	forest: nasqueron-infra
	hostname: cloudhugger.nasqueron.org
	roles:
	- opensearch
	network:
	ipv6_native: True
	ipv6_tunnel: False

	canonical_public_ipv4: 188.165.200.229

	interfaces:
	eno1:
	device: eno1
	ipv4:
	address: 188.165.200.229
	gateway: 188.165.200.254
	ipv6:
	address: fe80::ec4:7aff:fe6a:36e8
	prefix: 64
	gateway: fe80::ee30:91ff:fee0:df80

	complector:
	forest: nasqueron-infra
	hostname: complector.nasqueron.org
	roles:
	- vault
	- salt-primary
	zfs:
	pool: zroot
	network:
	ipv6_tunnel: False

	interfaces:
	intranought:
	device: vmx0
	ipv4:
	address: 172.27.27.7
	netmask: *intranought_netmask
	gateway: 172.27.27.1

	db-A-001:
	forest: nasqueron-infra
	hostname: db-A-001.nasqueron.drake
	roles:
	- dbserver-pgsql
	zfs:
	pool: arcology
	dbserver:
	cluster: A
	network:
	ipv6_tunnel: False

	interfaces:
	intranought:
	device: vmx0
	ipv4:
	address: 172.27.27.8
	netmask: *intranought_netmask
	gateway: 172.27.27.1

	dwellers:
	forest: nasqueron-dev-docker
	hostname: dwellers.nasqueron.org
	roles:
	- paas-lxc
	- paas-docker
	- paas-docker-dev
	- mastodon
	flags:
	install_docker_devel_tools: True
	network:
	ipv6_tunnel: True

	canonical_public_ipv4: 51.255.124.11

	interfaces:
	public:
	device: ens192
	uuid: 6e05ebea-f2fd-4ca1-a21f-78a778664d8c
	ipv4:
	address: 51.255.124.11
	netmask: *intranought_netmask
	gateway: 51.210.99.254

	intranought:
	device: ens224
	uuid: 8e8ca793-b2eb-46d8-9266-125aba6d06c4
	ipv4:
	address: 172.27.27.4
	netmask: *intranought_netmask
	gateway: 172.27.27.1

	docker-001:
	forest: nasqueron-infra
	hostname: docker-001.nasqueron.org
	roles:
	- paas-docker
	- paas-docker-prod
	network:
	ipv6_tunnel: False

	canonical_public_ipv4: 51.255.124.9

	interfaces:
	public:
	device: ens192
	uuid: ef7370c5-5060-4d89-82bb-dbeabf4a35f6
	ipv4:
	address: 51.255.124.9
	netmask: *intranought_netmask
	gateway: 51.210.99.254

	intranought:
	device: ens224
	uuid: 3fd0b9f8-ecc3-400d-bc61-3ba21d0b6337
	ipv4:
	address: 172.27.27.6
	netmask: *intranought_netmask
	gateway: 172.27.27.1

	+ docker-002:
	+ forest: nasqueron-infra
	+ hostname: docker-002.nasqueron.org
	+ roles:
	+ - paas-docker
	+ - paas-docker-prod
	+ network:
	+ ipv6_tunnel: True
	+
	+ canonical_public_ipv4: 51.255.124.9
	+
	+ interfaces:
	+ public:
	+ device: ens192
	+ uuid: d55e0fec-f90b-3014-a458-9067ff8f2520
	+ ipv4:
	+ address: 51.255.124.10
	+ netmask: *intranought_netmask
	+ gateway: 51.210.99.254
	+
	+ intranought:
	+ device: ens224
	+ uuid: 57c04bcc-929b-3177-a2e3-88f84f210721
	+ ipv4:
	+ address: 172.27.27.5
	+ netmask: *intranought_netmask
	+ gateway: 172.27.27.1
	+
	router-001:
	forest: nasqueron-infra
	hostname: router-001.nasqueron.org
	roles:
	- router
	network:
	ipv6_tunnel: False

	canonical_public_ipv4: 51.255.124.8

	interfaces:
	public:
	device: vmx0
	ipv4:
	address: 51.255.124.8
	netmask: *intranought_netmask
	gateway: 51.210.99.254
	flags:
	- ipv4_ovh_failover

	intranought:
	device: vmx1
	ipv4:
	address: 172.27.27.1
	netmask: *intranought_netmask

	ysul:
	forest: nasqueron-dev
	hostname: ysul.nasqueron.org
	roles:
	- devserver
	- dbserver-mysql
	- viperserv
	- webserver-legacy
	zfs:
	pool: arcology
	network:
	ipv6_tunnel: True
	ipv6_gateway: 2001:470:1f12:9e1::1

	canonical_public_ipv4: 212.83.187.132

	interfaces:
	igb0:
	device: igb0
	ipv4:
	address: 163.172.49.16
	netmask: 255.255.255.0
	gateway: 163.172.49.1
	aliases:
	- 212.83.187.132

	windriver:
	forest: nasqueron-dev
	hostname: windriver.nasqueron.org
	roles:
	- devserver
	- dbserver-mysql
	- webserver-legacy
	zfs:
	pool: arcology
	network:
	ipv6_native: True
	ipv6_tunnel: False

	canonical_public_ipv4: 51.159.18.59

	interfaces:
	igb0:
	device: igb0
	ipv4:
	address: 51.159.18.59
	netmask: 255.255.255.0
	gateway: 51.159.18.1
	ipv6:
	address: 2001:0bc8:6005:0005:aa1e:84ff:fef3:5d9c
	gateway: fe80::a293:51ff:feb7:5073
	prefix: 128

	##
	## Forest: Eglide
	## Semantic field: ? (P27 used for "Eglide" too)
	##
	## This forest is intended to separate credentials
	## between Eglide and Nasqueron servers.
	##

	eglide:
	forest: eglide
	hostname: eglide.org
	roles:
	- shellserver
	network:
	ipv6_tunnel: True

	canonical_public_ipv4: 51.159.150.221

	interfaces:
	ens2:
	device: ens2
	ipv4:
	address: 51.159.150.221
	gateway: ""
	flags:
	# This interface is configured by cloud-init
	- skip_interface_configuration

	fixes:
	rsyslog_xconsole: True
	diff --git a/pillar/paas/docker.sls b/pillar/paas/docker.sls
	index f41fee6..4df27b7 100644
	--- a/pillar/paas/docker.sls
	+++ b/pillar/paas/docker.sls
	@@ -1,582 +1,585 @@
	# -------------------------------------------------------------
	# Salt — Provision Docker engine
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	# Project: Nasqueron
	# Created: 2018-03-10
	# License: Trivial work, not eligible to copyright
	# -------------------------------------------------------------

	docker_aliases:
	- - &ipv4_docker001 51.255.124.9
	- - &ipv4_docker001_restricted 51.255.124.9
	+ - &ipv4_docker002 51.255.124.9
	+ - &ipv4_docker002_restricted 172.27.27.5

	# -------------------------------------------------------------
	# 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/mysql:5.7

	- docker-001:
	+ docker-002:
	# Core services
	- library/postgres
	- library/redis:3.2-alpine
	- library/registry
	- nasqueron/mysql
	- nasqueron/rabbitmq

	# ACME DNS server
	- joohoi/acme-dns

	# Nasqueron services
	- nasqueron/auth-grove

	# Nasqueron API microservices
	- nasqueron/docker-registry-api
	- nasqueron/api-datasources

	# Infrastructure and development services
	- nasqueron/aphlict
	- nasqueron/cachet
	- nasqueron/etherpad:production
	- nasqueron/notifications
	- nasqueron/phabricator
	- ghcr.io/hound-search/hound

	# Continuous deployment jobs
	- jenkins/jenkins
	- nasqueron/jenkins-agent-node
	- nasqueron/jenkins-agent-php
	- nasqueron/jenkins-agent-php:7.4.23
	- nasqueron/jenkins-agent-rust
	- nasqueron/tommy

	# Pixelfed
	- nasqueron/pixelfed

	# Sentry
	- library/sentry
	- tianon/exim4

	# Hauk
	- bilde2910/hauk

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

	docker_networks:
	dwellers:
	bugzilla:
	subnet: 172.21.3.0/24
	jenkinsTest:
	subnet: 172.21.5.0/24
	- docker-001:
	+ docker-002:
	cd:
	subnet: 172.18.1.0/24
	ci:
	subnet: 172.18.2.0/24

	# -------------------------------------------------------------
	# Docker engine configuration
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	docker_daemon:
	- docker-001:
	- storage-driver: devicemapper
	- storage-opts:
	- - "dm.thinpooldev=/dev/mapper/wharf-thinpool"
	- - "dm.use_deferred_removal=true"
	- - "dm.use_deferred_deletion=true"
	-
	+ docker-002:
	+ data-root: /srv/docker
	dwellers:
	data-root: /srv/docker
	group: nasqueron-dev-docker

	-docker_devicemapper:
	- docker-001:
	- thinpool: wharf-thinpool
	-
	# -------------------------------------------------------------
	# 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:

	#
	# Dwellers is the engine for Mastodon and CI intelligent bus services
	#
	dwellers:

	#
	# Core services
	#

	mysql:
	bugzilla_db:
	network: bugzilla
	version: 5.7
	credentials:
	root: espacewin.bugzilla.mysql_root

	#
	# Bugzilla
	#

	bugzilla:
	ew_bugzilla:
	host: bugzilla.espace-win.org
	app_port: 33080
	network: bugzilla
	mysql:
	host: bugzilla_db
	db: EspaceWin_Bugs
	credential: espacewin.bugzilla.mysql

	#
	# Jenkins
	#

	jenkins:
	jenkins_test:
	realm: test
	host: jenkins.test.nasqueron.org
	app_port: 47080
	jnlp_port: 52000

	jenkins_agent:
	zosso:
	image_flavour: php
	realm: test

	#
	# Mastodon
	#

	# Mastodon is currently deployed manually through docker-compose
	# and not yet integrated to the platform. This declaration is
	# currently only used for extra utilities deployment.

	mastodon_sidekiq:
	mastodon_sidekiq_1:
	realm: nasqueron

	#
	- # Current production engine
	+ # Production engine
	#
	- docker-001:
	+ docker-002:

	#
	# Core services
	#

	mysql:
	acquisitariat:
	credentials:
	root: nasqueron.acquisitariat.mysql
	phpbb_db:
	credentials:
	root: espacewin.phpbb.mysql_root

	postgresql:
	sentry_db:
	credential: nasqueron.sentry.postgresql

	- rabbitmq:
	- white-rabbit:
	- ip: *ipv4_docker001_restricted
	- host: white-rabbit.nasqueron.org
	- app_port: 15672
	- credentials:
	- erlang_cookie: nasqueron/rabbitmq/white-rabbit/erlang-cookie
	- root: nasqueron/rabbitmq/white-rabbit/root
	-
	redis:
	sentry_redis: {}
	pixelfed_redis: {}

	registry:
	registry:
	host: registry.nasqueron.org
	app_port: 5000
	allowed_ips:
	# Localhost
	- 127.0.0.1

	# Dwellers
	- - 51.255.124.11
	- - 2001:470:1f13:30b:ca5:cade:fab:1e
	-
	- # docker-001
	- - 51.255.124.9
	- - 2001:470:1f13:365::50f7:ba11
	+ - 172.27.27.4

	- #
	- # Let's Encrypt
	- #
	+ # docker-002
	+ - 172.27.27.5

	- acme_dns:
	- acme:
	- ip: *ipv4_docker001
	- app_port: 41080
	- host: acme.nasqueron.org
	- nsadmin: ops.nasqueron.org
	+ rabbitmq:
	+ white-rabbit:
	+ ip: *ipv4_docker002_restricted
	+ host: white-rabbit.nasqueron.org
	+ app_port: 15672
	+ credentials:
	+ erlang_cookie: nasqueron/rabbitmq/white-rabbit/erlang-cookie
	+ root: nasqueron/rabbitmq/white-rabbit/root

	#
	- # CI and CD
	+ # Phabricator
	#

	- jenkins:
	- jenkins_cd:
	- realm: cd
	- host: cd.nasqueron.org
	- app_port: 38080
	- jnlp_port: 50000
	- jenkins_ci:
	- realm: ci
	- host: ci.nasqueron.org
	- app_port: 42080
	- jnlp_port: 55000
	-
	- jenkins_agent:
	- # Agents for CD
	-
	- apsile: &php_for_cd
	- image_flavour: php
	- realm: cd
	-
	- elapsi: *php_for_cd
	-
	- rust_brown:
	- image_flavour: rust
	- realm: cd
	-
	- yarabokin:
	- image_flavour: node
	- realm: cd
	-
	- # Agents for CI
	-
	- zateki: &php_for_ci
	- image_flavour: php
	- realm: ci
	-
	- zenerre:
	- <<: *php_for_ci
	- version: 7.4.23
	-
	- tommy:
	- tommy_ci:
	- app_port: 24080
	- host: builds.nasqueron.org
	- aliases:
	- - build.nasqueron.org
	- jenkins_url: https://ci.nasqueron.org
	- jenkins_multi_branch: True
	-
	- tommy_cd:
	- # No host definition, as this dashboard is mounted on infra.nasqueron.org
	- app_port: 24180
	- jenkins_url: https://cd.nasqueron.org
	-
	- # Infrastructure and development services
	-
	- hound:
	- hound:
	- app_port: 44080
	- host: code.nasqueron.org
	- github_account: nasqueron
	-
	- notifications:
	- notifications:
	- host: notifications.nasqueron.org
	- app_port: 37080
	- broker_link: white-rabbit
	- credentials:
	- broker: nasqueron.notifications.broker
	- mailgun: nasqueron.notifications.mailgun
	- sentry:
	- realm: nasqueron
	- project_id: 2
	- credential: nasqueron.notifications.sentry
	-
	phabricator:
	# Nasqueron instance
	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
	mailer: mailgun
	credentials:
	mysql: zed.phabricator.mysql
	static_host: devcentral.nasqueron-user-content.org
	title: Nasqueron DevCentral
	mysql_link: acquisitariat
	skip_container: True

	# Private instance for Dereckson
	river_sector:
	app_port: 23080
	host: river-sector.dereckson.be
	static_host: river-sector.nasqueron-user-content.org
	mailer: _
	credentials:
	mysql: dereckson.phabricator.mysql
	storage:
	namespace: river_sector
	title: River Sector
	mysql_link: acquisitariat

	# Wolfplex instance
	wolfplex_phab:
	app_port: 35080
	host: phabricator.wolfplex.org
	aliases:
	- phabricator.wolfplex.be
	static_host: wolfplex.phabricator.nasqueron-user-content.org
	mailer: mailgun
	credentials:
	mailgun: wolfplex.phabricator.mailgun
	mysql: wolfplex.phabricator.mysql
	storage:
	namespace: wolfphab
	title: Wolfplex Phabricator
	mysql_link: acquisitariat

	# Zed instance
	zed_code:
	app_port: 36080
	host: code.zed.dereckson.be
	static_host: zed.phabricator.nasqueron-user-content.org
	mailer: sendgrid
	credentials:
	mysql: zed.phabricator.mysql
	sendgrid: zed.phabricator.sendgrid
	storage:
	namespace: zedphab
	title: Zed
	mysql_link: acquisitariat

	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
	+ #
	+ # Notifications center
	+ #
	+
	+ notifications:
	+ notifications:
	+ host: notifications.nasqueron.org
	+ app_port: 37080
	+ broker_link: white-rabbit
	+ credentials:
	+ broker: nasqueron.notifications.broker
	+ mailgun: nasqueron.notifications.mailgun
	+ sentry:
	+ realm: nasqueron
	+ project_id: 2
	+ credential: nasqueron.notifications.sentry
	+
	+ #
	+ # Community and development services
	+ #

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

	+ # Hauk
	+ hauk:
	+ hauk:
	+ app_port: 43080
	+ host: geo.nasqueron.org
	+ api_entry_point: /hauk
	+
	+ #
	+ # Let's Encrypt
	+ #
	+
	+ acme_dns:
	+ acme:
	+ ip: *ipv4_docker002
	+ app_port: 41080
	+ host: acme.nasqueron.org
	+ nsadmin: ops.nasqueron.org
	+
	+ #
	+ # CI and CD
	+ #
	+
	+ jenkins:
	+ jenkins_cd:
	+ realm: cd
	+ host: cd.nasqueron.org
	+ app_port: 38080
	+ jnlp_port: 50000
	+ jenkins_ci:
	+ realm: ci
	+ host: ci.nasqueron.org
	+ app_port: 42080
	+ jnlp_port: 55000
	+
	+ jenkins_agent:
	+ # Agents for CD
	+
	+ apsile: &php_for_cd
	+ image_flavour: php
	+ realm: cd
	+
	+ elapsi: *php_for_cd
	+
	+ rust_brown:
	+ image_flavour: rust
	+ realm: cd
	+
	+ yarabokin:
	+ image_flavour: node
	+ realm: cd
	+
	+ # Agents for CI
	+
	+ zateki: &php_for_ci
	+ image_flavour: php
	+ realm: ci
	+
	+ zenerre:
	+ <<: *php_for_ci
	+ version: 7.4.23
	+
	+ tommy:
	+ tommy_ci:
	+ app_port: 24080
	+ host: builds.nasqueron.org
	+ aliases:
	+ - build.nasqueron.org
	+ jenkins_url: https://ci.nasqueron.org
	+ jenkins_multi_branch: True
	+
	+ tommy_cd:
	+ # No host definition, as this dashboard is mounted on infra.nasqueron.org
	+ app_port: 24180
	+ jenkins_url: https://cd.nasqueron.org
	+
	+ #
	+ # Infrastructure and development services
	+ #
	+
	+ hound:
	+ hound:
	+ app_port: 44080
	+ host: code.nasqueron.org
	+ github_account: nasqueron
	+
	+ cachet:
	+ cachet:
	+ app_port: 39080
	+ host: status.nasqueron.org
	+ credential: nasqueron.cachet.mysql
	+ app_key: nasqueron.cachet.app_key
	+ mysql_link: acquisitariat
	+
	auth-grove:
	login:
	app_port: 25080
	host: login.nasqueron.org
	credential: nasqueron.auth-grove.mysql
	mysql_link: acquisitariat

	# API microservices

	docker-registry-api:
	api-docker-registry:
	app_port: 20080
	api_entry_point: /docker/registry
	registry_instance: registry

	api-datasources:
	api-datasources:
	app_port: 19080
	api_entry_point: /datasources

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

	# Openfire
	openfire:
	openfire:
	- ip: *ipv4_docker001
	+ ip: *ipv4_docker002
	app_port: 9090
	host: xmpp.nasqueron.org

	# Other subservices for XMPP
	# listening to their own subdomain
	aliases:
	- conference.nasqueron.org

	# Pixelfed
	pixelfed:
	pixelfed:
	app_port: 30080
	host: photos.nasqueron.org
	aliases:
	- photo.nasqueron.org
	links:
	mysql: acquisitariat
	redis: pixelfed_redis
	credentials:
	app_key: nasqueron.pixelfed.app_key
	mailgun: nasqueron.pixelfed.mailgun
	mysql: nasqueron.pixelfed.mysql
	app:
	title: Nasqueron Photos
	max_album_length: 16

	- # Hauk
	- hauk:
	- hauk:
	- app_port: 43080
	- host: geo.nasqueron.org
	- api_entry_point: /hauk
	-
	# Sentry
	# The Sentry instance uses a Redis and a PostgreSQL instance,
	# declared above.
	exim:
	sentry_smtp:
	mailname: mx.sentry.nasqueron.org

	sentry:
	sentry_web_1:
	app_port: 26080
	host: sentry.nasqueron.org

	# As an instance is divided between a web, a cron and a worker
	# containers, we need an identified to share a data volume.
	realm: nasqueron

	sentry_worker:
	sentry_worker_1:
	realm: nasqueron

	sentry_cron:
	sentry_cron:
	realm: nasqueron

	# -------------------------------------------------------------
	# Monitoring
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	docker_containers_monitoring:

	# Go to URL, check it's an HTTP 200 response
	check_http_200:
	acme_dns: /health
	cachet: /api/v1/ping
	hound: /healthz

	# Test a regular URL for services without health check
	api-datasources: /datasources
	etherpad: /stats
	hauk: /
	jenkins: /login
	registry: /

	# Go to URL, check it's an HTTP 200 response code + "ALIVE" as content
	check_http_200_alive:
	auth-grove: /status
	docker-registry-api: /status
	notifications: /status
	tommy: /status

	# Same than check_http_200, but we need to query the proxy
	check_http_200_proxy:
	openfire: /login.jsp
	pixelfed: /api/nodeinfo/2.0.json

	# Same than check_http_200_alive, but we need to query the proxy
	check_http_200_alive_proxy:
	phabricator: /status

	# -------------------------------------------------------------
	# Ports listened by known applications
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	rabbitmq_ports:
	- 4369 # epmd, Erlang peer discovery service used by RabbitMQ and CLI tools
	- 5671 # AMQP with TLS (AMQPS)
	- 5672 # AMQP
	- 15672 # Management UI, HTTP API, rabbitmqadmin (management plugin port)
	- 25672 # Erlang distribution server port - Federation, rabbitmqctl

	# Not implemented ports, as we don't use those protocols:
	#
	# - 1883 # MQTT
	# - 8883 # MQTT with TLS
	# - 15674 # STOMP over a WebSocket connection (rabbitmq_web_stomp plugin port)
	# - 15675 # MQTT over a WebSocket connection (rabbitmq_web_mqtt plugin port)
	# - 15692 # Prometheus metrics (rabbitmq_prometheus plugin port)
	# - 61613 # STOMP
	# - 61614 # STOMP with TLS

	xmpp_ports:
	- 3478
	- 5222 # Client to server
	- 5223 # Client to server (Encrypted (legacy-mode) connections)
	- 5229 # Flash Cross Domain
	- 5262 # Connections managers
	- 5269 # Server to server
	- 5270 # Server to server (Encrypted (legacy-mode) connections)
	- 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
	diff --git a/pillar/top.sls b/pillar/top.sls
	index 98b134c..e2c9745 100644
	--- a/pillar/top.sls
	+++ b/pillar/top.sls
	@@ -1,61 +1,60 @@
	# -------------------------------------------------------------
	# Salt configuration for Nasqueron servers
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	# Project: Nasqueron
	# Created: 2016-04-10
	# License: Trivial work, not eligible to copyright
	# -------------------------------------------------------------

	base:
	'*':
	- core.users
	- core.groups
	- core.network
	- certificates.certificates
	- nodes.nodes
	- nodes.forests
	- hotfixes.roles
	- webserver.sites

	cloudhugger:
	- credentials.zr
	- opensearch.software
	- opensearch.clusters

	complector:
	- credentials.vault

	- docker-001:
	- - credentials.zr
	+ docker-002:
	- notifications.config
	- paas.docker
	- saas.jenkins
	- saas.phpbb
	- saas.sentry

	db-A-001:
	- dbserver.cluster-A

	dwellers:
	- credentials.zr
	- paas.docker
	- saas.jenkins
	- saas.sentry

	eglide:
	- shellserver.quassel

	ysul:
	- devserver.repos
	- credentials.zr
	- saas.mediawiki
	- viperserv.bots
	- viperserv.fantoir
	- webserver.labs
	- webserver.wwwroot51

	windriver:
	- devserver.ports
	- devserver.repos
	- webserver.labs
	- webserver.wwwroot51
	diff --git a/roles/core/motd/files/docker-002 b/roles/core/motd/files/docker-002
	new file mode 100644
	index 0000000..c4a19b4
	--- /dev/null
	+++ b/roles/core/motd/files/docker-002
	@@ -0,0 +1,14 @@
	+
	+ docker-002 ______
	+ \ \
	+ A Nasqueron infra- \ \ IP: {{ ipv4_address }}
	+ structure server. \ \_ GW: {{ ipv4_gateway }}
	+ _\ \
	+ PaaS Docker \ \
	+ \ \_
	+ The containers hosted _\ \
	+ here are in production. \ \
	+ \ \_
	+ /// /// /// /// /// /// _\ \
	+ \ \
	+___________________________________\ \_________mic'03
	diff --git a/roles/core/network/files/ipv6-tunnels/equatower.sh.jinja b/roles/core/network/files/ipv6-tunnels/docker-002.sh.jinja
	similarity index 100%
	rename from roles/core/network/files/ipv6-tunnels/equatower.sh.jinja
	rename to roles/core/network/files/ipv6-tunnels/docker-002.sh.jinja
	diff --git a/top.sls b/top.sls
	index dce701e..ea8ce26 100644
	--- a/top.sls
	+++ b/top.sls
	@@ -1,41 +1,41 @@
	# -------------------------------------------------------------
	# Salt configuration for Nasqueron servers
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	# Project: Nasqueron
	# Created: 2016-04-10
	# License: Trivial work, not eligible to copyright
	# -------------------------------------------------------------

	base:
	'*':
	- roles/core
	- roles/webserver-content
	'local':
	- roles/salt-primary
	'ysul':
	- roles/builder
	- roles/dbserver-mysql
	- roles/devserver
	- roles/viperserv
	- roles/webserver-core
	- roles/webserver-legacy
	- roles/webserver-varnish
	'windriver':
	- roles/builder
	- roles/dbserver-mysql
	- roles/dbserver-pgsql
	- roles/devserver
	- roles/webserver-core
	- roles/webserver-legacy
	'cloudhugger':
	- roles/opensearch
	'db-A-001':
	- roles/dbserver-pgsql
	- 'docker-001':
	+ 'docker-002':
	- roles/paas-docker
	'dwellers':
	- roles/paas-docker/docker
	- roles/paas-lxc/lxc
	'eglide':
	- roles/webserver-core
	- roles/shellserver

File Metadata

Mime Type: text/x-diff
Expires: Sun, Nov 24, 18:14 (1 h, 7 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 2258623
Default Alt Text: (27 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions