diff --git a/_tests/Makefile b/_tests/Makefile index b15e9f0..21fa162 100644 --- a/_tests/Makefile +++ b/_tests/Makefile @@ -1,3 +1,3 @@ test: python -m unittest discover modules - + python -m unittest discover pillar diff --git a/_tests/pillar/__init__.py b/_tests/pillar/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/_tests/pillar/paas/__init__.py b/_tests/pillar/paas/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/_tests/pillar/paas/test_docker.py b/_tests/pillar/paas/test_docker.py new file mode 100644 index 0000000..1300edd --- /dev/null +++ b/_tests/pillar/paas/test_docker.py @@ -0,0 +1,25 @@ +import unittest +import yaml + + +PILLAR_FILE = '../pillar/paas/docker.sls' + + +class Testinstance(unittest.TestCase): + + def setUp(self): + with open(PILLAR_FILE, 'r') as fd: + self.pillar = yaml.load(fd) + + # nginx needs a host/app_port pair to spawn a configuration + def test_host_is_paired_with_app_port_option(self): + for node, services in self.pillar['docker_containers'].items(): + for service, containers in services.items(): + for instance, container in containers.items(): + if 'host' not in container: + continue + + entry = ':'.join(['docker_containers', node, + service, instance]) + self.assertIn('app_port', container, + entry + ": app_port missing") diff --git a/pillar/paas/docker.sls b/pillar/paas/docker.sls index ea5f366..fc565fe 100644 --- a/pillar/paas/docker.sls +++ b/pillar/paas/docker.sls @@ -1,407 +1,407 @@ # ------------------------------------------------------------- # 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 - &intra_equatower 10.0.1.1 # ------------------------------------------------------------- # 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 - nasqueron/rabbitmq # Infrastructure and development services - dereckson/cachet - nasqueron/notifications equatower: # Core services - library/postgres - library/redis:3.2-alpine - library/registry - nasqueron/mysql # Nasqueron services - nasqueron/auth-grove # Nasqueron API microservices - nasqueron/docker-registry-api # Infrastructure and development services - nasqueron/aphlict - nasqueron/etherpad:production - nasqueron/phabricator # Continuous deployment jobs - jenkins/jenkins - nasqueron/jenkins-slave-node - nasqueron/jenkins-slave-php - nasqueron/jenkins-slave-rust - nasqueron/tommy # Sentry - library/sentry - tianon/exim4 # ------------------------------------------------------------- # Networks # # Containers can be grouped by network, instead to use links. # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - docker_networks: dwellers: bugzilla: subnet: 172.21.3.0/24 equatower: cd: subnet: 172.18.1.0/24 ci: subnet: 172.18.2.0/24 # ------------------------------------------------------------- # Docker engine configuration # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - docker_daemon: equatower: storage-driver: devicemapper storage-opts: - "dm.thinpooldev=/dev/mapper/wharf-thinpool" - "dm.use_deferred_removal=true" - "dm.use_deferred_deletion=true" docker_devicemapper: equatower: 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/.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 # # 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 # # Equatower is the current production engine # equatower: # # Core services # mysql: acquisitariat: {} phpbb_db: {} postgresql: sentry_db: credential: nasqueron.sentry.postgresql redis: sentry_redis: {} registry: registry: app_port: 5000 ip: *intra_equatower # # 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_slave: # Slaves for CD apsile: &php_for_cd image: php realm: cd elapsi: *php_for_cd rust_brown: image: rust realm: cd yarabokin: image: node realm: cd zateki: &php_for_ci image: php realm: ci zenerre: *php_for_ci 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 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: phabricator-files-for-devcentral-nasqueron.spacetechnology.net 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: phabricator-files-for-river-sector.nasqueron.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.be aliases: - phabricator.wolfplex.org static_host: phabricator-files-for-wolfplex.nasqueron.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: phabricator-files-for-zed.nasqueron.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 # 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 # Sentry # The Sentry instance uses a Redis and a PostgreSQL instance, # declared above. exim: sentry_smtp: - host: mx.sentry.nasqueron.org + 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 # ------------------------------------------------------------- # 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/exim.sls b/roles/paas-docker/containers/exim.sls index a2d8605..9cb7490 100644 --- a/roles/paas-docker/containers/exim.sls +++ b/roles/paas-docker/containers/exim.sls @@ -1,68 +1,68 @@ # ------------------------------------------------------------- # Salt — Provision Docker engine # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Project: Nasqueron # Created: 2018-11-10 # 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['exim'].items() %} {% set image = salt['paas_docker.get_image']("tianon/exim4", container) %} # ------------------------------------------------------------- # Data directory # # Only required if you provide some hostname to the SMTP server # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {% if 'host' in container %} /srv/exim/{{ instance }}: file.directory: - user: 999 - group: 999 - makedirs: True /srv/exim/{{ instance }}/mailname: file.managed: - - contents: {{ container['host'] }} + - contents: {{ container['mailname'] }} {% if has_selinux %} selinux_context_{{ instance }}_exim_data: selinux.fcontext_policy_present: - name: /srv/exim/{{ instance }} - sel_type: container_file_t selinux_context_{{ instance }}_exim_data_applied: selinux.fcontext_policy_applied: - name: /srv/exim/{{ instance }} {% endif %} {% endif %} # ------------------------------------------------------------- # Container # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ instance }}: docker_container.running: - detach: True - interactive: True - image: {{ image }} {% if 'host' in container %} - binds: /srv/exim/{{ instance }}/mailname:/etc/mailname:ro - - hostname: container['host'] + - hostname: container['mailname'] {% endif %} {% if 'network' in container %} - networks: - {{ container['network'] }} {% endif %} {% endfor %}