diff --git a/.gitmodules b/.gitmodules index 74f1c95..7da38dc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,5 +1,5 @@ [submodule "docker/static/goStatic"] - path = app_build/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 d080367..302bbe1 100644 --- a/README.md +++ b/README.md @@ -27,13 +27,15 @@ As a generic abstraction is provided, deploying new services should be easy. 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) + 1. `os` the base os for the cluster + 1. `build`: where you will build our OS image based on Debian that you will install on your server + 2. `config`: our Ansible recipes to configure and update your freshly installed server + 2. `apps` apps we deploy on the cluster + 1. `build`: our Docker files to build immutable images of our applications + 2. `integration`: Our Docker compose files to test locally how our built images interact together + 3. `config`: Files containing application configurations to be deployed on Consul Key Value Store + 4. `deployment`: Files containing application definitions to be deployed on Nomad Scheduler + 3. `op_guide`: Guides to explain you operations you can do cluster wide (like configuring postgres) ## Start hacking diff --git a/app_build/README.md b/app/build/README.md similarity index 100% rename from app_build/README.md rename to app/build/README.md diff --git a/app_build/blog-quentin/.dockerenv b/app/build/blog-quentin/.dockerenv similarity index 100% rename from app_build/blog-quentin/.dockerenv rename to app/build/blog-quentin/.dockerenv diff --git a/app_build/blog-quentin/Dockerfile b/app/build/blog-quentin/Dockerfile similarity index 100% rename from app_build/blog-quentin/Dockerfile rename to app/build/blog-quentin/Dockerfile diff --git a/app_build/blog-quentin/README.md b/app/build/blog-quentin/README.md similarity index 100% rename from app_build/blog-quentin/README.md rename to app/build/blog-quentin/README.md diff --git a/app_build/coturn/Dockerfile b/app/build/coturn/Dockerfile similarity index 100% rename from app_build/coturn/Dockerfile rename to app/build/coturn/Dockerfile diff --git a/app_build/coturn/README.md b/app/build/coturn/README.md similarity index 100% rename from app_build/coturn/README.md rename to app/build/coturn/README.md diff --git a/app_build/docker-compose.yml b/app/build/docker-compose.yml similarity index 100% rename from app_build/docker-compose.yml rename to app/build/docker-compose.yml diff --git a/app_build/dovecot/.gitignore b/app/build/dovecot/.gitignore similarity index 100% rename from app_build/dovecot/.gitignore rename to app/build/dovecot/.gitignore diff --git a/app_build/dovecot/Dockerfile b/app/build/dovecot/Dockerfile similarity index 100% rename from app_build/dovecot/Dockerfile rename to app/build/dovecot/Dockerfile diff --git a/app_build/dovecot/README.md b/app/build/dovecot/README.md similarity index 100% rename from app_build/dovecot/README.md rename to app/build/dovecot/README.md diff --git a/app_build/dovecot/entrypoint.sh b/app/build/dovecot/entrypoint.sh similarity index 100% rename from app_build/dovecot/entrypoint.sh rename to app/build/dovecot/entrypoint.sh diff --git a/app_build/jitsi-conference-focus/Dockerfile b/app/build/jitsi-conference-focus/Dockerfile similarity index 100% rename from app_build/jitsi-conference-focus/Dockerfile rename to app/build/jitsi-conference-focus/Dockerfile diff --git a/app_build/jitsi-conference-focus/jicofo b/app/build/jitsi-conference-focus/jicofo similarity index 100% rename from app_build/jitsi-conference-focus/jicofo rename to app/build/jitsi-conference-focus/jicofo diff --git a/app_build/jitsi-meet/Dockerfile b/app/build/jitsi-meet/Dockerfile similarity index 100% rename from app_build/jitsi-meet/Dockerfile rename to app/build/jitsi-meet/Dockerfile diff --git a/app_build/jitsi-meet/config.js b/app/build/jitsi-meet/config.js similarity index 100% rename from app_build/jitsi-meet/config.js rename to app/build/jitsi-meet/config.js diff --git a/app_build/jitsi-meet/entrypoint.sh b/app/build/jitsi-meet/entrypoint.sh similarity index 100% rename from app_build/jitsi-meet/entrypoint.sh rename to app/build/jitsi-meet/entrypoint.sh diff --git a/app_build/jitsi-videobridge/Dockerfile b/app/build/jitsi-videobridge/Dockerfile similarity index 100% rename from app_build/jitsi-videobridge/Dockerfile rename to app/build/jitsi-videobridge/Dockerfile diff --git a/app_build/jitsi-videobridge/jvb_run b/app/build/jitsi-videobridge/jvb_run similarity index 100% rename from app_build/jitsi-videobridge/jvb_run rename to app/build/jitsi-videobridge/jvb_run diff --git a/app_build/jitsi-xmpp/Dockerfile b/app/build/jitsi-xmpp/Dockerfile similarity index 100% rename from app_build/jitsi-xmpp/Dockerfile rename to app/build/jitsi-xmpp/Dockerfile diff --git a/app_build/jitsi-xmpp/external_components.cfg.lua b/app/build/jitsi-xmpp/external_components.cfg.lua similarity index 100% rename from app_build/jitsi-xmpp/external_components.cfg.lua rename to app/build/jitsi-xmpp/external_components.cfg.lua diff --git a/app_build/jitsi-xmpp/xmpp_conf b/app/build/jitsi-xmpp/xmpp_conf similarity index 100% rename from app_build/jitsi-xmpp/xmpp_conf rename to app/build/jitsi-xmpp/xmpp_conf diff --git a/app_build/jitsi-xmpp/xmpp_gen b/app/build/jitsi-xmpp/xmpp_gen similarity index 100% rename from app_build/jitsi-xmpp/xmpp_gen rename to app/build/jitsi-xmpp/xmpp_gen diff --git a/app_build/jitsi-xmpp/xmpp_run b/app/build/jitsi-xmpp/xmpp_run similarity index 100% rename from app_build/jitsi-xmpp/xmpp_run rename to app/build/jitsi-xmpp/xmpp_run diff --git a/app_build/landing/README.md b/app/build/landing/README.md similarity index 100% rename from app_build/landing/README.md rename to app/build/landing/README.md diff --git a/app_build/mariadb/60-disable-dialog.cnf b/app/build/mariadb/60-disable-dialog.cnf similarity index 100% rename from app_build/mariadb/60-disable-dialog.cnf rename to app/build/mariadb/60-disable-dialog.cnf diff --git a/app_build/mariadb/60-ldap.cnf b/app/build/mariadb/60-ldap.cnf similarity index 100% rename from app_build/mariadb/60-ldap.cnf rename to app/build/mariadb/60-ldap.cnf diff --git a/app_build/mariadb/60-remote.cnf b/app/build/mariadb/60-remote.cnf similarity index 100% rename from app_build/mariadb/60-remote.cnf rename to app/build/mariadb/60-remote.cnf diff --git a/app_build/mariadb/Dockerfile b/app/build/mariadb/Dockerfile similarity index 100% rename from app_build/mariadb/Dockerfile rename to app/build/mariadb/Dockerfile diff --git a/app_build/mariadb/README.md b/app/build/mariadb/README.md similarity index 100% rename from app_build/mariadb/README.md rename to app/build/mariadb/README.md diff --git a/app_build/mariadb/entrypoint.sh b/app/build/mariadb/entrypoint.sh similarity index 100% rename from app_build/mariadb/entrypoint.sh rename to app/build/mariadb/entrypoint.sh diff --git a/app_build/mariadb/nsswitch.conf b/app/build/mariadb/nsswitch.conf similarity index 100% rename from app_build/mariadb/nsswitch.conf rename to app/build/mariadb/nsswitch.conf diff --git a/app_build/mariadb/pam-mariadb b/app/build/mariadb/pam-mariadb similarity index 100% rename from app_build/mariadb/pam-mariadb rename to app/build/mariadb/pam-mariadb diff --git a/app_build/matrix-synapse/Dockerfile b/app/build/matrix-synapse/Dockerfile similarity index 100% rename from app_build/matrix-synapse/Dockerfile rename to app/build/matrix-synapse/Dockerfile diff --git a/app_build/matrix-synapse/entrypoint.sh b/app/build/matrix-synapse/entrypoint.sh similarity index 100% rename from app_build/matrix-synapse/entrypoint.sh rename to app/build/matrix-synapse/entrypoint.sh diff --git a/app_build/nextcloud/Dockerfile b/app/build/nextcloud/Dockerfile similarity index 100% rename from app_build/nextcloud/Dockerfile rename to app/build/nextcloud/Dockerfile diff --git a/app_build/nextcloud/container-setup.sh b/app/build/nextcloud/container-setup.sh similarity index 100% rename from app_build/nextcloud/container-setup.sh rename to app/build/nextcloud/container-setup.sh diff --git a/app_build/nextcloud/entrypoint.sh b/app/build/nextcloud/entrypoint.sh similarity index 100% rename from app_build/nextcloud/entrypoint.sh rename to app/build/nextcloud/entrypoint.sh diff --git a/app_build/opendkim/Dockerfile b/app/build/opendkim/Dockerfile similarity index 100% rename from app_build/opendkim/Dockerfile rename to app/build/opendkim/Dockerfile diff --git a/app_build/opendkim/README.md b/app/build/opendkim/README.md similarity index 100% rename from app_build/opendkim/README.md rename to app/build/opendkim/README.md diff --git a/app_build/opendkim/opendkim.conf b/app/build/opendkim/opendkim.conf similarity index 100% rename from app_build/opendkim/opendkim.conf rename to app/build/opendkim/opendkim.conf diff --git a/app_build/pithos/0.7.5.tar.gz b/app/build/pithos/0.7.5.tar.gz similarity index 100% rename from app_build/pithos/0.7.5.tar.gz rename to app/build/pithos/0.7.5.tar.gz diff --git a/app_build/pithos/Dockerfile b/app/build/pithos/Dockerfile similarity index 100% rename from app_build/pithos/Dockerfile rename to app/build/pithos/Dockerfile diff --git a/app_build/pithos/README.md b/app/build/pithos/README.md similarity index 100% rename from app_build/pithos/README.md rename to app/build/pithos/README.md diff --git a/app_build/pithos/pithos-0.7.5-standalone.jar b/app/build/pithos/pithos-0.7.5-standalone.jar similarity index 100% rename from app_build/pithos/pithos-0.7.5-standalone.jar rename to app/build/pithos/pithos-0.7.5-standalone.jar diff --git a/app_build/postfix/Dockerfile b/app/build/postfix/Dockerfile similarity index 100% rename from app_build/postfix/Dockerfile rename to app/build/postfix/Dockerfile diff --git a/app_build/postfix/README.md b/app/build/postfix/README.md similarity index 100% rename from app_build/postfix/README.md rename to app/build/postfix/README.md diff --git a/app_build/postfix/entrypoint.sh b/app/build/postfix/entrypoint.sh similarity index 100% rename from app_build/postfix/entrypoint.sh rename to app/build/postfix/entrypoint.sh diff --git a/app_build/postgres/Dockerfile b/app/build/postgres/Dockerfile similarity index 100% rename from app_build/postgres/Dockerfile rename to app/build/postgres/Dockerfile diff --git a/app_build/postgres/README.md b/app/build/postgres/README.md similarity index 100% rename from app_build/postgres/README.md rename to app/build/postgres/README.md diff --git a/app_build/postgres/postgresql.conf b/app/build/postgres/postgresql.conf similarity index 100% rename from app_build/postgres/postgresql.conf rename to app/build/postgres/postgresql.conf diff --git a/app_build/postgres/start.sh b/app/build/postgres/start.sh similarity index 100% rename from app_build/postgres/start.sh rename to app/build/postgres/start.sh diff --git a/app_build/riotweb/Dockerfile b/app/build/riotweb/Dockerfile similarity index 100% rename from app_build/riotweb/Dockerfile rename to app/build/riotweb/Dockerfile diff --git a/app_build/riotweb/config.json b/app/build/riotweb/config.json similarity index 100% rename from app_build/riotweb/config.json rename to app/build/riotweb/config.json diff --git a/app_build/seafile/Dockerfile b/app/build/seafile/Dockerfile similarity index 100% rename from app_build/seafile/Dockerfile rename to app/build/seafile/Dockerfile diff --git a/app_build/seafile/README.md b/app/build/seafile/README.md similarity index 100% rename from app_build/seafile/README.md rename to app/build/seafile/README.md diff --git a/app_build/seafile/seadocker b/app/build/seafile/seadocker similarity index 100% rename from app_build/seafile/seadocker rename to app/build/seafile/seadocker diff --git a/app_build/seafile/seaenv b/app/build/seafile/seaenv similarity index 100% rename from app_build/seafile/seaenv rename to app/build/seafile/seaenv diff --git a/app_build/sogo/Dockerfile b/app/build/sogo/Dockerfile similarity index 100% rename from app_build/sogo/Dockerfile rename to app/build/sogo/Dockerfile diff --git a/app_build/sogo/README.md b/app/build/sogo/README.md similarity index 100% rename from app_build/sogo/README.md rename to app/build/sogo/README.md diff --git a/app_build/sogo/entrypoint b/app/build/sogo/entrypoint similarity index 100% rename from app_build/sogo/entrypoint rename to app/build/sogo/entrypoint diff --git a/app_build/sogo/sogo.nginx.conf b/app/build/sogo/sogo.nginx.conf similarity index 100% rename from app_build/sogo/sogo.nginx.conf rename to app/build/sogo/sogo.nginx.conf diff --git a/app_build/static/Dockerfile b/app/build/static/Dockerfile similarity index 100% rename from app_build/static/Dockerfile rename to app/build/static/Dockerfile diff --git a/app_build/static/README.md b/app/build/static/README.md similarity index 100% rename from app_build/static/README.md rename to app/build/static/README.md diff --git a/app_build/static/goStatic b/app/build/static/goStatic similarity index 100% rename from app_build/static/goStatic rename to app/build/static/goStatic diff --git a/app_build/webpull/.gitignore b/app/build/webpull/.gitignore similarity index 100% rename from app_build/webpull/.gitignore rename to app/build/webpull/.gitignore diff --git a/app_build/webpull/Dockerfile.nodejs b/app/build/webpull/Dockerfile.nodejs similarity index 100% rename from app_build/webpull/Dockerfile.nodejs rename to app/build/webpull/Dockerfile.nodejs diff --git a/app_build/webpull/Dockerfile.ruby b/app/build/webpull/Dockerfile.ruby similarity index 100% rename from app_build/webpull/Dockerfile.ruby rename to app/build/webpull/Dockerfile.ruby diff --git a/app_build/webpull/README.md b/app/build/webpull/README.md similarity index 100% rename from app_build/webpull/README.md rename to app/build/webpull/README.md diff --git a/app_build/webpull/main.go b/app/build/webpull/main.go similarity index 100% rename from app_build/webpull/main.go rename to app/build/webpull/main.go diff --git a/app_config/configuration/.gitignore b/app/config/configuration/.gitignore similarity index 100% rename from app_config/configuration/.gitignore rename to app/config/configuration/.gitignore diff --git a/app_config/configuration/chat/coturn/turnserver.conf.tpl b/app/config/configuration/chat/coturn/turnserver.conf.tpl similarity index 100% rename from app_config/configuration/chat/coturn/turnserver.conf.tpl rename to app/config/configuration/chat/coturn/turnserver.conf.tpl diff --git a/app_config/configuration/chat/easybridge/config.json.tpl b/app/config/configuration/chat/easybridge/config.json.tpl similarity index 100% rename from app_config/configuration/chat/easybridge/config.json.tpl rename to app/config/configuration/chat/easybridge/config.json.tpl diff --git a/app_config/configuration/chat/easybridge/registration.yaml.tpl b/app/config/configuration/chat/easybridge/registration.yaml.tpl similarity index 100% rename from app_config/configuration/chat/easybridge/registration.yaml.tpl rename to app/config/configuration/chat/easybridge/registration.yaml.tpl diff --git a/app_config/configuration/chat/fb2mx/config.yaml b/app/config/configuration/chat/fb2mx/config.yaml similarity index 100% rename from app_config/configuration/chat/fb2mx/config.yaml rename to app/config/configuration/chat/fb2mx/config.yaml diff --git a/app_config/configuration/chat/fb2mx/registration.yaml b/app/config/configuration/chat/fb2mx/registration.yaml similarity index 100% rename from app_config/configuration/chat/fb2mx/registration.yaml rename to app/config/configuration/chat/fb2mx/registration.yaml diff --git a/app_config/configuration/chat/riot_web/config.json b/app/config/configuration/chat/riot_web/config.json similarity index 100% rename from app_config/configuration/chat/riot_web/config.json rename to app/config/configuration/chat/riot_web/config.json diff --git a/app_config/configuration/chat/synapse/conf.d/report_stats.yaml b/app/config/configuration/chat/synapse/conf.d/report_stats.yaml similarity index 100% rename from app_config/configuration/chat/synapse/conf.d/report_stats.yaml rename to app/config/configuration/chat/synapse/conf.d/report_stats.yaml diff --git a/app_config/configuration/chat/synapse/conf.d/server_name.yaml b/app/config/configuration/chat/synapse/conf.d/server_name.yaml similarity index 100% rename from app_config/configuration/chat/synapse/conf.d/server_name.yaml rename to app/config/configuration/chat/synapse/conf.d/server_name.yaml diff --git a/app_config/configuration/chat/synapse/homeserver.yaml b/app/config/configuration/chat/synapse/homeserver.yaml similarity index 100% rename from app_config/configuration/chat/synapse/homeserver.yaml rename to app/config/configuration/chat/synapse/homeserver.yaml diff --git a/app_config/configuration/chat/synapse/log.yaml b/app/config/configuration/chat/synapse/log.yaml similarity index 100% rename from app_config/configuration/chat/synapse/log.yaml rename to app/config/configuration/chat/synapse/log.yaml diff --git a/app_config/configuration/directory/bottin/config.json b/app/config/configuration/directory/bottin/config.json similarity index 100% rename from app_config/configuration/directory/bottin/config.json rename to app/config/configuration/directory/bottin/config.json diff --git a/app_config/configuration/directory/guichet/config.json.tpl b/app/config/configuration/directory/guichet/config.json.tpl similarity index 100% rename from app_config/configuration/directory/guichet/config.json.tpl rename to app/config/configuration/directory/guichet/config.json.tpl diff --git a/app_config/configuration/email/dkim/keytable b/app/config/configuration/email/dkim/keytable similarity index 100% rename from app_config/configuration/email/dkim/keytable rename to app/config/configuration/email/dkim/keytable diff --git a/app_config/configuration/email/dkim/signingtable b/app/config/configuration/email/dkim/signingtable similarity index 100% rename from app_config/configuration/email/dkim/signingtable rename to app/config/configuration/email/dkim/signingtable diff --git a/app_config/configuration/email/dkim/smtp.private.sample b/app/config/configuration/email/dkim/smtp.private.sample similarity index 100% rename from app_config/configuration/email/dkim/smtp.private.sample rename to app/config/configuration/email/dkim/smtp.private.sample diff --git a/app_config/configuration/email/dkim/smtp.txt.sample b/app/config/configuration/email/dkim/smtp.txt.sample similarity index 100% rename from app_config/configuration/email/dkim/smtp.txt.sample rename to app/config/configuration/email/dkim/smtp.txt.sample diff --git a/app_config/configuration/email/dkim/trusted b/app/config/configuration/email/dkim/trusted similarity index 100% rename from app_config/configuration/email/dkim/trusted rename to app/config/configuration/email/dkim/trusted diff --git a/app_config/configuration/email/dovecot/certs.gen b/app/config/configuration/email/dovecot/certs.gen similarity index 100% rename from app_config/configuration/email/dovecot/certs.gen rename to app/config/configuration/email/dovecot/certs.gen diff --git a/app_config/configuration/email/dovecot/dovecot-ldap.conf.tpl b/app/config/configuration/email/dovecot/dovecot-ldap.conf.tpl similarity index 100% rename from app_config/configuration/email/dovecot/dovecot-ldap.conf.tpl rename to app/config/configuration/email/dovecot/dovecot-ldap.conf.tpl diff --git a/app_config/configuration/email/postfix/certs.gen b/app/config/configuration/email/postfix/certs.gen similarity index 100% rename from app_config/configuration/email/postfix/certs.gen rename to app/config/configuration/email/postfix/certs.gen diff --git a/app_config/configuration/email/postfix/dynamicmaps.cf b/app/config/configuration/email/postfix/dynamicmaps.cf similarity index 100% rename from app_config/configuration/email/postfix/dynamicmaps.cf rename to app/config/configuration/email/postfix/dynamicmaps.cf diff --git a/app_config/configuration/email/postfix/header_checks b/app/config/configuration/email/postfix/header_checks similarity index 100% rename from app_config/configuration/email/postfix/header_checks rename to app/config/configuration/email/postfix/header_checks diff --git a/app_config/configuration/email/postfix/ldap-account.cf.tpl b/app/config/configuration/email/postfix/ldap-account.cf.tpl similarity index 100% rename from app_config/configuration/email/postfix/ldap-account.cf.tpl rename to app/config/configuration/email/postfix/ldap-account.cf.tpl diff --git a/app_config/configuration/email/postfix/ldap-alias.cf.tpl b/app/config/configuration/email/postfix/ldap-alias.cf.tpl similarity index 100% rename from app_config/configuration/email/postfix/ldap-alias.cf.tpl rename to app/config/configuration/email/postfix/ldap-alias.cf.tpl diff --git a/app_config/configuration/email/postfix/ldap-virtual-domains.cf.tpl b/app/config/configuration/email/postfix/ldap-virtual-domains.cf.tpl similarity index 100% rename from app_config/configuration/email/postfix/ldap-virtual-domains.cf.tpl rename to app/config/configuration/email/postfix/ldap-virtual-domains.cf.tpl diff --git a/app_config/configuration/email/postfix/main.cf b/app/config/configuration/email/postfix/main.cf similarity index 100% rename from app_config/configuration/email/postfix/main.cf rename to app/config/configuration/email/postfix/main.cf diff --git a/app_config/configuration/email/postfix/master.cf b/app/config/configuration/email/postfix/master.cf similarity index 100% rename from app_config/configuration/email/postfix/master.cf rename to app/config/configuration/email/postfix/master.cf diff --git a/app_config/configuration/email/postfix/transport b/app/config/configuration/email/postfix/transport similarity index 100% rename from app_config/configuration/email/postfix/transport rename to app/config/configuration/email/postfix/transport diff --git a/app_config/configuration/email/postfix/transport.db b/app/config/configuration/email/postfix/transport.db similarity index 100% rename from app_config/configuration/email/postfix/transport.db rename to app/config/configuration/email/postfix/transport.db diff --git a/app_config/configuration/email/sogo/sogo.conf.tpl b/app/config/configuration/email/sogo/sogo.conf.tpl similarity index 100% rename from app_config/configuration/email/sogo/sogo.conf.tpl rename to app/config/configuration/email/sogo/sogo.conf.tpl diff --git a/app_config/configuration/mariadb/main/env.tpl b/app/config/configuration/mariadb/main/env.tpl similarity index 100% rename from app_config/configuration/mariadb/main/env.tpl rename to app/config/configuration/mariadb/main/env.tpl diff --git a/app_config/configuration/nextcloud/config.php.tpl b/app/config/configuration/nextcloud/config.php.tpl similarity index 100% rename from app_config/configuration/nextcloud/config.php.tpl rename to app/config/configuration/nextcloud/config.php.tpl diff --git a/app_config/configuration/postgres/keeper/env.tpl b/app/config/configuration/postgres/keeper/env.tpl similarity index 100% rename from app_config/configuration/postgres/keeper/env.tpl rename to app/config/configuration/postgres/keeper/env.tpl diff --git a/app_config/configuration/seafile/ccnet/mykey.peer.sample b/app/config/configuration/seafile/ccnet/mykey.peer.sample similarity index 100% rename from app_config/configuration/seafile/ccnet/mykey.peer.sample rename to app/config/configuration/seafile/ccnet/mykey.peer.sample diff --git a/app_config/configuration/seafile/ccnet/seafile.ini b/app/config/configuration/seafile/ccnet/seafile.ini similarity index 100% rename from app_config/configuration/seafile/ccnet/seafile.ini rename to app/config/configuration/seafile/ccnet/seafile.ini diff --git a/app_config/configuration/seafile/conf/ccnet.conf.tpl b/app/config/configuration/seafile/conf/ccnet.conf.tpl similarity index 100% rename from app_config/configuration/seafile/conf/ccnet.conf.tpl rename to app/config/configuration/seafile/conf/ccnet.conf.tpl diff --git a/app_config/configuration/seafile/conf/mykey.peer.sample b/app/config/configuration/seafile/conf/mykey.peer.sample similarity index 100% rename from app_config/configuration/seafile/conf/mykey.peer.sample rename to app/config/configuration/seafile/conf/mykey.peer.sample diff --git a/app_config/configuration/seafile/conf/seafdav.conf b/app/config/configuration/seafile/conf/seafdav.conf similarity index 100% rename from app_config/configuration/seafile/conf/seafdav.conf rename to app/config/configuration/seafile/conf/seafdav.conf diff --git a/app_config/configuration/seafile/conf/seafile.conf.tpl b/app/config/configuration/seafile/conf/seafile.conf.tpl similarity index 100% rename from app_config/configuration/seafile/conf/seafile.conf.tpl rename to app/config/configuration/seafile/conf/seafile.conf.tpl diff --git a/app_config/configuration/seafile/conf/seahub_settings.py.tpl b/app/config/configuration/seafile/conf/seahub_settings.py.tpl similarity index 100% rename from app_config/configuration/seafile/conf/seahub_settings.py.tpl rename to app/config/configuration/seafile/conf/seahub_settings.py.tpl diff --git a/app_config/configuration/traefik/traefik.toml b/app/config/configuration/traefik/traefik.toml similarity index 100% rename from app_config/configuration/traefik/traefik.toml rename to app/config/configuration/traefik/traefik.toml diff --git a/app_config/restore_configuration.sh b/app/config/restore_configuration.sh similarity index 100% rename from app_config/restore_configuration.sh rename to app/config/restore_configuration.sh diff --git a/app_config/secrets/.gitignore b/app/config/secrets/.gitignore similarity index 100% rename from app_config/secrets/.gitignore rename to app/config/secrets/.gitignore diff --git a/app_config/secrets/chat/coturn/static-auth.sample b/app/config/secrets/chat/coturn/static-auth.sample similarity index 100% rename from app_config/secrets/chat/coturn/static-auth.sample rename to app/config/secrets/chat/coturn/static-auth.sample diff --git a/app_config/secrets/chat/fb2mx/as_token.sample b/app/config/secrets/chat/fb2mx/as_token.sample similarity index 100% rename from app_config/secrets/chat/fb2mx/as_token.sample rename to app/config/secrets/chat/fb2mx/as_token.sample diff --git a/app_config/secrets/chat/fb2mx/db_url.sample b/app/config/secrets/chat/fb2mx/db_url.sample similarity index 100% rename from app_config/secrets/chat/fb2mx/db_url.sample rename to app/config/secrets/chat/fb2mx/db_url.sample diff --git a/app_config/secrets/chat/fb2mx/hs_token.sample b/app/config/secrets/chat/fb2mx/hs_token.sample similarity index 100% rename from app_config/secrets/chat/fb2mx/hs_token.sample rename to app/config/secrets/chat/fb2mx/hs_token.sample diff --git a/app_config/secrets/chat/synapse/homeserver.tls.crt.sample b/app/config/secrets/chat/synapse/homeserver.tls.crt.sample similarity index 100% rename from app_config/secrets/chat/synapse/homeserver.tls.crt.sample rename to app/config/secrets/chat/synapse/homeserver.tls.crt.sample diff --git a/app_config/secrets/chat/synapse/homeserver.tls.dh.sample b/app/config/secrets/chat/synapse/homeserver.tls.dh.sample similarity index 100% rename from app_config/secrets/chat/synapse/homeserver.tls.dh.sample rename to app/config/secrets/chat/synapse/homeserver.tls.dh.sample diff --git a/app_config/secrets/chat/synapse/homeserver.tls.key.sample b/app/config/secrets/chat/synapse/homeserver.tls.key.sample similarity index 100% rename from app_config/secrets/chat/synapse/homeserver.tls.key.sample rename to app/config/secrets/chat/synapse/homeserver.tls.key.sample diff --git a/app_config/secrets/chat/synapse/ldap_binddn.sample b/app/config/secrets/chat/synapse/ldap_binddn.sample similarity index 100% rename from app_config/secrets/chat/synapse/ldap_binddn.sample rename to app/config/secrets/chat/synapse/ldap_binddn.sample diff --git a/app_config/secrets/chat/synapse/ldap_bindpw.sample b/app/config/secrets/chat/synapse/ldap_bindpw.sample similarity index 100% rename from app_config/secrets/chat/synapse/ldap_bindpw.sample rename to app/config/secrets/chat/synapse/ldap_bindpw.sample diff --git a/app_config/secrets/chat/synapse/postgres_db.sample b/app/config/secrets/chat/synapse/postgres_db.sample similarity index 100% rename from app_config/secrets/chat/synapse/postgres_db.sample rename to app/config/secrets/chat/synapse/postgres_db.sample diff --git a/app_config/secrets/chat/synapse/postgres_pwd.sample b/app/config/secrets/chat/synapse/postgres_pwd.sample similarity index 100% rename from app_config/secrets/chat/synapse/postgres_pwd.sample rename to app/config/secrets/chat/synapse/postgres_pwd.sample diff --git a/app_config/secrets/chat/synapse/postgres_user.sample b/app/config/secrets/chat/synapse/postgres_user.sample similarity index 100% rename from app_config/secrets/chat/synapse/postgres_user.sample rename to app/config/secrets/chat/synapse/postgres_user.sample diff --git a/app_config/secrets/chat/synapse/registration_shared_secret.sample b/app/config/secrets/chat/synapse/registration_shared_secret.sample similarity index 100% rename from app_config/secrets/chat/synapse/registration_shared_secret.sample rename to app/config/secrets/chat/synapse/registration_shared_secret.sample diff --git a/app_config/secrets/email/sogo/ldap_binddn.sample b/app/config/secrets/email/sogo/ldap_binddn.sample similarity index 100% rename from app_config/secrets/email/sogo/ldap_binddn.sample rename to app/config/secrets/email/sogo/ldap_binddn.sample diff --git a/app_config/secrets/email/sogo/ldap_bindpw.sample b/app/config/secrets/email/sogo/ldap_bindpw.sample similarity index 100% rename from app_config/secrets/email/sogo/ldap_bindpw.sample rename to app/config/secrets/email/sogo/ldap_bindpw.sample diff --git a/app_config/secrets/email/sogo/postgre_auth.sample b/app/config/secrets/email/sogo/postgre_auth.sample similarity index 100% rename from app_config/secrets/email/sogo/postgre_auth.sample rename to app/config/secrets/email/sogo/postgre_auth.sample diff --git a/app_config/secrets/jitsi/auth.jitsi.deuxfleurs.fr.crt.sample b/app/config/secrets/jitsi/auth.jitsi.deuxfleurs.fr.crt.sample similarity index 100% rename from app_config/secrets/jitsi/auth.jitsi.deuxfleurs.fr.crt.sample rename to app/config/secrets/jitsi/auth.jitsi.deuxfleurs.fr.crt.sample diff --git a/app_config/secrets/jitsi/auth.jitsi.deuxfleurs.fr.key.sample b/app/config/secrets/jitsi/auth.jitsi.deuxfleurs.fr.key.sample similarity index 100% rename from app_config/secrets/jitsi/auth.jitsi.deuxfleurs.fr.key.sample rename to app/config/secrets/jitsi/auth.jitsi.deuxfleurs.fr.key.sample diff --git a/app_config/secrets/jitsi/global_env.sample b/app/config/secrets/jitsi/global_env.sample similarity index 100% rename from app_config/secrets/jitsi/global_env.sample rename to app/config/secrets/jitsi/global_env.sample diff --git a/app_config/secrets/jitsi/jitsi.deuxfleurs.fr.crt.sample b/app/config/secrets/jitsi/jitsi.deuxfleurs.fr.crt.sample similarity index 100% rename from app_config/secrets/jitsi/jitsi.deuxfleurs.fr.crt.sample rename to app/config/secrets/jitsi/jitsi.deuxfleurs.fr.crt.sample diff --git a/app_config/secrets/jitsi/jitsi.deuxfleurs.fr.key.sample b/app/config/secrets/jitsi/jitsi.deuxfleurs.fr.key.sample similarity index 100% rename from app_config/secrets/jitsi/jitsi.deuxfleurs.fr.key.sample rename to app/config/secrets/jitsi/jitsi.deuxfleurs.fr.key.sample diff --git a/app_config/secrets/mariadb/main/ldap_binddn.sample b/app/config/secrets/mariadb/main/ldap_binddn.sample similarity index 100% rename from app_config/secrets/mariadb/main/ldap_binddn.sample rename to app/config/secrets/mariadb/main/ldap_binddn.sample diff --git a/app_config/secrets/mariadb/main/ldap_bindpwd.sample b/app/config/secrets/mariadb/main/ldap_bindpwd.sample similarity index 100% rename from app_config/secrets/mariadb/main/ldap_bindpwd.sample rename to app/config/secrets/mariadb/main/ldap_bindpwd.sample diff --git a/app_config/secrets/mariadb/main/mysql_pwd.sample b/app/config/secrets/mariadb/main/mysql_pwd.sample similarity index 100% rename from app_config/secrets/mariadb/main/mysql_pwd.sample rename to app/config/secrets/mariadb/main/mysql_pwd.sample diff --git a/app_config/secrets/platoo/bddpw.sample b/app/config/secrets/platoo/bddpw.sample similarity index 100% rename from app_config/secrets/platoo/bddpw.sample rename to app/config/secrets/platoo/bddpw.sample diff --git a/app_config/secrets/postgres/keeper/pg_repl_pwd.sample b/app/config/secrets/postgres/keeper/pg_repl_pwd.sample similarity index 100% rename from app_config/secrets/postgres/keeper/pg_repl_pwd.sample rename to app/config/secrets/postgres/keeper/pg_repl_pwd.sample diff --git a/app_config/secrets/postgres/keeper/pg_repl_username.sample b/app/config/secrets/postgres/keeper/pg_repl_username.sample similarity index 100% rename from app_config/secrets/postgres/keeper/pg_repl_username.sample rename to app/config/secrets/postgres/keeper/pg_repl_username.sample diff --git a/app_config/secrets/postgres/keeper/pg_su_pwd.sample b/app/config/secrets/postgres/keeper/pg_su_pwd.sample similarity index 100% rename from app_config/secrets/postgres/keeper/pg_su_pwd.sample rename to app/config/secrets/postgres/keeper/pg_su_pwd.sample diff --git a/app_config/secrets/web/home_token.sample b/app/config/secrets/web/home_token.sample similarity index 100% rename from app_config/secrets/web/home_token.sample rename to app/config/secrets/web/home_token.sample diff --git a/app_config/secrets/web/quentin.dufour.io_token.sample b/app/config/secrets/web/quentin.dufour.io_token.sample similarity index 100% rename from app_config/secrets/web/quentin.dufour.io_token.sample rename to app/config/secrets/web/quentin.dufour.io_token.sample diff --git a/app_deployment/bottin2.hcl b/app/deployment/bottin2.hcl similarity index 100% rename from app_deployment/bottin2.hcl rename to app/deployment/bottin2.hcl diff --git a/app_deployment/core.hcl b/app/deployment/core.hcl similarity index 100% rename from app_deployment/core.hcl rename to app/deployment/core.hcl diff --git a/app_deployment/email.hcl b/app/deployment/email.hcl similarity index 100% rename from app_deployment/email.hcl rename to app/deployment/email.hcl diff --git a/app_deployment/garage.hcl b/app/deployment/garage.hcl similarity index 100% rename from app_deployment/garage.hcl rename to app/deployment/garage.hcl diff --git a/app_deployment/im.hcl b/app/deployment/im.hcl similarity index 100% rename from app_deployment/im.hcl rename to app/deployment/im.hcl diff --git a/app_deployment/jitsi.hcl b/app/deployment/jitsi.hcl similarity index 100% rename from app_deployment/jitsi.hcl rename to app/deployment/jitsi.hcl diff --git a/app_deployment/mariadb.hcl b/app/deployment/mariadb.hcl similarity index 100% rename from app_deployment/mariadb.hcl rename to app/deployment/mariadb.hcl diff --git a/app_deployment/nextcloud.hcl b/app/deployment/nextcloud.hcl similarity index 100% rename from app_deployment/nextcloud.hcl rename to app/deployment/nextcloud.hcl diff --git a/app_deployment/object_storage.hcl b/app/deployment/object_storage.hcl similarity index 100% rename from app_deployment/object_storage.hcl rename to app/deployment/object_storage.hcl diff --git a/app_deployment/platoo.hcl b/app/deployment/platoo.hcl similarity index 100% rename from app_deployment/platoo.hcl rename to app/deployment/platoo.hcl diff --git a/app_deployment/postgres.hcl b/app/deployment/postgres.hcl similarity index 100% rename from app_deployment/postgres.hcl rename to app/deployment/postgres.hcl diff --git a/app_deployment/science.hcl b/app/deployment/science.hcl similarity index 100% rename from app_deployment/science.hcl rename to app/deployment/science.hcl diff --git a/app_deployment/seafile.hcl b/app/deployment/seafile.hcl similarity index 100% rename from app_deployment/seafile.hcl rename to app/deployment/seafile.hcl diff --git a/app_deployment/traefik.hcl b/app/deployment/traefik.hcl similarity index 100% rename from app_deployment/traefik.hcl rename to app/deployment/traefik.hcl diff --git a/app_deployment/web_static.hcl b/app/deployment/web_static.hcl similarity index 100% rename from app_deployment/web_static.hcl rename to app/deployment/web_static.hcl diff --git a/app_deployment/webcap.hcl b/app/deployment/webcap.hcl similarity index 100% rename from app_deployment/webcap.hcl rename to app/deployment/webcap.hcl diff --git a/app_integration/jitsi/01_gen_certs.yml b/app/integration/jitsi/01_gen_certs.yml similarity index 100% rename from app_integration/jitsi/01_gen_certs.yml rename to app/integration/jitsi/01_gen_certs.yml diff --git a/app_integration/jitsi/02_run.yml b/app/integration/jitsi/02_run.yml similarity index 100% rename from app_integration/jitsi/02_run.yml rename to app/integration/jitsi/02_run.yml diff --git a/app_integration/jitsi/README.md b/app/integration/jitsi/README.md similarity index 100% rename from app_integration/jitsi/README.md rename to app/integration/jitsi/README.md diff --git a/app_integration/jitsi/dev.env b/app/integration/jitsi/dev.env similarity index 100% rename from app_integration/jitsi/dev.env rename to app/integration/jitsi/dev.env diff --git a/app_integration/jitsi/jitsi-certs/.gitignore b/app/integration/jitsi/jitsi-certs/.gitignore similarity index 100% rename from app_integration/jitsi/jitsi-certs/.gitignore rename to app/integration/jitsi/jitsi-certs/.gitignore diff --git a/os_build/README.md b/os/build/README.md similarity index 100% rename from os_build/README.md rename to os/build/README.md diff --git a/os_build/build-installer.sh b/os/build/build-installer.sh similarity index 100% rename from os_build/build-installer.sh rename to os/build/build-installer.sh diff --git a/os_config/README.md b/os/config/README.md similarity index 100% rename from os_config/README.md rename to os/config/README.md diff --git a/os_config/README.more.md b/os/config/README.more.md similarity index 100% rename from os_config/README.more.md rename to os/config/README.more.md diff --git a/os_config/cluster_nodes.yml b/os/config/cluster_nodes.yml similarity index 100% rename from os_config/cluster_nodes.yml rename to os/config/cluster_nodes.yml diff --git a/os_config/group_vars/all/.gitignore b/os/config/group_vars/all/.gitignore similarity index 100% rename from os_config/group_vars/all/.gitignore rename to os/config/group_vars/all/.gitignore diff --git a/os_config/group_vars/all/vars_file.yml.sample b/os/config/group_vars/all/vars_file.yml.sample similarity index 100% rename from os_config/group_vars/all/vars_file.yml.sample rename to os/config/group_vars/all/vars_file.yml.sample diff --git a/os_config/production b/os/config/production similarity index 100% rename from os_config/production rename to os/config/production diff --git a/os_config/roles/common/tasks/main.yml b/os/config/roles/common/tasks/main.yml similarity index 100% rename from os_config/roles/common/tasks/main.yml rename to os/config/roles/common/tasks/main.yml diff --git a/os_config/roles/consul/files/consul.service b/os/config/roles/consul/files/consul.service similarity index 100% rename from os_config/roles/consul/files/consul.service rename to os/config/roles/consul/files/consul.service diff --git a/os_config/roles/consul/tasks/main.yml b/os/config/roles/consul/tasks/main.yml similarity index 100% rename from os_config/roles/consul/tasks/main.yml rename to os/config/roles/consul/tasks/main.yml diff --git a/os_config/roles/consul/templates/consul.json.j2 b/os/config/roles/consul/templates/consul.json.j2 similarity index 100% rename from os_config/roles/consul/templates/consul.json.j2 rename to os/config/roles/consul/templates/consul.json.j2 diff --git a/os_config/roles/consul/templates/resolv.conf.j2 b/os/config/roles/consul/templates/resolv.conf.j2 similarity index 100% rename from os_config/roles/consul/templates/resolv.conf.j2 rename to os/config/roles/consul/templates/resolv.conf.j2 diff --git a/os_config/roles/consul/vars/.gitignore b/os/config/roles/consul/vars/.gitignore similarity index 100% rename from os_config/roles/consul/vars/.gitignore rename to os/config/roles/consul/vars/.gitignore diff --git a/os_config/roles/consul/vars/main.yml.sample b/os/config/roles/consul/vars/main.yml.sample similarity index 100% rename from os_config/roles/consul/vars/main.yml.sample rename to os/config/roles/consul/vars/main.yml.sample diff --git a/os_config/roles/network/files/rules.v6 b/os/config/roles/network/files/rules.v6 similarity index 100% rename from os_config/roles/network/files/rules.v6 rename to os/config/roles/network/files/rules.v6 diff --git a/os_config/roles/network/tasks/main.yml b/os/config/roles/network/tasks/main.yml similarity index 100% rename from os_config/roles/network/tasks/main.yml rename to os/config/roles/network/tasks/main.yml diff --git a/os_config/roles/network/templates/rules.v4.j2 b/os/config/roles/network/templates/rules.v4.j2 similarity index 100% rename from os_config/roles/network/templates/rules.v4.j2 rename to os/config/roles/network/templates/rules.v4.j2 diff --git a/os_config/roles/nomad/files/nomad.service b/os/config/roles/nomad/files/nomad.service similarity index 100% rename from os_config/roles/nomad/files/nomad.service rename to os/config/roles/nomad/files/nomad.service diff --git a/os_config/roles/nomad/tasks/main.yml b/os/config/roles/nomad/tasks/main.yml similarity index 100% rename from os_config/roles/nomad/tasks/main.yml rename to os/config/roles/nomad/tasks/main.yml diff --git a/os_config/roles/nomad/templates/nomad.hcl.j2 b/os/config/roles/nomad/templates/nomad.hcl.j2 similarity index 100% rename from os_config/roles/nomad/templates/nomad.hcl.j2 rename to os/config/roles/nomad/templates/nomad.hcl.j2 diff --git a/os_config/roles/storage/handlers/main.yml b/os/config/roles/storage/handlers/main.yml similarity index 100% rename from os_config/roles/storage/handlers/main.yml rename to os/config/roles/storage/handlers/main.yml diff --git a/os_config/roles/storage/tasks/main.yml b/os/config/roles/storage/tasks/main.yml similarity index 100% rename from os_config/roles/storage/tasks/main.yml rename to os/config/roles/storage/tasks/main.yml diff --git a/os_config/roles/users/files/alex-key1.pub b/os/config/roles/users/files/alex-key1.pub similarity index 100% rename from os_config/roles/users/files/alex-key1.pub rename to os/config/roles/users/files/alex-key1.pub diff --git a/os_config/roles/users/files/alex-key2.pub b/os/config/roles/users/files/alex-key2.pub similarity index 100% rename from os_config/roles/users/files/alex-key2.pub rename to os/config/roles/users/files/alex-key2.pub diff --git a/os_config/roles/users/files/florian-key1.pub b/os/config/roles/users/files/florian-key1.pub similarity index 100% rename from os_config/roles/users/files/florian-key1.pub rename to os/config/roles/users/files/florian-key1.pub diff --git a/os_config/roles/users/files/florian-key2.pub b/os/config/roles/users/files/florian-key2.pub similarity index 100% rename from os_config/roles/users/files/florian-key2.pub rename to os/config/roles/users/files/florian-key2.pub diff --git a/os_config/roles/users/files/maximilien-key1.pub b/os/config/roles/users/files/maximilien-key1.pub similarity index 100% rename from os_config/roles/users/files/maximilien-key1.pub rename to os/config/roles/users/files/maximilien-key1.pub diff --git a/os_config/roles/users/files/quentin-key1.pub b/os/config/roles/users/files/quentin-key1.pub similarity index 100% rename from os_config/roles/users/files/quentin-key1.pub rename to os/config/roles/users/files/quentin-key1.pub diff --git a/os_config/roles/users/files/quentin-key2.pub b/os/config/roles/users/files/quentin-key2.pub similarity index 100% rename from os_config/roles/users/files/quentin-key2.pub rename to os/config/roles/users/files/quentin-key2.pub diff --git a/os_config/roles/users/tasks/main.yml b/os/config/roles/users/tasks/main.yml similarity index 100% rename from os_config/roles/users/tasks/main.yml rename to os/config/roles/users/tasks/main.yml diff --git a/os_config/roles/users/vars/main.yml b/os/config/roles/users/vars/main.yml similarity index 100% rename from os_config/roles/users/vars/main.yml rename to os/config/roles/users/vars/main.yml diff --git a/os_config/site.yml b/os/config/site.yml similarity index 100% rename from os_config/site.yml rename to os/config/site.yml