Rebase first step

203 files changed, 78 insertions, 29 deletions

diff --git a/.gitmodules b/.gitmodules
index aec303d..74f1c95 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,5 +1,5 @@
 [submodule "docker/static/goStatic"]
-	path = docker/static/goStatic
+	path = app_build/static/goStatic
 	url = https://github.com/PierreZ/goStatic
 [submodule "docker/blog/quentin.dufour.io"]
 	path = docker/blog-quentin/quentin.dufour.io
diff --git a/README.md b/README.md
index 1c0375b..d080367 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ We try to build a generic abstraction stack between our different resources (CPU
   * ansible (physical node conf)
   * nomad (schedule containers)
   * consul (distributed key value store / lock / service discovery)
-  * glusterfs (file storage)
+  * garage/glusterfs (file storage)
   * stolon + postgresql (distributed relational database)
   * docker (container tool)
   * bottin (LDAP server, auth)
@@ -23,6 +23,19 @@ Some services we provide:
 
 As a generic abstraction is provided, deploying new services should be easy.
 
+## I am lost, how this repo works?
+
+To ease the development, we make the choice of a fully integrated environment
+
+  1. `os_build`: where you will build our OS image based on Debian that you will install on your server
+  2. `os_config`: our Ansible recipes to configure and update your freshly installed server
+  3. `app_build`: our Docker files to build immutable images of our applications
+  4. `app_integration`: Our Docker compose files to test locally how our built images interact together
+  5. `app_config`: Files containing application configurations to be deployed on Consul Key Value Store
+  6. `app_deployment`: Files containing application definitions to be deployed on Nomad Scheduler
+  7. `op_guide`: Guides to explain you operations you can do cluster wide (like configuring postgres)
+
+
 ## Start hacking
 
 ### Clone the repository
diff --git a/docker/README.md b/app_build/README.md
index a877cfa..a877cfa 100644
--- a/docker/README.md
+++ b/app_build/README.md
diff --git a/docker/blog-quentin/.dockerenv b/app_build/blog-quentin/.dockerenv
index e69de29..e69de29 100755
--- a/docker/blog-quentin/.dockerenv
+++ b/app_build/blog-quentin/.dockerenv
diff --git a/docker/blog-quentin/Dockerfile b/app_build/blog-quentin/Dockerfile
index 61f5c40..61f5c40 100644
--- a/docker/blog-quentin/Dockerfile
+++ b/app_build/blog-quentin/Dockerfile
diff --git a/docker/blog-quentin/README.md b/app_build/blog-quentin/README.md
index 25ac463..25ac463 100644
--- a/docker/blog-quentin/README.md
+++ b/app_build/blog-quentin/README.md
diff --git a/docker/coturn/Dockerfile b/app_build/coturn/Dockerfile
index 0d23161..0d23161 100644
--- a/docker/coturn/Dockerfile
+++ b/app_build/coturn/Dockerfile
diff --git a/docker/coturn/README.md b/app_build/coturn/README.md
index e882146..e882146 100644
--- a/docker/coturn/README.md
+++ b/app_build/coturn/README.md
diff --git a/app_build/docker-compose.yml b/app_build/docker-compose.yml
new file mode 100644
index 0000000..afe363d
--- /dev/null
+++ b/app_build/docker-compose.yml
@@ -0,0 +1,60 @@
+version: '3.4'
+services:
+
+  # Instant Messaging
+  riot:
+    build:
+      context: ./riotweb
+      args:
+        # https://github.com/vector-im/riot-web/releases
+        VERSION: 1.7.5
+    image: superboum/amd64_riotweb:v15
+
+  synapse:
+    build: 
+      context: ./matrix-synapse
+      args:
+        # https://github.com/matrix-org/synapse/releases
+        VERSION: 1.19.1
+    image: superboum/amd64_synapse:v33
+
+  # Email
+  sogo:
+    build:
+      context: ./sogo
+      args:
+        # fake for now
+        VERSION: 5.0.0
+    image: superboum/amd64_sogo:v7
+
+  # VoIP
+  jitsi-meet:
+    build:
+      context: ./jitsi-meet
+      args:
+        # https://github.com/jitsi/jitsi-meet
+        VERSION: 4966
+    image: superboum/amd64_jitsi_meet:v1
+
+  jitsi-confererence-focus:
+    build:
+      context: ./jitsi-conference-focus
+      args:
+        # https://github.com/jitsi/jicofo
+        VERSION: 4966
+    image: superboum/amd64_jitsi_conference_focus:v3
+
+  jitsi-videobridge:
+    build:
+      context: ./jitsi-videobridge
+      args:
+        # https://github.com/jitsi/jitsi-videobridge
+        VERSION: 4966
+    image: superboum/amd64_jitsi_videobridge:v10
+
+  jitsi-xmpp:
+    build:
+      context: ./jitsi-xmpp
+      args:
+        VERSION: fake-1
+    image: superboum/amd64_jitsi_xmpp:v2
diff --git a/docker/dovecot/.gitignore b/app_build/dovecot/.gitignore
index 71a04e2..71a04e2 100644
--- a/docker/dovecot/.gitignore
+++ b/app_build/dovecot/.gitignore
diff --git a/docker/dovecot/Dockerfile b/app_build/dovecot/Dockerfile
index 9b87627..9b87627 100644
--- a/docker/dovecot/Dockerfile
+++ b/app_build/dovecot/Dockerfile
diff --git a/docker/dovecot/README.md b/app_build/dovecot/README.md
index 8c9f372..8c9f372 100644
--- a/docker/dovecot/README.md
+++ b/app_build/dovecot/README.md
diff --git a/docker/dovecot/entrypoint.sh b/app_build/dovecot/entrypoint.sh
index 2165d8f..2165d8f 100755
--- a/docker/dovecot/entrypoint.sh
+++ b/app_build/dovecot/entrypoint.sh
diff --git a/docker/jitsi/jitsi-conference-focus/Dockerfile b/app_build/jitsi-conference-focus/Dockerfile
index 7b6410a..8999966 100644
--- a/docker/jitsi/jitsi-conference-focus/Dockerfile
+++ b/app_build/jitsi-conference-focus/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:buster AS builder
 
-ENV VERSION=4510
+#ENV VERSION=4510
 RUN apt-get update && \
     apt-get install -y openjdk-11-jdk maven wget unzip && \
     wget https://github.com/jitsi/jicofo/archive/jitsi-meet_${VERSION}.zip -O jicofo.zip && \
diff --git a/docker/jitsi/jitsi-conference-focus/jicofo b/app_build/jitsi-conference-focus/jicofo
index 2bc6e3f..2bc6e3f 100755
--- a/docker/jitsi/jitsi-conference-focus/jicofo
+++ b/app_build/jitsi-conference-focus/jicofo
diff --git a/docker/jitsi/jitsi-front/Dockerfile b/app_build/jitsi-meet/Dockerfile
index d30682c..0d908eb 100644
--- a/docker/jitsi/jitsi-front/Dockerfile
+++ b/app_build/jitsi-meet/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:buster AS builder
 
-ENV VERSION=4048
+#ENV VERSION=4048
 RUN apt-get update && \
     apt-get install -y npm git nodejs make wget unzip && \
     wget https://github.com/jitsi/jitsi-meet/archive/${VERSION}.zip -O jitsi-meet.zip && \
diff --git a/docker/jitsi/jitsi-front/config.js b/app_build/jitsi-meet/config.js
index 18ff319..18ff319 100644
--- a/docker/jitsi/jitsi-front/config.js
+++ b/app_build/jitsi-meet/config.js
diff --git a/docker/jitsi/jitsi-front/entrypoint.sh b/app_build/jitsi-meet/entrypoint.sh
index 1e18bd1..1e18bd1 100755
--- a/docker/jitsi/jitsi-front/entrypoint.sh
+++ b/app_build/jitsi-meet/entrypoint.sh
diff --git a/docker/jitsi/jitsi-videobridge/Dockerfile b/app_build/jitsi-videobridge/Dockerfile
index 16f59dc..c144e34 100644
--- a/docker/jitsi/jitsi-videobridge/Dockerfile
+++ b/app_build/jitsi-videobridge/Dockerfile
@@ -3,7 +3,7 @@ FROM debian:buster AS builder
 RUN apt-get update && \
     apt-get install -y wget unzip maven openjdk-11-jdk 
 
-ENV VERSION=4468
+#ENV VERSION=4468
 RUN wget https://github.com/jitsi/jitsi-videobridge/archive/stable/jitsi-meet_${VERSION}.zip -O jvb.zip && \
     unzip jvb.zip && \
     mv jitsi-videobridge-stable-jitsi-meet_${VERSION} jvb && \
diff --git a/docker/jitsi/jitsi-videobridge/jvb_run b/app_build/jitsi-videobridge/jvb_run
index 3352e8a..3352e8a 100755
--- a/docker/jitsi/jitsi-videobridge/jvb_run
+++ b/app_build/jitsi-videobridge/jvb_run
diff --git a/docker/jitsi/jitsi-xmpp/Dockerfile b/app_build/jitsi-xmpp/Dockerfile
index 3733d49..3733d49 100644
--- a/docker/jitsi/jitsi-xmpp/Dockerfile
+++ b/app_build/jitsi-xmpp/Dockerfile
diff --git a/docker/jitsi/jitsi-xmpp/external_components.cfg.lua b/app_build/jitsi-xmpp/external_components.cfg.lua
index beaaa87..beaaa87 100644
--- a/docker/jitsi/jitsi-xmpp/external_components.cfg.lua
+++ b/app_build/jitsi-xmpp/external_components.cfg.lua
diff --git a/docker/jitsi/jitsi-xmpp/xmpp_conf b/app_build/jitsi-xmpp/xmpp_conf
index 2a9278e..2a9278e 100755
--- a/docker/jitsi/jitsi-xmpp/xmpp_conf
+++ b/app_build/jitsi-xmpp/xmpp_conf
diff --git a/docker/jitsi/jitsi-xmpp/xmpp_gen b/app_build/jitsi-xmpp/xmpp_gen
index 3a2e04a..3a2e04a 100755
--- a/docker/jitsi/jitsi-xmpp/xmpp_gen
+++ b/app_build/jitsi-xmpp/xmpp_gen
diff --git a/docker/jitsi/jitsi-xmpp/xmpp_run b/app_build/jitsi-xmpp/xmpp_run
index 8dfdf86..8dfdf86 100755
--- a/docker/jitsi/jitsi-xmpp/xmpp_run
+++ b/app_build/jitsi-xmpp/xmpp_run
diff --git a/docker/landing/README.md b/app_build/landing/README.md
index 5d2cb2b..5d2cb2b 100644
--- a/docker/landing/README.md
+++ b/app_build/landing/README.md
diff --git a/docker/mariadb/60-disable-dialog.cnf b/app_build/mariadb/60-disable-dialog.cnf
index d41731a..d41731a 100644
--- a/docker/mariadb/60-disable-dialog.cnf
+++ b/app_build/mariadb/60-disable-dialog.cnf
diff --git a/docker/mariadb/60-ldap.cnf b/app_build/mariadb/60-ldap.cnf
index 72ffb9f..72ffb9f 100644
--- a/docker/mariadb/60-ldap.cnf
+++ b/app_build/mariadb/60-ldap.cnf
diff --git a/docker/mariadb/60-remote.cnf b/app_build/mariadb/60-remote.cnf
index f759a49..f759a49 100644
--- a/docker/mariadb/60-remote.cnf
+++ b/app_build/mariadb/60-remote.cnf
diff --git a/docker/mariadb/Dockerfile b/app_build/mariadb/Dockerfile
index 15ef954..15ef954 100644
--- a/docker/mariadb/Dockerfile
+++ b/app_build/mariadb/Dockerfile
diff --git a/docker/mariadb/README.md b/app_build/mariadb/README.md
index 1a3b8aa..1a3b8aa 100644
--- a/docker/mariadb/README.md
+++ b/app_build/mariadb/README.md
diff --git a/docker/mariadb/entrypoint.sh b/app_build/mariadb/entrypoint.sh
index 7ebf049..7ebf049 100755
--- a/docker/mariadb/entrypoint.sh
+++ b/app_build/mariadb/entrypoint.sh
diff --git a/docker/mariadb/nsswitch.conf b/app_build/mariadb/nsswitch.conf
index 853348e..853348e 100644
--- a/docker/mariadb/nsswitch.conf
+++ b/app_build/mariadb/nsswitch.conf
diff --git a/docker/mariadb/pam-mariadb b/app_build/mariadb/pam-mariadb
index e1bb814..e1bb814 100644
--- a/docker/mariadb/pam-mariadb
+++ b/app_build/mariadb/pam-mariadb
diff --git a/docker/matrix-synapse/Dockerfile b/app_build/matrix-synapse/Dockerfile
index b8480d5..b8480d5 100644
--- a/docker/matrix-synapse/Dockerfile
+++ b/app_build/matrix-synapse/Dockerfile
diff --git a/docker/matrix-synapse/entrypoint.sh b/app_build/matrix-synapse/entrypoint.sh
index b93a702..b93a702 100755
--- a/docker/matrix-synapse/entrypoint.sh
+++ b/app_build/matrix-synapse/entrypoint.sh
diff --git a/docker/nextcloud/Dockerfile b/app_build/nextcloud/Dockerfile
index 9f817f6..9f817f6 100644
--- a/docker/nextcloud/Dockerfile
+++ b/app_build/nextcloud/Dockerfile
diff --git a/docker/nextcloud/container-setup.sh b/app_build/nextcloud/container-setup.sh
index 8330291..8330291 100755
--- a/docker/nextcloud/container-setup.sh
+++ b/app_build/nextcloud/container-setup.sh
diff --git a/docker/nextcloud/entrypoint.sh b/app_build/nextcloud/entrypoint.sh
index 72b4f94..72b4f94 100755
--- a/docker/nextcloud/entrypoint.sh
+++ b/app_build/nextcloud/entrypoint.sh
diff --git a/docker/opendkim/Dockerfile b/app_build/opendkim/Dockerfile
index 70a39e4..70a39e4 100644
--- a/docker/opendkim/Dockerfile
+++ b/app_build/opendkim/Dockerfile
diff --git a/docker/opendkim/README.md b/app_build/opendkim/README.md
index e146125..e146125 100644
--- a/docker/opendkim/README.md
+++ b/app_build/opendkim/README.md
diff --git a/docker/opendkim/opendkim.conf b/app_build/opendkim/opendkim.conf
index 0d6465f..0d6465f 100644
--- a/docker/opendkim/opendkim.conf
+++ b/app_build/opendkim/opendkim.conf
diff --git a/docker/pithos/0.7.5.tar.gz b/app_build/pithos/0.7.5.tar.gz
index 4eb1273..4eb1273 100644
--- a/docker/pithos/0.7.5.tar.gz
+++ b/app_build/pithos/0.7.5.tar.gz
diff --git a/docker/pithos/Dockerfile b/app_build/pithos/Dockerfile
index 70f87d8..70f87d8 100644
--- a/docker/pithos/Dockerfile
+++ b/app_build/pithos/Dockerfile
diff --git a/docker/pithos/README.md b/app_build/pithos/README.md
index 3f0037d..3f0037d 100644
--- a/docker/pithos/README.md
+++ b/app_build/pithos/README.md
diff --git a/docker/pithos/pithos-0.7.5-standalone.jar b/app_build/pithos/pithos-0.7.5-standalone.jar
index 6073e72..6073e72 100644
--- a/docker/pithos/pithos-0.7.5-standalone.jar
+++ b/app_build/pithos/pithos-0.7.5-standalone.jar
diff --git a/docker/postfix/Dockerfile b/app_build/postfix/Dockerfile
index 9e4c067..9e4c067 100644
--- a/docker/postfix/Dockerfile
+++ b/app_build/postfix/Dockerfile
diff --git a/docker/postfix/README.md b/app_build/postfix/README.md
index ac44fc0..ac44fc0 100644
--- a/docker/postfix/README.md
+++ b/app_build/postfix/README.md
diff --git a/docker/postfix/entrypoint.sh b/app_build/postfix/entrypoint.sh
index c7ace3d..c7ace3d 100755
--- a/docker/postfix/entrypoint.sh
+++ b/app_build/postfix/entrypoint.sh
diff --git a/docker/postgres/Dockerfile b/app_build/postgres/Dockerfile
index bb018b8..bb018b8 100644
--- a/docker/postgres/Dockerfile
+++ b/app_build/postgres/Dockerfile
diff --git a/docker/postgres/README.md b/app_build/postgres/README.md
index d2f7a12..d2f7a12 100644
--- a/docker/postgres/README.md
+++ b/app_build/postgres/README.md
diff --git a/docker/postgres/postgresql.conf b/app_build/postgres/postgresql.conf
index 8e0af2b..8e0af2b 100644
--- a/docker/postgres/postgresql.conf
+++ b/app_build/postgres/postgresql.conf
diff --git a/docker/postgres/start.sh b/app_build/postgres/start.sh
index f1d493f..f1d493f 100755
--- a/docker/postgres/start.sh
+++ b/app_build/postgres/start.sh
diff --git a/docker/riotweb/Dockerfile b/app_build/riotweb/Dockerfile
index 862e2e5..862e2e5 100644
--- a/docker/riotweb/Dockerfile
+++ b/app_build/riotweb/Dockerfile
diff --git a/docker/riotweb/config.json b/app_build/riotweb/config.json
index 8ce8e4c..8ce8e4c 100644
--- a/docker/riotweb/config.json
+++ b/app_build/riotweb/config.json
diff --git a/docker/seafile/Dockerfile b/app_build/seafile/Dockerfile
index 88dee4f..88dee4f 100644
--- a/docker/seafile/Dockerfile
+++ b/app_build/seafile/Dockerfile
diff --git a/docker/seafile/README.md b/app_build/seafile/README.md
index 26d04e0..26d04e0 100644
--- a/docker/seafile/README.md
+++ b/app_build/seafile/README.md
diff --git a/docker/seafile/seadocker b/app_build/seafile/seadocker
index 5b5982b..5b5982b 100755
--- a/docker/seafile/seadocker
+++ b/app_build/seafile/seadocker
diff --git a/docker/seafile/seaenv b/app_build/seafile/seaenv
index 3b0e0bb..3b0e0bb 100755
--- a/docker/seafile/seaenv
+++ b/app_build/seafile/seaenv
diff --git a/docker/sogo/Dockerfile b/app_build/sogo/Dockerfile
index 46880dd..46880dd 100644
--- a/docker/sogo/Dockerfile
+++ b/app_build/sogo/Dockerfile
diff --git a/docker/sogo/README.md b/app_build/sogo/README.md
index ea12245..ea12245 100644
--- a/docker/sogo/README.md
+++ b/app_build/sogo/README.md
diff --git a/docker/sogo/entrypoint b/app_build/sogo/entrypoint
index 8b39def..8b39def 100755
--- a/docker/sogo/entrypoint
+++ b/app_build/sogo/entrypoint
diff --git a/docker/sogo/sogo.nginx.conf b/app_build/sogo/sogo.nginx.conf
index ad920a5..ad920a5 100644
--- a/docker/sogo/sogo.nginx.conf
+++ b/app_build/sogo/sogo.nginx.conf
diff --git a/docker/static/Dockerfile b/app_build/static/Dockerfile
index cdba59a..cdba59a 100644
--- a/docker/static/Dockerfile
+++ b/app_build/static/Dockerfile
diff --git a/docker/static/README.md b/app_build/static/README.md
index d50390c..d50390c 100644
--- a/docker/static/README.md
+++ b/app_build/static/README.md
diff --git a/docker/static/goStatic b/app_build/static/goStatic
-Subproject 3f97f57aaee09a142afe3ca0f1a5d51acd85643
+Subproject 3f97f57aaee09a142afe3ca0f1a5d51acd85643
diff --git a/docker/webpull/.gitignore b/app_build/webpull/.gitignore
index ba2906d..ba2906d 100644
--- a/docker/webpull/.gitignore
+++ b/app_build/webpull/.gitignore
diff --git a/docker/webpull/Dockerfile.nodejs b/app_build/webpull/Dockerfile.nodejs
index acc7e74..acc7e74 100644
--- a/docker/webpull/Dockerfile.nodejs
+++ b/app_build/webpull/Dockerfile.nodejs
diff --git a/docker/webpull/Dockerfile.ruby b/app_build/webpull/Dockerfile.ruby
index 7578cca..7578cca 100644
--- a/docker/webpull/Dockerfile.ruby
+++ b/app_build/webpull/Dockerfile.ruby
diff --git a/docker/webpull/README.md b/app_build/webpull/README.md
index 5d17d17..5d17d17 100644
--- a/docker/webpull/README.md
+++ b/app_build/webpull/README.md
diff --git a/docker/webpull/main.go b/app_build/webpull/main.go
index 46c90b9..46c90b9 100644
--- a/docker/webpull/main.go
+++ b/app_build/webpull/main.go
diff --git a/consul/configuration/.gitignore b/app_config/configuration/.gitignore
index 056b4d2..056b4d2 100644
--- a/consul/configuration/.gitignore
+++ b/app_config/configuration/.gitignore
diff --git a/consul/configuration/chat/coturn/turnserver.conf.tpl b/app_config/configuration/chat/coturn/turnserver.conf.tpl
index f867ac0..f867ac0 100644
--- a/consul/configuration/chat/coturn/turnserver.conf.tpl
+++ b/app_config/configuration/chat/coturn/turnserver.conf.tpl
diff --git a/consul/configuration/chat/easybridge/config.json.tpl b/app_config/configuration/chat/easybridge/config.json.tpl
index 40ecc44..40ecc44 100644
--- a/consul/configuration/chat/easybridge/config.json.tpl
+++ b/app_config/configuration/chat/easybridge/config.json.tpl
diff --git a/consul/configuration/chat/easybridge/registration.yaml.tpl b/app_config/configuration/chat/easybridge/registration.yaml.tpl
index ec098fd..ec098fd 100644
--- a/consul/configuration/chat/easybridge/registration.yaml.tpl
+++ b/app_config/configuration/chat/easybridge/registration.yaml.tpl
diff --git a/consul/configuration/chat/fb2mx/config.yaml b/app_config/configuration/chat/fb2mx/config.yaml
index 964c681..964c681 100644
--- a/consul/configuration/chat/fb2mx/config.yaml
+++ b/app_config/configuration/chat/fb2mx/config.yaml
diff --git a/consul/configuration/chat/fb2mx/registration.yaml b/app_config/configuration/chat/fb2mx/registration.yaml
index c3d8c05..c3d8c05 100644
--- a/consul/configuration/chat/fb2mx/registration.yaml
+++ b/app_config/configuration/chat/fb2mx/registration.yaml
diff --git a/consul/configuration/chat/riot_web/config.json b/app_config/configuration/chat/riot_web/config.json
index 5844afc..5844afc 100644
--- a/consul/configuration/chat/riot_web/config.json
+++ b/app_config/configuration/chat/riot_web/config.json
diff --git a/consul/configuration/chat/synapse/conf.d/report_stats.yaml b/app_config/configuration/chat/synapse/conf.d/report_stats.yaml
index cb95cc3..cb95cc3 100644
--- a/consul/configuration/chat/synapse/conf.d/report_stats.yaml
+++ b/app_config/configuration/chat/synapse/conf.d/report_stats.yaml
diff --git a/consul/configuration/chat/synapse/conf.d/server_name.yaml b/app_config/configuration/chat/synapse/conf.d/server_name.yaml
index 540ce45..540ce45 100644
--- a/consul/configuration/chat/synapse/conf.d/server_name.yaml
+++ b/app_config/configuration/chat/synapse/conf.d/server_name.yaml
diff --git a/consul/configuration/chat/synapse/homeserver.yaml b/app_config/configuration/chat/synapse/homeserver.yaml
index 7f313f6..7f313f6 100644
--- a/consul/configuration/chat/synapse/homeserver.yaml
+++ b/app_config/configuration/chat/synapse/homeserver.yaml
diff --git a/consul/configuration/chat/synapse/log.yaml b/app_config/configuration/chat/synapse/log.yaml
index eb69d8f..eb69d8f 100644
--- a/consul/configuration/chat/synapse/log.yaml
+++ b/app_config/configuration/chat/synapse/log.yaml
diff --git a/consul/configuration/directory/bottin/config.json b/app_config/configuration/directory/bottin/config.json
index c30a4d5..c30a4d5 100644
--- a/consul/configuration/directory/bottin/config.json
+++ b/app_config/configuration/directory/bottin/config.json
diff --git a/consul/configuration/directory/guichet/config.json.tpl b/app_config/configuration/directory/guichet/config.json.tpl
index 98e2297..98e2297 100644
--- a/consul/configuration/directory/guichet/config.json.tpl
+++ b/app_config/configuration/directory/guichet/config.json.tpl
diff --git a/consul/configuration/email/dkim/keytable b/app_config/configuration/email/dkim/keytable
index f4ac7cd..f4ac7cd 100644
--- a/consul/configuration/email/dkim/keytable
+++ b/app_config/configuration/email/dkim/keytable
diff --git a/consul/configuration/email/dkim/signingtable b/app_config/configuration/email/dkim/signingtable
index 60d66ff..60d66ff 100644
--- a/consul/configuration/email/dkim/signingtable
+++ b/app_config/configuration/email/dkim/signingtable
diff --git a/consul/configuration/email/dkim/smtp.private.sample b/app_config/configuration/email/dkim/smtp.private.sample
index e69de29..e69de29 100644
--- a/consul/configuration/email/dkim/smtp.private.sample
+++ b/app_config/configuration/email/dkim/smtp.private.sample
diff --git a/consul/configuration/email/dkim/smtp.txt.sample b/app_config/configuration/email/dkim/smtp.txt.sample
index e69de29..e69de29 100644
--- a/consul/configuration/email/dkim/smtp.txt.sample
+++ b/app_config/configuration/email/dkim/smtp.txt.sample
diff --git a/consul/configuration/email/dkim/trusted b/app_config/configuration/email/dkim/trusted
index a01170d..a01170d 100644
--- a/consul/configuration/email/dkim/trusted
+++ b/app_config/configuration/email/dkim/trusted
diff --git a/consul/configuration/email/dovecot/certs.gen b/app_config/configuration/email/dovecot/certs.gen
index f26e917..f26e917 100755
--- a/consul/configuration/email/dovecot/certs.gen
+++ b/app_config/configuration/email/dovecot/certs.gen
diff --git a/consul/configuration/email/dovecot/dovecot-ldap.conf.tpl b/app_config/configuration/email/dovecot/dovecot-ldap.conf.tpl
index 9fb1ea6..9fb1ea6 100644
--- a/consul/configuration/email/dovecot/dovecot-ldap.conf.tpl
+++ b/app_config/configuration/email/dovecot/dovecot-ldap.conf.tpl
diff --git a/consul/configuration/email/postfix/certs.gen b/app_config/configuration/email/postfix/certs.gen
index f25439b..f25439b 100755
--- a/consul/configuration/email/postfix/certs.gen
+++ b/app_config/configuration/email/postfix/certs.gen
diff --git a/consul/configuration/email/postfix/dynamicmaps.cf b/app_config/configuration/email/postfix/dynamicmaps.cf
index 32d8f62..32d8f62 100644
--- a/consul/configuration/email/postfix/dynamicmaps.cf
+++ b/app_config/configuration/email/postfix/dynamicmaps.cf
diff --git a/consul/configuration/email/postfix/header_checks b/app_config/configuration/email/postfix/header_checks
index cad52ec..cad52ec 100644
--- a/consul/configuration/email/postfix/header_checks
+++ b/app_config/configuration/email/postfix/header_checks
diff --git a/consul/configuration/email/postfix/ldap-account.cf.tpl b/app_config/configuration/email/postfix/ldap-account.cf.tpl
index 2575f10..2575f10 100644
--- a/consul/configuration/email/postfix/ldap-account.cf.tpl
+++ b/app_config/configuration/email/postfix/ldap-account.cf.tpl
diff --git a/consul/configuration/email/postfix/ldap-alias.cf.tpl b/app_config/configuration/email/postfix/ldap-alias.cf.tpl
index 775c0ad..775c0ad 100644
--- a/consul/configuration/email/postfix/ldap-alias.cf.tpl
+++ b/app_config/configuration/email/postfix/ldap-alias.cf.tpl
diff --git a/consul/configuration/email/postfix/ldap-virtual-domains.cf.tpl b/app_config/configuration/email/postfix/ldap-virtual-domains.cf.tpl
index e013953..e013953 100644
--- a/consul/configuration/email/postfix/ldap-virtual-domains.cf.tpl
+++ b/app_config/configuration/email/postfix/ldap-virtual-domains.cf.tpl
diff --git a/consul/configuration/email/postfix/main.cf b/app_config/configuration/email/postfix/main.cf
index 4204cb4..4204cb4 100644
--- a/consul/configuration/email/postfix/main.cf
+++ b/app_config/configuration/email/postfix/main.cf
diff --git a/consul/configuration/email/postfix/master.cf b/app_config/configuration/email/postfix/master.cf
index 53bc601..53bc601 100644
--- a/consul/configuration/email/postfix/master.cf
+++ b/app_config/configuration/email/postfix/master.cf
diff --git a/consul/configuration/email/postfix/transport b/app_config/configuration/email/postfix/transport
index 68f62c5..68f62c5 100644
--- a/consul/configuration/email/postfix/transport
+++ b/app_config/configuration/email/postfix/transport
diff --git a/consul/configuration/email/postfix/transport.db b/app_config/configuration/email/postfix/transport.db
index 487f394..487f394 100644
--- a/consul/configuration/email/postfix/transport.db
+++ b/app_config/configuration/email/postfix/transport.db
diff --git a/consul/configuration/email/sogo/sogo.conf.tpl b/app_config/configuration/email/sogo/sogo.conf.tpl
index d4261e5..d4261e5 100644
--- a/consul/configuration/email/sogo/sogo.conf.tpl
+++ b/app_config/configuration/email/sogo/sogo.conf.tpl
diff --git a/consul/configuration/mariadb/main/env.tpl b/app_config/configuration/mariadb/main/env.tpl
index 0fe903b..0fe903b 100644
--- a/consul/configuration/mariadb/main/env.tpl
+++ b/app_config/configuration/mariadb/main/env.tpl
diff --git a/consul/configuration/nextcloud/config.php.tpl b/app_config/configuration/nextcloud/config.php.tpl
index 7dcfc6e..7dcfc6e 100644
--- a/consul/configuration/nextcloud/config.php.tpl
+++ b/app_config/configuration/nextcloud/config.php.tpl
diff --git a/consul/configuration/postgres/keeper/env.tpl b/app_config/configuration/postgres/keeper/env.tpl
index 7831aad..7831aad 100644
--- a/consul/configuration/postgres/keeper/env.tpl
+++ b/app_config/configuration/postgres/keeper/env.tpl
diff --git a/consul/configuration/seafile/ccnet/mykey.peer.sample b/app_config/configuration/seafile/ccnet/mykey.peer.sample
index e69de29..e69de29 100644
--- a/consul/configuration/seafile/ccnet/mykey.peer.sample
+++ b/app_config/configuration/seafile/ccnet/mykey.peer.sample
diff --git a/consul/configuration/seafile/ccnet/seafile.ini b/app_config/configuration/seafile/ccnet/seafile.ini
index 306d126..306d126 100644
--- a/consul/configuration/seafile/ccnet/seafile.ini
+++ b/app_config/configuration/seafile/ccnet/seafile.ini
diff --git a/consul/configuration/seafile/conf/ccnet.conf.tpl b/app_config/configuration/seafile/conf/ccnet.conf.tpl
index 2395a9b..2395a9b 100644
--- a/consul/configuration/seafile/conf/ccnet.conf.tpl
+++ b/app_config/configuration/seafile/conf/ccnet.conf.tpl
diff --git a/consul/configuration/seafile/conf/mykey.peer.sample b/app_config/configuration/seafile/conf/mykey.peer.sample
index e69de29..e69de29 100644
--- a/consul/configuration/seafile/conf/mykey.peer.sample
+++ b/app_config/configuration/seafile/conf/mykey.peer.sample
diff --git a/consul/configuration/seafile/conf/seafdav.conf b/app_config/configuration/seafile/conf/seafdav.conf
index 49a79a2..49a79a2 100644
--- a/consul/configuration/seafile/conf/seafdav.conf
+++ b/app_config/configuration/seafile/conf/seafdav.conf
diff --git a/consul/configuration/seafile/conf/seafile.conf.tpl b/app_config/configuration/seafile/conf/seafile.conf.tpl
index f224234..f224234 100644
--- a/consul/configuration/seafile/conf/seafile.conf.tpl
+++ b/app_config/configuration/seafile/conf/seafile.conf.tpl
diff --git a/consul/configuration/seafile/conf/seahub_settings.py.tpl b/app_config/configuration/seafile/conf/seahub_settings.py.tpl
index 6c63ee4..6c63ee4 100644
--- a/consul/configuration/seafile/conf/seahub_settings.py.tpl
+++ b/app_config/configuration/seafile/conf/seahub_settings.py.tpl
diff --git a/consul/configuration/traefik/traefik.toml b/app_config/configuration/traefik/traefik.toml
index 03fca8a..03fca8a 100644
--- a/consul/configuration/traefik/traefik.toml
+++ b/app_config/configuration/traefik/traefik.toml
diff --git a/consul/restore_configuration.sh b/app_config/restore_configuration.sh
index 33742e5..33742e5 100755
--- a/consul/restore_configuration.sh
+++ b/app_config/restore_configuration.sh
diff --git a/consul/secrets/.gitignore b/app_config/secrets/.gitignore
index 1d7b40b..1d7b40b 100644
--- a/consul/secrets/.gitignore
+++ b/app_config/secrets/.gitignore
diff --git a/consul/secrets/chat/coturn/static-auth.sample b/app_config/secrets/chat/coturn/static-auth.sample
index e69de29..e69de29 100644
--- a/consul/secrets/chat/coturn/static-auth.sample
+++ b/app_config/secrets/chat/coturn/static-auth.sample
diff --git a/consul/secrets/chat/fb2mx/as_token.sample b/app_config/secrets/chat/fb2mx/as_token.sample
index e69de29..e69de29 100644
--- a/consul/secrets/chat/fb2mx/as_token.sample
+++ b/app_config/secrets/chat/fb2mx/as_token.sample
diff --git a/consul/secrets/chat/fb2mx/db_url.sample b/app_config/secrets/chat/fb2mx/db_url.sample
index aff4635..aff4635 100644
--- a/consul/secrets/chat/fb2mx/db_url.sample
+++ b/app_config/secrets/chat/fb2mx/db_url.sample
diff --git a/consul/secrets/chat/fb2mx/hs_token.sample b/app_config/secrets/chat/fb2mx/hs_token.sample
index e69de29..e69de29 100644
--- a/consul/secrets/chat/fb2mx/hs_token.sample
+++ b/app_config/secrets/chat/fb2mx/hs_token.sample
diff --git a/consul/secrets/chat/synapse/homeserver.tls.crt.sample b/app_config/secrets/chat/synapse/homeserver.tls.crt.sample
index e69de29..e69de29 100644
--- a/consul/secrets/chat/synapse/homeserver.tls.crt.sample
+++ b/app_config/secrets/chat/synapse/homeserver.tls.crt.sample
diff --git a/consul/secrets/chat/synapse/homeserver.tls.dh.sample b/app_config/secrets/chat/synapse/homeserver.tls.dh.sample
index e69de29..e69de29 100644
--- a/consul/secrets/chat/synapse/homeserver.tls.dh.sample
+++ b/app_config/secrets/chat/synapse/homeserver.tls.dh.sample
diff --git a/consul/secrets/chat/synapse/homeserver.tls.key.sample b/app_config/secrets/chat/synapse/homeserver.tls.key.sample
index e69de29..e69de29 100644
--- a/consul/secrets/chat/synapse/homeserver.tls.key.sample
+++ b/app_config/secrets/chat/synapse/homeserver.tls.key.sample
diff --git a/consul/secrets/chat/synapse/ldap_binddn.sample b/app_config/secrets/chat/synapse/ldap_binddn.sample
index e69de29..e69de29 100644
--- a/consul/secrets/chat/synapse/ldap_binddn.sample
+++ b/app_config/secrets/chat/synapse/ldap_binddn.sample
diff --git a/consul/secrets/chat/synapse/ldap_bindpw.sample b/app_config/secrets/chat/synapse/ldap_bindpw.sample
index e69de29..e69de29 100644
--- a/consul/secrets/chat/synapse/ldap_bindpw.sample
+++ b/app_config/secrets/chat/synapse/ldap_bindpw.sample
diff --git a/consul/secrets/chat/synapse/postgres_db.sample b/app_config/secrets/chat/synapse/postgres_db.sample
index e69de29..e69de29 100644
--- a/consul/secrets/chat/synapse/postgres_db.sample
+++ b/app_config/secrets/chat/synapse/postgres_db.sample
diff --git a/consul/secrets/chat/synapse/postgres_pwd.sample b/app_config/secrets/chat/synapse/postgres_pwd.sample
index e69de29..e69de29 100644
--- a/consul/secrets/chat/synapse/postgres_pwd.sample
+++ b/app_config/secrets/chat/synapse/postgres_pwd.sample
diff --git a/consul/secrets/chat/synapse/postgres_user.sample b/app_config/secrets/chat/synapse/postgres_user.sample
index e69de29..e69de29 100644
--- a/consul/secrets/chat/synapse/postgres_user.sample
+++ b/app_config/secrets/chat/synapse/postgres_user.sample
diff --git a/consul/secrets/chat/synapse/registration_shared_secret.sample b/app_config/secrets/chat/synapse/registration_shared_secret.sample
index e69de29..e69de29 100644
--- a/consul/secrets/chat/synapse/registration_shared_secret.sample
+++ b/app_config/secrets/chat/synapse/registration_shared_secret.sample
diff --git a/consul/secrets/email/sogo/ldap_binddn.sample b/app_config/secrets/email/sogo/ldap_binddn.sample
index e69de29..e69de29 100644
--- a/consul/secrets/email/sogo/ldap_binddn.sample
+++ b/app_config/secrets/email/sogo/ldap_binddn.sample
diff --git a/consul/secrets/email/sogo/ldap_bindpw.sample b/app_config/secrets/email/sogo/ldap_bindpw.sample
index e69de29..e69de29 100644
--- a/consul/secrets/email/sogo/ldap_bindpw.sample
+++ b/app_config/secrets/email/sogo/ldap_bindpw.sample
diff --git a/consul/secrets/email/sogo/postgre_auth.sample b/app_config/secrets/email/sogo/postgre_auth.sample
index e69de29..e69de29 100644
--- a/consul/secrets/email/sogo/postgre_auth.sample
+++ b/app_config/secrets/email/sogo/postgre_auth.sample
diff --git a/consul/secrets/jitsi/auth.jitsi.deuxfleurs.fr.crt.sample b/app_config/secrets/jitsi/auth.jitsi.deuxfleurs.fr.crt.sample
index e69de29..e69de29 100644
--- a/consul/secrets/jitsi/auth.jitsi.deuxfleurs.fr.crt.sample
+++ b/app_config/secrets/jitsi/auth.jitsi.deuxfleurs.fr.crt.sample
diff --git a/consul/secrets/jitsi/auth.jitsi.deuxfleurs.fr.key.sample b/app_config/secrets/jitsi/auth.jitsi.deuxfleurs.fr.key.sample
index e69de29..e69de29 100644
--- a/consul/secrets/jitsi/auth.jitsi.deuxfleurs.fr.key.sample
+++ b/app_config/secrets/jitsi/auth.jitsi.deuxfleurs.fr.key.sample
diff --git a/consul/secrets/jitsi/global_env.sample b/app_config/secrets/jitsi/global_env.sample
index 658c9c9..658c9c9 100644
--- a/consul/secrets/jitsi/global_env.sample
+++ b/app_config/secrets/jitsi/global_env.sample
diff --git a/consul/secrets/jitsi/jitsi.deuxfleurs.fr.crt.sample b/app_config/secrets/jitsi/jitsi.deuxfleurs.fr.crt.sample
index e69de29..e69de29 100644
--- a/consul/secrets/jitsi/jitsi.deuxfleurs.fr.crt.sample
+++ b/app_config/secrets/jitsi/jitsi.deuxfleurs.fr.crt.sample
diff --git a/consul/secrets/jitsi/jitsi.deuxfleurs.fr.key.sample b/app_config/secrets/jitsi/jitsi.deuxfleurs.fr.key.sample
index e69de29..e69de29 100644
--- a/consul/secrets/jitsi/jitsi.deuxfleurs.fr.key.sample
+++ b/app_config/secrets/jitsi/jitsi.deuxfleurs.fr.key.sample
diff --git a/consul/secrets/mariadb/main/ldap_binddn.sample b/app_config/secrets/mariadb/main/ldap_binddn.sample
index e69de29..e69de29 100644
--- a/consul/secrets/mariadb/main/ldap_binddn.sample
+++ b/app_config/secrets/mariadb/main/ldap_binddn.sample
diff --git a/consul/secrets/mariadb/main/ldap_bindpwd.sample b/app_config/secrets/mariadb/main/ldap_bindpwd.sample
index e69de29..e69de29 100644
--- a/consul/secrets/mariadb/main/ldap_bindpwd.sample
+++ b/app_config/secrets/mariadb/main/ldap_bindpwd.sample
diff --git a/consul/secrets/mariadb/main/mysql_pwd.sample b/app_config/secrets/mariadb/main/mysql_pwd.sample
index e69de29..e69de29 100644
--- a/consul/secrets/mariadb/main/mysql_pwd.sample
+++ b/app_config/secrets/mariadb/main/mysql_pwd.sample
diff --git a/consul/secrets/platoo/bddpw.sample b/app_config/secrets/platoo/bddpw.sample
index e69de29..e69de29 100644
--- a/consul/secrets/platoo/bddpw.sample
+++ b/app_config/secrets/platoo/bddpw.sample
diff --git a/consul/secrets/postgres/keeper/pg_repl_pwd.sample b/app_config/secrets/postgres/keeper/pg_repl_pwd.sample
index e69de29..e69de29 100644
--- a/consul/secrets/postgres/keeper/pg_repl_pwd.sample
+++ b/app_config/secrets/postgres/keeper/pg_repl_pwd.sample
diff --git a/consul/secrets/postgres/keeper/pg_repl_username.sample b/app_config/secrets/postgres/keeper/pg_repl_username.sample
index e69de29..e69de29 100644
--- a/consul/secrets/postgres/keeper/pg_repl_username.sample
+++ b/app_config/secrets/postgres/keeper/pg_repl_username.sample
diff --git a/consul/secrets/postgres/keeper/pg_su_pwd.sample b/app_config/secrets/postgres/keeper/pg_su_pwd.sample
index e69de29..e69de29 100644
--- a/consul/secrets/postgres/keeper/pg_su_pwd.sample
+++ b/app_config/secrets/postgres/keeper/pg_su_pwd.sample
diff --git a/consul/secrets/web/home_token.sample b/app_config/secrets/web/home_token.sample
index e69de29..e69de29 100644
--- a/consul/secrets/web/home_token.sample
+++ b/app_config/secrets/web/home_token.sample
diff --git a/consul/secrets/web/quentin.dufour.io_token.sample b/app_config/secrets/web/quentin.dufour.io_token.sample
index e69de29..e69de29 100644
--- a/consul/secrets/web/quentin.dufour.io_token.sample
+++ b/app_config/secrets/web/quentin.dufour.io_token.sample
diff --git a/nomad/bottin2.hcl b/app_deployment/bottin2.hcl
index 85bda59..85bda59 100644
--- a/nomad/bottin2.hcl
+++ b/app_deployment/bottin2.hcl
diff --git a/nomad/core.hcl b/app_deployment/core.hcl
index 43774a6..43774a6 100644
--- a/nomad/core.hcl
+++ b/app_deployment/core.hcl
diff --git a/nomad/email.hcl b/app_deployment/email.hcl
index 86c4d87..86c4d87 100644
--- a/nomad/email.hcl
+++ b/app_deployment/email.hcl
diff --git a/nomad/garage.hcl b/app_deployment/garage.hcl
index 3478706..3478706 100644
--- a/nomad/garage.hcl
+++ b/app_deployment/garage.hcl
diff --git a/nomad/im.hcl b/app_deployment/im.hcl
index 53b81d1..53b81d1 100644
--- a/nomad/im.hcl
+++ b/app_deployment/im.hcl
diff --git a/nomad/jitsi.hcl b/app_deployment/jitsi.hcl
index 4ef2f98..4ef2f98 100644
--- a/nomad/jitsi.hcl
+++ b/app_deployment/jitsi.hcl
diff --git a/nomad/mariadb.hcl b/app_deployment/mariadb.hcl
index 2b9be7e..2b9be7e 100644
--- a/nomad/mariadb.hcl
+++ b/app_deployment/mariadb.hcl
diff --git a/nomad/nextcloud.hcl b/app_deployment/nextcloud.hcl
index 2cc4f5f..2cc4f5f 100644
--- a/nomad/nextcloud.hcl
+++ b/app_deployment/nextcloud.hcl
diff --git a/nomad/object_storage.hcl b/app_deployment/object_storage.hcl
index fa40c4b..fa40c4b 100644
--- a/nomad/object_storage.hcl
+++ b/app_deployment/object_storage.hcl
diff --git a/nomad/platoo.hcl b/app_deployment/platoo.hcl
index 0502934..0502934 100644
--- a/nomad/platoo.hcl
+++ b/app_deployment/platoo.hcl
diff --git a/nomad/postgres.hcl b/app_deployment/postgres.hcl
index 456156e..456156e 100644
--- a/nomad/postgres.hcl
+++ b/app_deployment/postgres.hcl
diff --git a/nomad/science.hcl b/app_deployment/science.hcl
index 81e398a..81e398a 100644
--- a/nomad/science.hcl
+++ b/app_deployment/science.hcl
diff --git a/nomad/seafile.hcl b/app_deployment/seafile.hcl
index e22699c..e22699c 100644
--- a/nomad/seafile.hcl
+++ b/app_deployment/seafile.hcl
diff --git a/nomad/traefik.hcl b/app_deployment/traefik.hcl
index a0803e4..a0803e4 100644
--- a/nomad/traefik.hcl
+++ b/app_deployment/traefik.hcl
diff --git a/nomad/web_static.hcl b/app_deployment/web_static.hcl
index c935b2a..c935b2a 100644
--- a/nomad/web_static.hcl
+++ b/app_deployment/web_static.hcl
diff --git a/nomad/webcap.hcl b/app_deployment/webcap.hcl
index 1246b76..1246b76 100644
--- a/nomad/webcap.hcl
+++ b/app_deployment/webcap.hcl
diff --git a/docker/jitsi/01_gen_certs.yml b/app_integration/jitsi/01_gen_certs.yml
index 8c97384..8c97384 100644
--- a/docker/jitsi/01_gen_certs.yml
+++ b/app_integration/jitsi/01_gen_certs.yml
diff --git a/docker/jitsi/02_run.yml b/app_integration/jitsi/02_run.yml
index 3fc0e26..3fc0e26 100644
--- a/docker/jitsi/02_run.yml
+++ b/app_integration/jitsi/02_run.yml
diff --git a/docker/jitsi/README.md b/app_integration/jitsi/README.md
index 70b59fc..70b59fc 100644
--- a/docker/jitsi/README.md
+++ b/app_integration/jitsi/README.md
diff --git a/docker/jitsi/dev.env b/app_integration/jitsi/dev.env
index 4fff8c1..4fff8c1 100644
--- a/docker/jitsi/dev.env
+++ b/app_integration/jitsi/dev.env
diff --git a/docker/jitsi/jitsi-certs/.gitignore b/app_integration/jitsi/jitsi-certs/.gitignore
index d6b7ef3..d6b7ef3 100644
--- a/docker/jitsi/jitsi-certs/.gitignore
+++ b/app_integration/jitsi/jitsi-certs/.gitignore
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
deleted file mode 100644
index 966ed90..0000000
--- a/docker/docker-compose.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-version: '3.4'
-services:
-  riot:
-    build:
-      context: ./riotweb
-      args:
-        # https://github.com/vector-im/riot-web/releases
-        VERSION: 1.7.5
-    image: superboum/amd64_riotweb:v15
-  synapse:
-    build: 
-      context: ./matrix-synapse
-      args:
-        # https://github.com/matrix-org/synapse/releases
-        VERSION: 1.19.1
-    image: superboum/amd64_synapse:v33
-  sogo:
-    build:
-      context: ./sogo
-      args:
-        # fake for now
-        VERSION: 5.0.0
-    image: superboum/amd64_sogo:v7
-
diff --git a/man/create_database/README.md b/op_guide/create_database/README.md
index 7084a10..7084a10 100644
--- a/man/create_database/README.md
+++ b/op_guide/create_database/README.md
diff --git a/man/init_stolon/README.md b/op_guide/init_stolon/README.md
index 618530a..618530a 100644
--- a/man/init_stolon/README.md
+++ b/op_guide/init_stolon/README.md
diff --git a/man/nextcloud/README.md b/op_guide/nextcloud/README.md
index f68520b..f68520b 100644
--- a/man/nextcloud/README.md
+++ b/op_guide/nextcloud/README.md
diff --git a/bootstrap/README.md b/os_build/README.md
index c96ae5a..c96ae5a 100644
--- a/bootstrap/README.md
+++ b/os_build/README.md
diff --git a/bootstrap/build-installer.sh b/os_build/build-installer.sh
index 7ede0c4..7ede0c4 100644
--- a/bootstrap/build-installer.sh
+++ b/os_build/build-installer.sh
diff --git a/ansible/README.md b/os_config/README.md
index db8d960..db8d960 100644
--- a/ansible/README.md
+++ b/os_config/README.md
diff --git a/ansible/README.more.md b/os_config/README.more.md
index 0d0c607..0d0c607 100644
--- a/ansible/README.more.md
+++ b/os_config/README.more.md
diff --git a/ansible/cluster_nodes.yml b/os_config/cluster_nodes.yml
index ea58630..ea58630 100644
--- a/ansible/cluster_nodes.yml
+++ b/os_config/cluster_nodes.yml
diff --git a/ansible/group_vars/all/.gitignore b/os_config/group_vars/all/.gitignore
index 9271182..9271182 100644
--- a/ansible/group_vars/all/.gitignore
+++ b/os_config/group_vars/all/.gitignore
diff --git a/ansible/group_vars/all/vars_file.yml.sample b/os_config/group_vars/all/vars_file.yml.sample
index 191f35c..191f35c 100644
--- a/ansible/group_vars/all/vars_file.yml.sample
+++ b/os_config/group_vars/all/vars_file.yml.sample
diff --git a/ansible/production b/os_config/production
index c8f08f2..c8f08f2 100644
--- a/ansible/production
+++ b/os_config/production
diff --git a/ansible/roles/common/tasks/main.yml b/os_config/roles/common/tasks/main.yml
index b4d00bb..b4d00bb 100644
--- a/ansible/roles/common/tasks/main.yml
+++ b/os_config/roles/common/tasks/main.yml
diff --git a/ansible/roles/consul/files/consul.service b/os_config/roles/consul/files/consul.service
index ffaa2a3..ffaa2a3 100644
--- a/ansible/roles/consul/files/consul.service
+++ b/os_config/roles/consul/files/consul.service
diff --git a/ansible/roles/consul/tasks/main.yml b/os_config/roles/consul/tasks/main.yml
index 2b77080..2b77080 100644
--- a/ansible/roles/consul/tasks/main.yml
+++ b/os_config/roles/consul/tasks/main.yml
diff --git a/ansible/roles/consul/templates/consul.json.j2 b/os_config/roles/consul/templates/consul.json.j2
index b6c86aa..b6c86aa 100644
--- a/ansible/roles/consul/templates/consul.json.j2
+++ b/os_config/roles/consul/templates/consul.json.j2
diff --git a/ansible/roles/consul/templates/resolv.conf.j2 b/os_config/roles/consul/templates/resolv.conf.j2
index 2404034..2404034 100644
--- a/ansible/roles/consul/templates/resolv.conf.j2
+++ b/os_config/roles/consul/templates/resolv.conf.j2
diff --git a/ansible/roles/consul/vars/.gitignore b/os_config/roles/consul/vars/.gitignore
index ff5c0bd..ff5c0bd 100644
--- a/ansible/roles/consul/vars/.gitignore
+++ b/os_config/roles/consul/vars/.gitignore
diff --git a/ansible/roles/consul/vars/main.yml.sample b/os_config/roles/consul/vars/main.yml.sample
index 9c44126..9c44126 100644
--- a/ansible/roles/consul/vars/main.yml.sample
+++ b/os_config/roles/consul/vars/main.yml.sample
diff --git a/ansible/roles/network/files/rules.v6 b/os_config/roles/network/files/rules.v6
index 17ff71c..17ff71c 100644
--- a/ansible/roles/network/files/rules.v6
+++ b/os_config/roles/network/files/rules.v6
diff --git a/ansible/roles/network/tasks/main.yml b/os_config/roles/network/tasks/main.yml
index 1443e0c..1443e0c 100644
--- a/ansible/roles/network/tasks/main.yml
+++ b/os_config/roles/network/tasks/main.yml
diff --git a/ansible/roles/network/templates/rules.v4.j2 b/os_config/roles/network/templates/rules.v4.j2
index a446139..a446139 100644
--- a/ansible/roles/network/templates/rules.v4.j2
+++ b/os_config/roles/network/templates/rules.v4.j2
diff --git a/ansible/roles/nomad/files/nomad.service b/os_config/roles/nomad/files/nomad.service
index 50116be..50116be 100644
--- a/ansible/roles/nomad/files/nomad.service
+++ b/os_config/roles/nomad/files/nomad.service
diff --git a/ansible/roles/nomad/tasks/main.yml b/os_config/roles/nomad/tasks/main.yml
index 7c73362..7c73362 100644
--- a/ansible/roles/nomad/tasks/main.yml
+++ b/os_config/roles/nomad/tasks/main.yml
diff --git a/ansible/roles/nomad/templates/nomad.hcl.j2 b/os_config/roles/nomad/templates/nomad.hcl.j2
index b0be6a8..b0be6a8 100644
--- a/ansible/roles/nomad/templates/nomad.hcl.j2
+++ b/os_config/roles/nomad/templates/nomad.hcl.j2
diff --git a/ansible/roles/storage/handlers/main.yml b/os_config/roles/storage/handlers/main.yml
index a395c93..a395c93 100644
--- a/ansible/roles/storage/handlers/main.yml
+++ b/os_config/roles/storage/handlers/main.yml
diff --git a/ansible/roles/storage/tasks/main.yml b/os_config/roles/storage/tasks/main.yml
index a1f2d8f..a1f2d8f 100644
--- a/ansible/roles/storage/tasks/main.yml
+++ b/os_config/roles/storage/tasks/main.yml
diff --git a/ansible/roles/users/files/alex-key1.pub b/os_config/roles/users/files/alex-key1.pub
index 93514ab..93514ab 100644
--- a/ansible/roles/users/files/alex-key1.pub
+++ b/os_config/roles/users/files/alex-key1.pub
diff --git a/ansible/roles/users/files/alex-key2.pub b/os_config/roles/users/files/alex-key2.pub
index 1eddcc8..1eddcc8 100644
--- a/ansible/roles/users/files/alex-key2.pub
+++ b/os_config/roles/users/files/alex-key2.pub
diff --git a/ansible/roles/users/files/florian-key1.pub b/os_config/roles/users/files/florian-key1.pub
index 47b5593..47b5593 100644
--- a/ansible/roles/users/files/florian-key1.pub
+++ b/os_config/roles/users/files/florian-key1.pub
diff --git a/ansible/roles/users/files/florian-key2.pub b/os_config/roles/users/files/florian-key2.pub
index f9935b3..f9935b3 100644
--- a/ansible/roles/users/files/florian-key2.pub
+++ b/os_config/roles/users/files/florian-key2.pub
diff --git a/ansible/roles/users/files/maximilien-key1.pub b/os_config/roles/users/files/maximilien-key1.pub
index 963b1f9..963b1f9 100644
--- a/ansible/roles/users/files/maximilien-key1.pub
+++ b/os_config/roles/users/files/maximilien-key1.pub
diff --git a/ansible/roles/users/files/quentin-key1.pub b/os_config/roles/users/files/quentin-key1.pub
index f3667e0..f3667e0 100644
--- a/ansible/roles/users/files/quentin-key1.pub
+++ b/os_config/roles/users/files/quentin-key1.pub
diff --git a/ansible/roles/users/files/quentin-key2.pub b/os_config/roles/users/files/quentin-key2.pub
index c1b19fd..c1b19fd 100644
--- a/ansible/roles/users/files/quentin-key2.pub
+++ b/os_config/roles/users/files/quentin-key2.pub
diff --git a/ansible/roles/users/tasks/main.yml b/os_config/roles/users/tasks/main.yml
index 990a041..990a041 100644
--- a/ansible/roles/users/tasks/main.yml
+++ b/os_config/roles/users/tasks/main.yml
diff --git a/ansible/roles/users/vars/main.yml b/os_config/roles/users/vars/main.yml
index 5f4df4d..5f4df4d 100644
--- a/ansible/roles/users/vars/main.yml
+++ b/os_config/roles/users/vars/main.yml
diff --git a/ansible/site.yml b/os_config/site.yml
index f66e019..f66e019 100644
--- a/ansible/site.yml
+++ b/os_config/site.yml