No OneTemporary
Actions

Size

21 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/pillar/credentials/vault.sls b/pillar/credentials/vault.sls
	index 9263895..f2f58e7 100644
	--- a/pillar/credentials/vault.sls
	+++ b/pillar/credentials/vault.sls
	@@ -1,153 +1,163 @@
	# -------------------------------------------------------------
	# Salt configuration for Nasqueron servers
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	# Project: Nasqueron
	# License: Trivial work, not eligible to copyright
	# -------------------------------------------------------------

	# -------------------------------------------------------------
	# Vault configuration
	#
	# :: vault_policies_path: path on vault server where to store policies
	#
	# :: vault_policies_source: path to fetch policies from
	# if starting by salt://, from salt files server
	#
	# :: vault_mount_paths: translates secrets paths in policies paths
	#
	# Generally, Vault paths are the same for policies and data access.
	#
	# For kv secrets engine, version 2, writing and reading versions
	# of a kv value are prefixed with the data/ path.
	#
	# credentials.build_policies_by_node will use this dictionary
	# to be able to rewrite secrets paths in data paths.
	#
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	vault_policies_path: /srv/policies/vault
	vault_policies_source: salt://roles/vault/policies/files

	vault_mount_paths:
	ops/secrets: ops/data/secrets
	ops/privacy: ops/data/privacy

	# -------------------------------------------------------------
	# Vault policies to deploy as-is, ie without templating.
	#
	# Entries of vault_policies must match a .hcl file in
	# roles/vault/policies/files folder.
	#
	# If you need a template, create a new pillar entry instead
	# and add the parsing logic either:
	# - directly to roles/vault/policies/
	#
	# - through _modules/credentials.py for policies to apply
	# to Salt nodes, like e.g. vault_secrets_by_role
	#
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	vault_policies:
	- salt-primary
	- viperserv

	# -------------------------------------------------------------
	# Vault policies for Salt
	#
	# Declare the extra policies each nodes need.
	#
	# In adition of those extra policies, the vault_secrets_by_role
	# will be parsed for the keys.
	#
	# IMPORTANT: as grains['roles'] can be modified by the node,
	# roles are extracted directly from the pillar.
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	vault_extra_policies_by_role:
	salt-primary:
	- salt-primary

	# -------------------------------------------------------------
	# Vault secrets by role
	#
	# Paths of the keys the specified role needs access to.
	#
	# Avoid * notation as this namespace is shared between Vault
	# and the applications. As such, only secrets the Salt nodes
	# needs in a state they need to deploy should be listed here.
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	vault_secrets_by_role:

	opensearch:
	- ops/secrets/nasqueron.opensearch.infra-logs.internal_users.admin
	- ops/secrets/nasqueron.opensearch.infra-logs.internal_users.dashboards

	paas-docker-prod:

	#
	# Personal data or personally identifiable information (PII)
	# related to Nasqueron Operations SIG members.
	#

	- ops/privacy/ops-cidr

	#
	# Credentials used by Nasqueron services
	# Format: ops/secrets/nasqueron.<service>.<type>
	#

	- ops/secrets/nasqueron.acquisitariat.mysql

	- ops/secrets/nasqueron.auth-grove.mysql

	- ops/secrets/nasqueron.cachet.app_key
	- ops/secrets/nasqueron.cachet.mysql

	- ops/secrets/nasqueron.etherpad.api

	- ops/secrets/nasqueron.notifications.broker
	- ops/secrets/nasqueron.notifications.mailgun
	- ops/secrets/nasqueron.notifications.sentry

	- ops/secrets/nasqueron.pixelfed.app_key
	- ops/secrets/nasqueron.pixelfed.mailgun
	- ops/secrets/nasqueron.pixelfed.mysql

	- ops/secrets/nasqueron.sentry.app_key
	- ops/secrets/nasqueron.sentry.postgresql

	#
	# Credentials used by Nasqueron members private services
	# Format: <username>.<service>.<type>
	#

	- ops/secrets/dereckson.phabricator.mysql

	#
	# Credentials used by projects hosted by Nasqueron
	# Format: <project name>.<service>.<type>
	#

	- - ops/secrets/espacewin.bugzilla.mysql
	+ - ops/secrets/espacewin.phpbb.mysql_root

	- ops/secrets/wolfplex.phabricator.mailgun
	- ops/secrets/wolfplex.phabricator.mysql

	- ops/secrets/zed.phabricator.mysql
	- ops/secrets/zed.phabricator.sendgrid

	+ paas-docker-dev:
	+
	+ #
	+ # Credentials used by projects hosted by Nasqueron
	+ # Format: <project name>.<service>.<type>
	+ #
	+
	+ - ops/secrets/espacewin.bugzilla.mysql
	+ - ops/secrets/espacewin.bugzilla.mysql_root
	+
	viperserv:
	- ops/secrets/nasqueron.viperserv.vault

	# -------------------------------------------------------------
	# Vault secrets by dbserver cluster
	#
	# Paths of the keys the specified role needs access to.
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	vault_secrets_by_dbserver_cluster:

	# Main PostgreSQL cluster
	A:
	- ops/secrets/dbserver/cluster-A/users/*
	diff --git a/pillar/paas/docker.sls b/pillar/paas/docker.sls
	index ef77e47..5a65366 100644
	--- a/pillar/paas/docker.sls
	+++ b/pillar/paas/docker.sls
	@@ -1,571 +1,577 @@
	# -------------------------------------------------------------
	# 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

	# -------------------------------------------------------------
	# 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:
	# 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:
	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"

	dwellers:
	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
	#
	docker-001:

	#
	# Core services
	#

	mysql:
	- acquisitariat: {}
	- phpbb_db: {}
	+ 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

	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

	#
	# Let's Encrypt
	#

	acme_dns:
	acme:
	ip: *ipv4_docker001
	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

	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

	etherpad:
	pad:
	app_port: 34080
	host: pad.nasqueron.org
	aliases:
	- pad.wolfplex.org
	- pad.wolfplex.be
	credential: nasqueron.etherpad.api
	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
	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/roles/paas-docker/containers/mysql.sls b/roles/paas-docker/containers/mysql.sls
	index b6cc933..15ae9d9 100644
	--- a/roles/paas-docker/containers/mysql.sls
	+++ b/roles/paas-docker/containers/mysql.sls
	@@ -1,54 +1,54 @@
	# -------------------------------------------------------------
	# Salt — Provision Docker engine
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	# Project: Nasqueron
	# Created: 2018-03-27
	# License: Trivial work, not eligible to copyright
	# -------------------------------------------------------------

	{% set has_selinux = salt['grains.get']('selinux:enabled', False) %}
	{% set containers = pillar['docker_containers'][grains['id']] %}

	{% for instance, container in containers['mysql'].items() %}
	{% set image = salt['paas_docker.get_image']("nasqueron/mysql", container) %}

	# -------------------------------------------------------------
	# Home directory
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	/srv/{{ instance }}/mysql:
	file.directory:
	- user: 999
	- group: 999
	- makedirs: True

	{% if has_selinux %}
	selinux_context_{{ instance }}_mysql_data:
	selinux.fcontext_policy_present:
	- name: /srv/{{ instance }}/mysql
	- sel_type: container_file_t

	selinux_context_{{ instance }}_mysql_data_applied:
	selinux.fcontext_policy_applied:
	- name: /srv/{{ instance }}/mysql
	{% endif %}

	# -------------------------------------------------------------
	# Container
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{{ instance }}:
	docker_container.running:
	- detach: True
	- interactive: True
	- image: {{ image }}
	- binds: /srv/{{ instance }}/mysql:/var/lib/mysql
	- environment:
	- MYSQL_ROOT_PASSWORD: {{ salt['zr.generate_random'](31) }}
	+ MYSQL_ROOT_PASSWORD: {{ salt['credentials.get_password'](container['credentials']['root']) }}
	{% if 'network' in container %}
	- networks:
	- {{ container['network'] }}
	{% endif %}
	- cap_add:
	- SYS_NICE # T1672
	{% endfor %}

File Metadata

Mime Type: text/x-diff
Expires: Mon, Nov 25, 07:04 (1 d, 14 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 2257950
Default Alt Text: (21 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions