From c4a6cf1534b864d3941c839d4a4dca7e505bd828 Mon Sep 17 00:00:00 2001 From: Quentin Date: Sat, 12 Sep 2020 10:03:48 +0200 Subject: [PATCH 01/14] Rebase first step --- .gitmodules | 2 +- README.md | 15 ++++- {docker => app_build}/README.md | 0 {docker => app_build}/blog-quentin/.dockerenv | 0 {docker => app_build}/blog-quentin/Dockerfile | 0 {docker => app_build}/blog-quentin/README.md | 0 {docker => app_build}/coturn/Dockerfile | 0 {docker => app_build}/coturn/README.md | 0 app_build/docker-compose.yml | 60 ++++++++++++++++++ {docker => app_build}/dovecot/.gitignore | 0 {docker => app_build}/dovecot/Dockerfile | 0 {docker => app_build}/dovecot/README.md | 0 {docker => app_build}/dovecot/entrypoint.sh | 0 .../jitsi-conference-focus/Dockerfile | 2 +- .../jitsi-conference-focus/jicofo | 0 .../jitsi-meet}/Dockerfile | 2 +- .../jitsi-meet}/config.js | 0 .../jitsi-meet}/entrypoint.sh | 0 .../jitsi-videobridge/Dockerfile | 2 +- .../jitsi-videobridge/jvb_run | 0 .../jitsi => app_build}/jitsi-xmpp/Dockerfile | 0 .../jitsi-xmpp/external_components.cfg.lua | 0 .../jitsi => app_build}/jitsi-xmpp/xmpp_conf | 0 .../jitsi => app_build}/jitsi-xmpp/xmpp_gen | 0 .../jitsi => app_build}/jitsi-xmpp/xmpp_run | 0 {docker => app_build}/landing/README.md | 0 .../mariadb/60-disable-dialog.cnf | 0 {docker => app_build}/mariadb/60-ldap.cnf | 0 {docker => app_build}/mariadb/60-remote.cnf | 0 {docker => app_build}/mariadb/Dockerfile | 0 {docker => app_build}/mariadb/README.md | 0 {docker => app_build}/mariadb/entrypoint.sh | 0 {docker => app_build}/mariadb/nsswitch.conf | 0 {docker => app_build}/mariadb/pam-mariadb | 0 .../matrix-synapse/Dockerfile | 0 .../matrix-synapse/entrypoint.sh | 0 {docker => app_build}/nextcloud/Dockerfile | 0 .../nextcloud/container-setup.sh | 0 {docker => app_build}/nextcloud/entrypoint.sh | 0 {docker => app_build}/opendkim/Dockerfile | 0 {docker => app_build}/opendkim/README.md | 0 {docker => app_build}/opendkim/opendkim.conf | 0 {docker => app_build}/pithos/0.7.5.tar.gz | Bin {docker => app_build}/pithos/Dockerfile | 0 {docker => app_build}/pithos/README.md | 0 .../pithos/pithos-0.7.5-standalone.jar | Bin {docker => app_build}/postfix/Dockerfile | 0 {docker => app_build}/postfix/README.md | 0 {docker => app_build}/postfix/entrypoint.sh | 0 {docker => app_build}/postgres/Dockerfile | 0 {docker => app_build}/postgres/README.md | 0 .../postgres/postgresql.conf | 0 {docker => app_build}/postgres/start.sh | 0 {docker => app_build}/riotweb/Dockerfile | 0 {docker => app_build}/riotweb/config.json | 0 {docker => app_build}/seafile/Dockerfile | 0 {docker => app_build}/seafile/README.md | 0 {docker => app_build}/seafile/seadocker | 0 {docker => app_build}/seafile/seaenv | 0 {docker => app_build}/sogo/Dockerfile | 0 {docker => app_build}/sogo/README.md | 0 {docker => app_build}/sogo/entrypoint | 0 {docker => app_build}/sogo/sogo.nginx.conf | 0 {docker => app_build}/static/Dockerfile | 0 {docker => app_build}/static/README.md | 0 {docker => app_build}/static/goStatic | 0 {docker => app_build}/webpull/.gitignore | 0 .../webpull/Dockerfile.nodejs | 0 {docker => app_build}/webpull/Dockerfile.ruby | 0 {docker => app_build}/webpull/README.md | 0 {docker => app_build}/webpull/main.go | 0 .../configuration/.gitignore | 0 .../chat/coturn/turnserver.conf.tpl | 0 .../chat/easybridge/config.json.tpl | 0 .../chat/easybridge/registration.yaml.tpl | 0 .../configuration/chat/fb2mx/config.yaml | 0 .../chat/fb2mx/registration.yaml | 0 .../configuration/chat/riot_web/config.json | 0 .../chat/synapse/conf.d/report_stats.yaml | 0 .../chat/synapse/conf.d/server_name.yaml | 0 .../chat/synapse/homeserver.yaml | 0 .../configuration/chat/synapse/log.yaml | 0 .../directory/bottin/config.json | 0 .../directory/guichet/config.json.tpl | 0 .../configuration/email/dkim/keytable | 0 .../configuration/email/dkim/signingtable | 0 .../email/dkim/smtp.private.sample | 0 .../configuration/email/dkim/smtp.txt.sample | 0 .../configuration/email/dkim/trusted | 0 .../configuration/email/dovecot/certs.gen | 0 .../email/dovecot/dovecot-ldap.conf.tpl | 0 .../configuration/email/postfix/certs.gen | 0 .../email/postfix/dynamicmaps.cf | 0 .../configuration/email/postfix/header_checks | 0 .../email/postfix/ldap-account.cf.tpl | 0 .../email/postfix/ldap-alias.cf.tpl | 0 .../email/postfix/ldap-virtual-domains.cf.tpl | 0 .../configuration/email/postfix/main.cf | 0 .../configuration/email/postfix/master.cf | 0 .../configuration/email/postfix/transport | 0 .../configuration/email/postfix/transport.db | Bin .../configuration/email/sogo/sogo.conf.tpl | 0 .../configuration/mariadb/main/env.tpl | 0 .../configuration/nextcloud/config.php.tpl | 0 .../configuration/postgres/keeper/env.tpl | 0 .../seafile/ccnet/mykey.peer.sample | 0 .../configuration/seafile/ccnet/seafile.ini | 0 .../configuration/seafile/conf/ccnet.conf.tpl | 0 .../seafile/conf/mykey.peer.sample | 0 .../configuration/seafile/conf/seafdav.conf | 0 .../seafile/conf/seafile.conf.tpl | 0 .../seafile/conf/seahub_settings.py.tpl | 0 .../configuration/traefik/traefik.toml | 0 .../restore_configuration.sh | 0 {consul => app_config}/secrets/.gitignore | 0 .../secrets/chat/coturn/static-auth.sample | 0 .../secrets/chat/fb2mx/as_token.sample | 0 .../secrets/chat/fb2mx/db_url.sample | 0 .../secrets/chat/fb2mx/hs_token.sample | 0 .../chat/synapse/homeserver.tls.crt.sample | 0 .../chat/synapse/homeserver.tls.dh.sample | 0 .../chat/synapse/homeserver.tls.key.sample | 0 .../secrets/chat/synapse/ldap_binddn.sample | 0 .../secrets/chat/synapse/ldap_bindpw.sample | 0 .../secrets/chat/synapse/postgres_db.sample | 0 .../secrets/chat/synapse/postgres_pwd.sample | 0 .../secrets/chat/synapse/postgres_user.sample | 0 .../synapse/registration_shared_secret.sample | 0 .../secrets/email/sogo/ldap_binddn.sample | 0 .../secrets/email/sogo/ldap_bindpw.sample | 0 .../secrets/email/sogo/postgre_auth.sample | 0 .../jitsi/auth.jitsi.deuxfleurs.fr.crt.sample | 0 .../jitsi/auth.jitsi.deuxfleurs.fr.key.sample | 0 .../secrets/jitsi/global_env.sample | 0 .../jitsi/jitsi.deuxfleurs.fr.crt.sample | 0 .../jitsi/jitsi.deuxfleurs.fr.key.sample | 0 .../secrets/mariadb/main/ldap_binddn.sample | 0 .../secrets/mariadb/main/ldap_bindpwd.sample | 0 .../secrets/mariadb/main/mysql_pwd.sample | 0 .../secrets/platoo/bddpw.sample | 0 .../postgres/keeper/pg_repl_pwd.sample | 0 .../postgres/keeper/pg_repl_username.sample | 0 .../secrets/postgres/keeper/pg_su_pwd.sample | 0 .../secrets/web/home_token.sample | 0 .../web/quentin.dufour.io_token.sample | 0 {nomad => app_deployment}/bottin2.hcl | 0 {nomad => app_deployment}/core.hcl | 0 {nomad => app_deployment}/email.hcl | 0 {nomad => app_deployment}/garage.hcl | 0 {nomad => app_deployment}/im.hcl | 0 {nomad => app_deployment}/jitsi.hcl | 0 {nomad => app_deployment}/mariadb.hcl | 0 {nomad => app_deployment}/nextcloud.hcl | 0 {nomad => app_deployment}/object_storage.hcl | 0 {nomad => app_deployment}/platoo.hcl | 0 {nomad => app_deployment}/postgres.hcl | 0 {nomad => app_deployment}/science.hcl | 0 {nomad => app_deployment}/seafile.hcl | 0 {nomad => app_deployment}/traefik.hcl | 0 {nomad => app_deployment}/web_static.hcl | 0 {nomad => app_deployment}/webcap.hcl | 0 .../jitsi/01_gen_certs.yml | 0 {docker => app_integration}/jitsi/02_run.yml | 0 {docker => app_integration}/jitsi/README.md | 0 {docker => app_integration}/jitsi/dev.env | 0 .../jitsi/jitsi-certs/.gitignore | 0 docker/docker-compose.yml | 24 ------- {man => op_guide}/create_database/README.md | 0 {man => op_guide}/init_stolon/README.md | 0 {man => op_guide}/nextcloud/README.md | 0 {bootstrap => os_build}/README.md | 0 {bootstrap => os_build}/build-installer.sh | 0 {ansible => os_config}/README.md | 0 {ansible => os_config}/README.more.md | 0 {ansible => os_config}/cluster_nodes.yml | 0 .../group_vars/all/.gitignore | 0 .../group_vars/all/vars_file.yml.sample | 0 {ansible => os_config}/production | 0 .../roles/common/tasks/main.yml | 0 .../roles/consul/files/consul.service | 0 .../roles/consul/tasks/main.yml | 0 .../roles/consul/templates/consul.json.j2 | 0 .../roles/consul/templates/resolv.conf.j2 | 0 .../roles/consul/vars/.gitignore | 0 .../roles/consul/vars/main.yml.sample | 0 .../roles/network/files/rules.v6 | 0 .../roles/network/tasks/main.yml | 0 .../roles/network/templates/rules.v4.j2 | 0 .../roles/nomad/files/nomad.service | 0 .../roles/nomad/tasks/main.yml | 0 .../roles/nomad/templates/nomad.hcl.j2 | 0 .../roles/storage/handlers/main.yml | 0 .../roles/storage/tasks/main.yml | 0 .../roles/users/files/alex-key1.pub | 0 .../roles/users/files/alex-key2.pub | 0 .../roles/users/files/florian-key1.pub | 0 .../roles/users/files/florian-key2.pub | 0 .../roles/users/files/maximilien-key1.pub | 0 .../roles/users/files/quentin-key1.pub | 0 .../roles/users/files/quentin-key2.pub | 0 .../roles/users/tasks/main.yml | 0 .../roles/users/vars/main.yml | 0 {ansible => os_config}/site.yml | 0 203 files changed, 78 insertions(+), 29 deletions(-) rename {docker => app_build}/README.md (100%) rename {docker => app_build}/blog-quentin/.dockerenv (100%) rename {docker => app_build}/blog-quentin/Dockerfile (100%) rename {docker => app_build}/blog-quentin/README.md (100%) rename {docker => app_build}/coturn/Dockerfile (100%) rename {docker => app_build}/coturn/README.md (100%) create mode 100644 app_build/docker-compose.yml rename {docker => app_build}/dovecot/.gitignore (100%) rename {docker => app_build}/dovecot/Dockerfile (100%) rename {docker => app_build}/dovecot/README.md (100%) rename {docker => app_build}/dovecot/entrypoint.sh (100%) rename {docker/jitsi => app_build}/jitsi-conference-focus/Dockerfile (97%) rename {docker/jitsi => app_build}/jitsi-conference-focus/jicofo (100%) rename {docker/jitsi/jitsi-front => app_build/jitsi-meet}/Dockerfile (98%) rename {docker/jitsi/jitsi-front => app_build/jitsi-meet}/config.js (100%) rename {docker/jitsi/jitsi-front => app_build/jitsi-meet}/entrypoint.sh (100%) rename {docker/jitsi => app_build}/jitsi-videobridge/Dockerfile (97%) rename {docker/jitsi => app_build}/jitsi-videobridge/jvb_run (100%) rename {docker/jitsi => app_build}/jitsi-xmpp/Dockerfile (100%) rename {docker/jitsi => app_build}/jitsi-xmpp/external_components.cfg.lua (100%) rename {docker/jitsi => app_build}/jitsi-xmpp/xmpp_conf (100%) rename {docker/jitsi => app_build}/jitsi-xmpp/xmpp_gen (100%) rename {docker/jitsi => app_build}/jitsi-xmpp/xmpp_run (100%) rename {docker => app_build}/landing/README.md (100%) rename {docker => app_build}/mariadb/60-disable-dialog.cnf (100%) rename {docker => app_build}/mariadb/60-ldap.cnf (100%) rename {docker => app_build}/mariadb/60-remote.cnf (100%) rename {docker => app_build}/mariadb/Dockerfile (100%) rename {docker => app_build}/mariadb/README.md (100%) rename {docker => app_build}/mariadb/entrypoint.sh (100%) rename {docker => app_build}/mariadb/nsswitch.conf (100%) rename {docker => app_build}/mariadb/pam-mariadb (100%) rename {docker => app_build}/matrix-synapse/Dockerfile (100%) rename {docker => app_build}/matrix-synapse/entrypoint.sh (100%) rename {docker => app_build}/nextcloud/Dockerfile (100%) rename {docker => app_build}/nextcloud/container-setup.sh (100%) rename {docker => app_build}/nextcloud/entrypoint.sh (100%) rename {docker => app_build}/opendkim/Dockerfile (100%) rename {docker => app_build}/opendkim/README.md (100%) rename {docker => app_build}/opendkim/opendkim.conf (100%) rename {docker => app_build}/pithos/0.7.5.tar.gz (100%) rename {docker => app_build}/pithos/Dockerfile (100%) rename {docker => app_build}/pithos/README.md (100%) rename {docker => app_build}/pithos/pithos-0.7.5-standalone.jar (100%) rename {docker => app_build}/postfix/Dockerfile (100%) rename {docker => app_build}/postfix/README.md (100%) rename {docker => app_build}/postfix/entrypoint.sh (100%) rename {docker => app_build}/postgres/Dockerfile (100%) rename {docker => app_build}/postgres/README.md (100%) rename {docker => app_build}/postgres/postgresql.conf (100%) rename {docker => app_build}/postgres/start.sh (100%) rename {docker => app_build}/riotweb/Dockerfile (100%) rename {docker => app_build}/riotweb/config.json (100%) rename {docker => app_build}/seafile/Dockerfile (100%) rename {docker => app_build}/seafile/README.md (100%) rename {docker => app_build}/seafile/seadocker (100%) rename {docker => app_build}/seafile/seaenv (100%) rename {docker => app_build}/sogo/Dockerfile (100%) rename {docker => app_build}/sogo/README.md (100%) rename {docker => app_build}/sogo/entrypoint (100%) rename {docker => app_build}/sogo/sogo.nginx.conf (100%) rename {docker => app_build}/static/Dockerfile (100%) rename {docker => app_build}/static/README.md (100%) rename {docker => app_build}/static/goStatic (100%) rename {docker => app_build}/webpull/.gitignore (100%) rename {docker => app_build}/webpull/Dockerfile.nodejs (100%) rename {docker => app_build}/webpull/Dockerfile.ruby (100%) rename {docker => app_build}/webpull/README.md (100%) rename {docker => app_build}/webpull/main.go (100%) rename {consul => app_config}/configuration/.gitignore (100%) rename {consul => app_config}/configuration/chat/coturn/turnserver.conf.tpl (100%) rename {consul => app_config}/configuration/chat/easybridge/config.json.tpl (100%) rename {consul => app_config}/configuration/chat/easybridge/registration.yaml.tpl (100%) rename {consul => app_config}/configuration/chat/fb2mx/config.yaml (100%) rename {consul => app_config}/configuration/chat/fb2mx/registration.yaml (100%) rename {consul => app_config}/configuration/chat/riot_web/config.json (100%) rename {consul => app_config}/configuration/chat/synapse/conf.d/report_stats.yaml (100%) rename {consul => app_config}/configuration/chat/synapse/conf.d/server_name.yaml (100%) rename {consul => app_config}/configuration/chat/synapse/homeserver.yaml (100%) rename {consul => app_config}/configuration/chat/synapse/log.yaml (100%) rename {consul => app_config}/configuration/directory/bottin/config.json (100%) rename {consul => app_config}/configuration/directory/guichet/config.json.tpl (100%) rename {consul => app_config}/configuration/email/dkim/keytable (100%) rename {consul => app_config}/configuration/email/dkim/signingtable (100%) rename {consul => app_config}/configuration/email/dkim/smtp.private.sample (100%) rename {consul => app_config}/configuration/email/dkim/smtp.txt.sample (100%) rename {consul => app_config}/configuration/email/dkim/trusted (100%) rename {consul => app_config}/configuration/email/dovecot/certs.gen (100%) rename {consul => app_config}/configuration/email/dovecot/dovecot-ldap.conf.tpl (100%) rename {consul => app_config}/configuration/email/postfix/certs.gen (100%) rename {consul => app_config}/configuration/email/postfix/dynamicmaps.cf (100%) rename {consul => app_config}/configuration/email/postfix/header_checks (100%) rename {consul => app_config}/configuration/email/postfix/ldap-account.cf.tpl (100%) rename {consul => app_config}/configuration/email/postfix/ldap-alias.cf.tpl (100%) rename {consul => app_config}/configuration/email/postfix/ldap-virtual-domains.cf.tpl (100%) rename {consul => app_config}/configuration/email/postfix/main.cf (100%) rename {consul => app_config}/configuration/email/postfix/master.cf (100%) rename {consul => app_config}/configuration/email/postfix/transport (100%) rename {consul => app_config}/configuration/email/postfix/transport.db (100%) rename {consul => app_config}/configuration/email/sogo/sogo.conf.tpl (100%) rename {consul => app_config}/configuration/mariadb/main/env.tpl (100%) rename {consul => app_config}/configuration/nextcloud/config.php.tpl (100%) rename {consul => app_config}/configuration/postgres/keeper/env.tpl (100%) rename {consul => app_config}/configuration/seafile/ccnet/mykey.peer.sample (100%) rename {consul => app_config}/configuration/seafile/ccnet/seafile.ini (100%) rename {consul => app_config}/configuration/seafile/conf/ccnet.conf.tpl (100%) rename {consul => app_config}/configuration/seafile/conf/mykey.peer.sample (100%) rename {consul => app_config}/configuration/seafile/conf/seafdav.conf (100%) rename {consul => app_config}/configuration/seafile/conf/seafile.conf.tpl (100%) rename {consul => app_config}/configuration/seafile/conf/seahub_settings.py.tpl (100%) rename {consul => app_config}/configuration/traefik/traefik.toml (100%) rename {consul => app_config}/restore_configuration.sh (100%) rename {consul => app_config}/secrets/.gitignore (100%) rename {consul => app_config}/secrets/chat/coturn/static-auth.sample (100%) rename {consul => app_config}/secrets/chat/fb2mx/as_token.sample (100%) rename {consul => app_config}/secrets/chat/fb2mx/db_url.sample (100%) rename {consul => app_config}/secrets/chat/fb2mx/hs_token.sample (100%) rename {consul => app_config}/secrets/chat/synapse/homeserver.tls.crt.sample (100%) rename {consul => app_config}/secrets/chat/synapse/homeserver.tls.dh.sample (100%) rename {consul => app_config}/secrets/chat/synapse/homeserver.tls.key.sample (100%) rename {consul => app_config}/secrets/chat/synapse/ldap_binddn.sample (100%) rename {consul => app_config}/secrets/chat/synapse/ldap_bindpw.sample (100%) rename {consul => app_config}/secrets/chat/synapse/postgres_db.sample (100%) rename {consul => app_config}/secrets/chat/synapse/postgres_pwd.sample (100%) rename {consul => app_config}/secrets/chat/synapse/postgres_user.sample (100%) rename {consul => app_config}/secrets/chat/synapse/registration_shared_secret.sample (100%) rename {consul => app_config}/secrets/email/sogo/ldap_binddn.sample (100%) rename {consul => app_config}/secrets/email/sogo/ldap_bindpw.sample (100%) rename {consul => app_config}/secrets/email/sogo/postgre_auth.sample (100%) rename {consul => app_config}/secrets/jitsi/auth.jitsi.deuxfleurs.fr.crt.sample (100%) rename {consul => app_config}/secrets/jitsi/auth.jitsi.deuxfleurs.fr.key.sample (100%) rename {consul => app_config}/secrets/jitsi/global_env.sample (100%) rename {consul => app_config}/secrets/jitsi/jitsi.deuxfleurs.fr.crt.sample (100%) rename {consul => app_config}/secrets/jitsi/jitsi.deuxfleurs.fr.key.sample (100%) rename {consul => app_config}/secrets/mariadb/main/ldap_binddn.sample (100%) rename {consul => app_config}/secrets/mariadb/main/ldap_bindpwd.sample (100%) rename {consul => app_config}/secrets/mariadb/main/mysql_pwd.sample (100%) rename {consul => app_config}/secrets/platoo/bddpw.sample (100%) rename {consul => app_config}/secrets/postgres/keeper/pg_repl_pwd.sample (100%) rename {consul => app_config}/secrets/postgres/keeper/pg_repl_username.sample (100%) rename {consul => app_config}/secrets/postgres/keeper/pg_su_pwd.sample (100%) rename {consul => app_config}/secrets/web/home_token.sample (100%) rename {consul => app_config}/secrets/web/quentin.dufour.io_token.sample (100%) rename {nomad => app_deployment}/bottin2.hcl (100%) rename {nomad => app_deployment}/core.hcl (100%) rename {nomad => app_deployment}/email.hcl (100%) rename {nomad => app_deployment}/garage.hcl (100%) rename {nomad => app_deployment}/im.hcl (100%) rename {nomad => app_deployment}/jitsi.hcl (100%) rename {nomad => app_deployment}/mariadb.hcl (100%) rename {nomad => app_deployment}/nextcloud.hcl (100%) rename {nomad => app_deployment}/object_storage.hcl (100%) rename {nomad => app_deployment}/platoo.hcl (100%) rename {nomad => app_deployment}/postgres.hcl (100%) rename {nomad => app_deployment}/science.hcl (100%) rename {nomad => app_deployment}/seafile.hcl (100%) rename {nomad => app_deployment}/traefik.hcl (100%) rename {nomad => app_deployment}/web_static.hcl (100%) rename {nomad => app_deployment}/webcap.hcl (100%) rename {docker => app_integration}/jitsi/01_gen_certs.yml (100%) rename {docker => app_integration}/jitsi/02_run.yml (100%) rename {docker => app_integration}/jitsi/README.md (100%) rename {docker => app_integration}/jitsi/dev.env (100%) rename {docker => app_integration}/jitsi/jitsi-certs/.gitignore (100%) delete mode 100644 docker/docker-compose.yml rename {man => op_guide}/create_database/README.md (100%) rename {man => op_guide}/init_stolon/README.md (100%) rename {man => op_guide}/nextcloud/README.md (100%) rename {bootstrap => os_build}/README.md (100%) rename {bootstrap => os_build}/build-installer.sh (100%) rename {ansible => os_config}/README.md (100%) rename {ansible => os_config}/README.more.md (100%) rename {ansible => os_config}/cluster_nodes.yml (100%) rename {ansible => os_config}/group_vars/all/.gitignore (100%) rename {ansible => os_config}/group_vars/all/vars_file.yml.sample (100%) rename {ansible => os_config}/production (100%) rename {ansible => os_config}/roles/common/tasks/main.yml (100%) rename {ansible => os_config}/roles/consul/files/consul.service (100%) rename {ansible => os_config}/roles/consul/tasks/main.yml (100%) rename {ansible => os_config}/roles/consul/templates/consul.json.j2 (100%) rename {ansible => os_config}/roles/consul/templates/resolv.conf.j2 (100%) rename {ansible => os_config}/roles/consul/vars/.gitignore (100%) rename {ansible => os_config}/roles/consul/vars/main.yml.sample (100%) rename {ansible => os_config}/roles/network/files/rules.v6 (100%) rename {ansible => os_config}/roles/network/tasks/main.yml (100%) rename {ansible => os_config}/roles/network/templates/rules.v4.j2 (100%) rename {ansible => os_config}/roles/nomad/files/nomad.service (100%) rename {ansible => os_config}/roles/nomad/tasks/main.yml (100%) rename {ansible => os_config}/roles/nomad/templates/nomad.hcl.j2 (100%) rename {ansible => os_config}/roles/storage/handlers/main.yml (100%) rename {ansible => os_config}/roles/storage/tasks/main.yml (100%) rename {ansible => os_config}/roles/users/files/alex-key1.pub (100%) rename {ansible => os_config}/roles/users/files/alex-key2.pub (100%) rename {ansible => os_config}/roles/users/files/florian-key1.pub (100%) rename {ansible => os_config}/roles/users/files/florian-key2.pub (100%) rename {ansible => os_config}/roles/users/files/maximilien-key1.pub (100%) rename {ansible => os_config}/roles/users/files/quentin-key1.pub (100%) rename {ansible => os_config}/roles/users/files/quentin-key2.pub (100%) rename {ansible => os_config}/roles/users/tasks/main.yml (100%) rename {ansible => os_config}/roles/users/vars/main.yml (100%) rename {ansible => os_config}/site.yml (100%) 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 similarity index 100% rename from docker/README.md rename to app_build/README.md diff --git a/docker/blog-quentin/.dockerenv b/app_build/blog-quentin/.dockerenv similarity index 100% rename from docker/blog-quentin/.dockerenv rename to app_build/blog-quentin/.dockerenv diff --git a/docker/blog-quentin/Dockerfile b/app_build/blog-quentin/Dockerfile similarity index 100% rename from docker/blog-quentin/Dockerfile rename to app_build/blog-quentin/Dockerfile diff --git a/docker/blog-quentin/README.md b/app_build/blog-quentin/README.md similarity index 100% rename from docker/blog-quentin/README.md rename to app_build/blog-quentin/README.md diff --git a/docker/coturn/Dockerfile b/app_build/coturn/Dockerfile similarity index 100% rename from docker/coturn/Dockerfile rename to app_build/coturn/Dockerfile diff --git a/docker/coturn/README.md b/app_build/coturn/README.md similarity index 100% rename from docker/coturn/README.md rename to 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 similarity index 100% rename from docker/dovecot/.gitignore rename to app_build/dovecot/.gitignore diff --git a/docker/dovecot/Dockerfile b/app_build/dovecot/Dockerfile similarity index 100% rename from docker/dovecot/Dockerfile rename to app_build/dovecot/Dockerfile diff --git a/docker/dovecot/README.md b/app_build/dovecot/README.md similarity index 100% rename from docker/dovecot/README.md rename to app_build/dovecot/README.md diff --git a/docker/dovecot/entrypoint.sh b/app_build/dovecot/entrypoint.sh similarity index 100% rename from docker/dovecot/entrypoint.sh rename to app_build/dovecot/entrypoint.sh diff --git a/docker/jitsi/jitsi-conference-focus/Dockerfile b/app_build/jitsi-conference-focus/Dockerfile similarity index 97% rename from docker/jitsi/jitsi-conference-focus/Dockerfile rename to 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 similarity index 100% rename from docker/jitsi/jitsi-conference-focus/jicofo rename to app_build/jitsi-conference-focus/jicofo diff --git a/docker/jitsi/jitsi-front/Dockerfile b/app_build/jitsi-meet/Dockerfile similarity index 98% rename from docker/jitsi/jitsi-front/Dockerfile rename to 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 similarity index 100% rename from docker/jitsi/jitsi-front/config.js rename to app_build/jitsi-meet/config.js diff --git a/docker/jitsi/jitsi-front/entrypoint.sh b/app_build/jitsi-meet/entrypoint.sh similarity index 100% rename from docker/jitsi/jitsi-front/entrypoint.sh rename to app_build/jitsi-meet/entrypoint.sh diff --git a/docker/jitsi/jitsi-videobridge/Dockerfile b/app_build/jitsi-videobridge/Dockerfile similarity index 97% rename from docker/jitsi/jitsi-videobridge/Dockerfile rename to 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 similarity index 100% rename from docker/jitsi/jitsi-videobridge/jvb_run rename to app_build/jitsi-videobridge/jvb_run diff --git a/docker/jitsi/jitsi-xmpp/Dockerfile b/app_build/jitsi-xmpp/Dockerfile similarity index 100% rename from docker/jitsi/jitsi-xmpp/Dockerfile rename to 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 similarity index 100% rename from docker/jitsi/jitsi-xmpp/external_components.cfg.lua rename to app_build/jitsi-xmpp/external_components.cfg.lua diff --git a/docker/jitsi/jitsi-xmpp/xmpp_conf b/app_build/jitsi-xmpp/xmpp_conf similarity index 100% rename from docker/jitsi/jitsi-xmpp/xmpp_conf rename to app_build/jitsi-xmpp/xmpp_conf diff --git a/docker/jitsi/jitsi-xmpp/xmpp_gen b/app_build/jitsi-xmpp/xmpp_gen similarity index 100% rename from docker/jitsi/jitsi-xmpp/xmpp_gen rename to app_build/jitsi-xmpp/xmpp_gen diff --git a/docker/jitsi/jitsi-xmpp/xmpp_run b/app_build/jitsi-xmpp/xmpp_run similarity index 100% rename from docker/jitsi/jitsi-xmpp/xmpp_run rename to app_build/jitsi-xmpp/xmpp_run diff --git a/docker/landing/README.md b/app_build/landing/README.md similarity index 100% rename from docker/landing/README.md rename to app_build/landing/README.md diff --git a/docker/mariadb/60-disable-dialog.cnf b/app_build/mariadb/60-disable-dialog.cnf similarity index 100% rename from docker/mariadb/60-disable-dialog.cnf rename to app_build/mariadb/60-disable-dialog.cnf diff --git a/docker/mariadb/60-ldap.cnf b/app_build/mariadb/60-ldap.cnf similarity index 100% rename from docker/mariadb/60-ldap.cnf rename to app_build/mariadb/60-ldap.cnf diff --git a/docker/mariadb/60-remote.cnf b/app_build/mariadb/60-remote.cnf similarity index 100% rename from docker/mariadb/60-remote.cnf rename to app_build/mariadb/60-remote.cnf diff --git a/docker/mariadb/Dockerfile b/app_build/mariadb/Dockerfile similarity index 100% rename from docker/mariadb/Dockerfile rename to app_build/mariadb/Dockerfile diff --git a/docker/mariadb/README.md b/app_build/mariadb/README.md similarity index 100% rename from docker/mariadb/README.md rename to app_build/mariadb/README.md diff --git a/docker/mariadb/entrypoint.sh b/app_build/mariadb/entrypoint.sh similarity index 100% rename from docker/mariadb/entrypoint.sh rename to app_build/mariadb/entrypoint.sh diff --git a/docker/mariadb/nsswitch.conf b/app_build/mariadb/nsswitch.conf similarity index 100% rename from docker/mariadb/nsswitch.conf rename to app_build/mariadb/nsswitch.conf diff --git a/docker/mariadb/pam-mariadb b/app_build/mariadb/pam-mariadb similarity index 100% rename from docker/mariadb/pam-mariadb rename to app_build/mariadb/pam-mariadb diff --git a/docker/matrix-synapse/Dockerfile b/app_build/matrix-synapse/Dockerfile similarity index 100% rename from docker/matrix-synapse/Dockerfile rename to app_build/matrix-synapse/Dockerfile diff --git a/docker/matrix-synapse/entrypoint.sh b/app_build/matrix-synapse/entrypoint.sh similarity index 100% rename from docker/matrix-synapse/entrypoint.sh rename to app_build/matrix-synapse/entrypoint.sh diff --git a/docker/nextcloud/Dockerfile b/app_build/nextcloud/Dockerfile similarity index 100% rename from docker/nextcloud/Dockerfile rename to app_build/nextcloud/Dockerfile diff --git a/docker/nextcloud/container-setup.sh b/app_build/nextcloud/container-setup.sh similarity index 100% rename from docker/nextcloud/container-setup.sh rename to app_build/nextcloud/container-setup.sh diff --git a/docker/nextcloud/entrypoint.sh b/app_build/nextcloud/entrypoint.sh similarity index 100% rename from docker/nextcloud/entrypoint.sh rename to app_build/nextcloud/entrypoint.sh diff --git a/docker/opendkim/Dockerfile b/app_build/opendkim/Dockerfile similarity index 100% rename from docker/opendkim/Dockerfile rename to app_build/opendkim/Dockerfile diff --git a/docker/opendkim/README.md b/app_build/opendkim/README.md similarity index 100% rename from docker/opendkim/README.md rename to app_build/opendkim/README.md diff --git a/docker/opendkim/opendkim.conf b/app_build/opendkim/opendkim.conf similarity index 100% rename from docker/opendkim/opendkim.conf rename to app_build/opendkim/opendkim.conf diff --git a/docker/pithos/0.7.5.tar.gz b/app_build/pithos/0.7.5.tar.gz similarity index 100% rename from docker/pithos/0.7.5.tar.gz rename to app_build/pithos/0.7.5.tar.gz diff --git a/docker/pithos/Dockerfile b/app_build/pithos/Dockerfile similarity index 100% rename from docker/pithos/Dockerfile rename to app_build/pithos/Dockerfile diff --git a/docker/pithos/README.md b/app_build/pithos/README.md similarity index 100% rename from docker/pithos/README.md rename to 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 similarity index 100% rename from docker/pithos/pithos-0.7.5-standalone.jar rename to app_build/pithos/pithos-0.7.5-standalone.jar diff --git a/docker/postfix/Dockerfile b/app_build/postfix/Dockerfile similarity index 100% rename from docker/postfix/Dockerfile rename to app_build/postfix/Dockerfile diff --git a/docker/postfix/README.md b/app_build/postfix/README.md similarity index 100% rename from docker/postfix/README.md rename to app_build/postfix/README.md diff --git a/docker/postfix/entrypoint.sh b/app_build/postfix/entrypoint.sh similarity index 100% rename from docker/postfix/entrypoint.sh rename to app_build/postfix/entrypoint.sh diff --git a/docker/postgres/Dockerfile b/app_build/postgres/Dockerfile similarity index 100% rename from docker/postgres/Dockerfile rename to app_build/postgres/Dockerfile diff --git a/docker/postgres/README.md b/app_build/postgres/README.md similarity index 100% rename from docker/postgres/README.md rename to app_build/postgres/README.md diff --git a/docker/postgres/postgresql.conf b/app_build/postgres/postgresql.conf similarity index 100% rename from docker/postgres/postgresql.conf rename to app_build/postgres/postgresql.conf diff --git a/docker/postgres/start.sh b/app_build/postgres/start.sh similarity index 100% rename from docker/postgres/start.sh rename to app_build/postgres/start.sh diff --git a/docker/riotweb/Dockerfile b/app_build/riotweb/Dockerfile similarity index 100% rename from docker/riotweb/Dockerfile rename to app_build/riotweb/Dockerfile diff --git a/docker/riotweb/config.json b/app_build/riotweb/config.json similarity index 100% rename from docker/riotweb/config.json rename to app_build/riotweb/config.json diff --git a/docker/seafile/Dockerfile b/app_build/seafile/Dockerfile similarity index 100% rename from docker/seafile/Dockerfile rename to app_build/seafile/Dockerfile diff --git a/docker/seafile/README.md b/app_build/seafile/README.md similarity index 100% rename from docker/seafile/README.md rename to app_build/seafile/README.md diff --git a/docker/seafile/seadocker b/app_build/seafile/seadocker similarity index 100% rename from docker/seafile/seadocker rename to app_build/seafile/seadocker diff --git a/docker/seafile/seaenv b/app_build/seafile/seaenv similarity index 100% rename from docker/seafile/seaenv rename to app_build/seafile/seaenv diff --git a/docker/sogo/Dockerfile b/app_build/sogo/Dockerfile similarity index 100% rename from docker/sogo/Dockerfile rename to app_build/sogo/Dockerfile diff --git a/docker/sogo/README.md b/app_build/sogo/README.md similarity index 100% rename from docker/sogo/README.md rename to app_build/sogo/README.md diff --git a/docker/sogo/entrypoint b/app_build/sogo/entrypoint similarity index 100% rename from docker/sogo/entrypoint rename to app_build/sogo/entrypoint diff --git a/docker/sogo/sogo.nginx.conf b/app_build/sogo/sogo.nginx.conf similarity index 100% rename from docker/sogo/sogo.nginx.conf rename to app_build/sogo/sogo.nginx.conf diff --git a/docker/static/Dockerfile b/app_build/static/Dockerfile similarity index 100% rename from docker/static/Dockerfile rename to app_build/static/Dockerfile diff --git a/docker/static/README.md b/app_build/static/README.md similarity index 100% rename from docker/static/README.md rename to app_build/static/README.md diff --git a/docker/static/goStatic b/app_build/static/goStatic similarity index 100% rename from docker/static/goStatic rename to app_build/static/goStatic diff --git a/docker/webpull/.gitignore b/app_build/webpull/.gitignore similarity index 100% rename from docker/webpull/.gitignore rename to app_build/webpull/.gitignore diff --git a/docker/webpull/Dockerfile.nodejs b/app_build/webpull/Dockerfile.nodejs similarity index 100% rename from docker/webpull/Dockerfile.nodejs rename to app_build/webpull/Dockerfile.nodejs diff --git a/docker/webpull/Dockerfile.ruby b/app_build/webpull/Dockerfile.ruby similarity index 100% rename from docker/webpull/Dockerfile.ruby rename to app_build/webpull/Dockerfile.ruby diff --git a/docker/webpull/README.md b/app_build/webpull/README.md similarity index 100% rename from docker/webpull/README.md rename to app_build/webpull/README.md diff --git a/docker/webpull/main.go b/app_build/webpull/main.go similarity index 100% rename from docker/webpull/main.go rename to app_build/webpull/main.go diff --git a/consul/configuration/.gitignore b/app_config/configuration/.gitignore similarity index 100% rename from consul/configuration/.gitignore rename to app_config/configuration/.gitignore diff --git a/consul/configuration/chat/coturn/turnserver.conf.tpl b/app_config/configuration/chat/coturn/turnserver.conf.tpl similarity index 100% rename from consul/configuration/chat/coturn/turnserver.conf.tpl rename to 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 similarity index 100% rename from consul/configuration/chat/easybridge/config.json.tpl rename to 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 similarity index 100% rename from consul/configuration/chat/easybridge/registration.yaml.tpl rename to 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 similarity index 100% rename from consul/configuration/chat/fb2mx/config.yaml rename to app_config/configuration/chat/fb2mx/config.yaml diff --git a/consul/configuration/chat/fb2mx/registration.yaml b/app_config/configuration/chat/fb2mx/registration.yaml similarity index 100% rename from consul/configuration/chat/fb2mx/registration.yaml rename to 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 similarity index 100% rename from consul/configuration/chat/riot_web/config.json rename to 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 similarity index 100% rename from consul/configuration/chat/synapse/conf.d/report_stats.yaml rename to 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 similarity index 100% rename from consul/configuration/chat/synapse/conf.d/server_name.yaml rename to 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 similarity index 100% rename from consul/configuration/chat/synapse/homeserver.yaml rename to app_config/configuration/chat/synapse/homeserver.yaml diff --git a/consul/configuration/chat/synapse/log.yaml b/app_config/configuration/chat/synapse/log.yaml similarity index 100% rename from consul/configuration/chat/synapse/log.yaml rename to app_config/configuration/chat/synapse/log.yaml diff --git a/consul/configuration/directory/bottin/config.json b/app_config/configuration/directory/bottin/config.json similarity index 100% rename from consul/configuration/directory/bottin/config.json rename to 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 similarity index 100% rename from consul/configuration/directory/guichet/config.json.tpl rename to app_config/configuration/directory/guichet/config.json.tpl diff --git a/consul/configuration/email/dkim/keytable b/app_config/configuration/email/dkim/keytable similarity index 100% rename from consul/configuration/email/dkim/keytable rename to app_config/configuration/email/dkim/keytable diff --git a/consul/configuration/email/dkim/signingtable b/app_config/configuration/email/dkim/signingtable similarity index 100% rename from consul/configuration/email/dkim/signingtable rename to 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 similarity index 100% rename from consul/configuration/email/dkim/smtp.private.sample rename to 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 similarity index 100% rename from consul/configuration/email/dkim/smtp.txt.sample rename to app_config/configuration/email/dkim/smtp.txt.sample diff --git a/consul/configuration/email/dkim/trusted b/app_config/configuration/email/dkim/trusted similarity index 100% rename from consul/configuration/email/dkim/trusted rename to app_config/configuration/email/dkim/trusted diff --git a/consul/configuration/email/dovecot/certs.gen b/app_config/configuration/email/dovecot/certs.gen similarity index 100% rename from consul/configuration/email/dovecot/certs.gen rename to 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 similarity index 100% rename from consul/configuration/email/dovecot/dovecot-ldap.conf.tpl rename to 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 similarity index 100% rename from consul/configuration/email/postfix/certs.gen rename to app_config/configuration/email/postfix/certs.gen diff --git a/consul/configuration/email/postfix/dynamicmaps.cf b/app_config/configuration/email/postfix/dynamicmaps.cf similarity index 100% rename from consul/configuration/email/postfix/dynamicmaps.cf rename to app_config/configuration/email/postfix/dynamicmaps.cf diff --git a/consul/configuration/email/postfix/header_checks b/app_config/configuration/email/postfix/header_checks similarity index 100% rename from consul/configuration/email/postfix/header_checks rename to 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 similarity index 100% rename from consul/configuration/email/postfix/ldap-account.cf.tpl rename to 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 similarity index 100% rename from consul/configuration/email/postfix/ldap-alias.cf.tpl rename to 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 similarity index 100% rename from consul/configuration/email/postfix/ldap-virtual-domains.cf.tpl rename to 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 similarity index 100% rename from consul/configuration/email/postfix/main.cf rename to app_config/configuration/email/postfix/main.cf diff --git a/consul/configuration/email/postfix/master.cf b/app_config/configuration/email/postfix/master.cf similarity index 100% rename from consul/configuration/email/postfix/master.cf rename to app_config/configuration/email/postfix/master.cf diff --git a/consul/configuration/email/postfix/transport b/app_config/configuration/email/postfix/transport similarity index 100% rename from consul/configuration/email/postfix/transport rename to app_config/configuration/email/postfix/transport diff --git a/consul/configuration/email/postfix/transport.db b/app_config/configuration/email/postfix/transport.db similarity index 100% rename from consul/configuration/email/postfix/transport.db rename to 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 similarity index 100% rename from consul/configuration/email/sogo/sogo.conf.tpl rename to 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 similarity index 100% rename from consul/configuration/mariadb/main/env.tpl rename to app_config/configuration/mariadb/main/env.tpl diff --git a/consul/configuration/nextcloud/config.php.tpl b/app_config/configuration/nextcloud/config.php.tpl similarity index 100% rename from consul/configuration/nextcloud/config.php.tpl rename to app_config/configuration/nextcloud/config.php.tpl diff --git a/consul/configuration/postgres/keeper/env.tpl b/app_config/configuration/postgres/keeper/env.tpl similarity index 100% rename from consul/configuration/postgres/keeper/env.tpl rename to 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 similarity index 100% rename from consul/configuration/seafile/ccnet/mykey.peer.sample rename to 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 similarity index 100% rename from consul/configuration/seafile/ccnet/seafile.ini rename to 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 similarity index 100% rename from consul/configuration/seafile/conf/ccnet.conf.tpl rename to 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 similarity index 100% rename from consul/configuration/seafile/conf/mykey.peer.sample rename to 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 similarity index 100% rename from consul/configuration/seafile/conf/seafdav.conf rename to 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 similarity index 100% rename from consul/configuration/seafile/conf/seafile.conf.tpl rename to 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 similarity index 100% rename from consul/configuration/seafile/conf/seahub_settings.py.tpl rename to app_config/configuration/seafile/conf/seahub_settings.py.tpl diff --git a/consul/configuration/traefik/traefik.toml b/app_config/configuration/traefik/traefik.toml similarity index 100% rename from consul/configuration/traefik/traefik.toml rename to app_config/configuration/traefik/traefik.toml diff --git a/consul/restore_configuration.sh b/app_config/restore_configuration.sh similarity index 100% rename from consul/restore_configuration.sh rename to app_config/restore_configuration.sh diff --git a/consul/secrets/.gitignore b/app_config/secrets/.gitignore similarity index 100% rename from consul/secrets/.gitignore rename to app_config/secrets/.gitignore diff --git a/consul/secrets/chat/coturn/static-auth.sample b/app_config/secrets/chat/coturn/static-auth.sample similarity index 100% rename from consul/secrets/chat/coturn/static-auth.sample rename to 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 similarity index 100% rename from consul/secrets/chat/fb2mx/as_token.sample rename to 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 similarity index 100% rename from consul/secrets/chat/fb2mx/db_url.sample rename to 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 similarity index 100% rename from consul/secrets/chat/fb2mx/hs_token.sample rename to 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 similarity index 100% rename from consul/secrets/chat/synapse/homeserver.tls.crt.sample rename to 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 similarity index 100% rename from consul/secrets/chat/synapse/homeserver.tls.dh.sample rename to 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 similarity index 100% rename from consul/secrets/chat/synapse/homeserver.tls.key.sample rename to 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 similarity index 100% rename from consul/secrets/chat/synapse/ldap_binddn.sample rename to 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 similarity index 100% rename from consul/secrets/chat/synapse/ldap_bindpw.sample rename to 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 similarity index 100% rename from consul/secrets/chat/synapse/postgres_db.sample rename to 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 similarity index 100% rename from consul/secrets/chat/synapse/postgres_pwd.sample rename to 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 similarity index 100% rename from consul/secrets/chat/synapse/postgres_user.sample rename to 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 similarity index 100% rename from consul/secrets/chat/synapse/registration_shared_secret.sample rename to 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 similarity index 100% rename from consul/secrets/email/sogo/ldap_binddn.sample rename to 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 similarity index 100% rename from consul/secrets/email/sogo/ldap_bindpw.sample rename to 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 similarity index 100% rename from consul/secrets/email/sogo/postgre_auth.sample rename to 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 similarity index 100% rename from consul/secrets/jitsi/auth.jitsi.deuxfleurs.fr.crt.sample rename to 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 similarity index 100% rename from consul/secrets/jitsi/auth.jitsi.deuxfleurs.fr.key.sample rename to 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 similarity index 100% rename from consul/secrets/jitsi/global_env.sample rename to 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 similarity index 100% rename from consul/secrets/jitsi/jitsi.deuxfleurs.fr.crt.sample rename to 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 similarity index 100% rename from consul/secrets/jitsi/jitsi.deuxfleurs.fr.key.sample rename to 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 similarity index 100% rename from consul/secrets/mariadb/main/ldap_binddn.sample rename to 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 similarity index 100% rename from consul/secrets/mariadb/main/ldap_bindpwd.sample rename to 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 similarity index 100% rename from consul/secrets/mariadb/main/mysql_pwd.sample rename to app_config/secrets/mariadb/main/mysql_pwd.sample diff --git a/consul/secrets/platoo/bddpw.sample b/app_config/secrets/platoo/bddpw.sample similarity index 100% rename from consul/secrets/platoo/bddpw.sample rename to 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 similarity index 100% rename from consul/secrets/postgres/keeper/pg_repl_pwd.sample rename to 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 similarity index 100% rename from consul/secrets/postgres/keeper/pg_repl_username.sample rename to 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 similarity index 100% rename from consul/secrets/postgres/keeper/pg_su_pwd.sample rename to 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 similarity index 100% rename from consul/secrets/web/home_token.sample rename to 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 similarity index 100% rename from consul/secrets/web/quentin.dufour.io_token.sample rename to app_config/secrets/web/quentin.dufour.io_token.sample diff --git a/nomad/bottin2.hcl b/app_deployment/bottin2.hcl similarity index 100% rename from nomad/bottin2.hcl rename to app_deployment/bottin2.hcl diff --git a/nomad/core.hcl b/app_deployment/core.hcl similarity index 100% rename from nomad/core.hcl rename to app_deployment/core.hcl diff --git a/nomad/email.hcl b/app_deployment/email.hcl similarity index 100% rename from nomad/email.hcl rename to app_deployment/email.hcl diff --git a/nomad/garage.hcl b/app_deployment/garage.hcl similarity index 100% rename from nomad/garage.hcl rename to app_deployment/garage.hcl diff --git a/nomad/im.hcl b/app_deployment/im.hcl similarity index 100% rename from nomad/im.hcl rename to app_deployment/im.hcl diff --git a/nomad/jitsi.hcl b/app_deployment/jitsi.hcl similarity index 100% rename from nomad/jitsi.hcl rename to app_deployment/jitsi.hcl diff --git a/nomad/mariadb.hcl b/app_deployment/mariadb.hcl similarity index 100% rename from nomad/mariadb.hcl rename to app_deployment/mariadb.hcl diff --git a/nomad/nextcloud.hcl b/app_deployment/nextcloud.hcl similarity index 100% rename from nomad/nextcloud.hcl rename to app_deployment/nextcloud.hcl diff --git a/nomad/object_storage.hcl b/app_deployment/object_storage.hcl similarity index 100% rename from nomad/object_storage.hcl rename to app_deployment/object_storage.hcl diff --git a/nomad/platoo.hcl b/app_deployment/platoo.hcl similarity index 100% rename from nomad/platoo.hcl rename to app_deployment/platoo.hcl diff --git a/nomad/postgres.hcl b/app_deployment/postgres.hcl similarity index 100% rename from nomad/postgres.hcl rename to app_deployment/postgres.hcl diff --git a/nomad/science.hcl b/app_deployment/science.hcl similarity index 100% rename from nomad/science.hcl rename to app_deployment/science.hcl diff --git a/nomad/seafile.hcl b/app_deployment/seafile.hcl similarity index 100% rename from nomad/seafile.hcl rename to app_deployment/seafile.hcl diff --git a/nomad/traefik.hcl b/app_deployment/traefik.hcl similarity index 100% rename from nomad/traefik.hcl rename to app_deployment/traefik.hcl diff --git a/nomad/web_static.hcl b/app_deployment/web_static.hcl similarity index 100% rename from nomad/web_static.hcl rename to app_deployment/web_static.hcl diff --git a/nomad/webcap.hcl b/app_deployment/webcap.hcl similarity index 100% rename from nomad/webcap.hcl rename to app_deployment/webcap.hcl diff --git a/docker/jitsi/01_gen_certs.yml b/app_integration/jitsi/01_gen_certs.yml similarity index 100% rename from docker/jitsi/01_gen_certs.yml rename to app_integration/jitsi/01_gen_certs.yml diff --git a/docker/jitsi/02_run.yml b/app_integration/jitsi/02_run.yml similarity index 100% rename from docker/jitsi/02_run.yml rename to app_integration/jitsi/02_run.yml diff --git a/docker/jitsi/README.md b/app_integration/jitsi/README.md similarity index 100% rename from docker/jitsi/README.md rename to app_integration/jitsi/README.md diff --git a/docker/jitsi/dev.env b/app_integration/jitsi/dev.env similarity index 100% rename from docker/jitsi/dev.env rename to app_integration/jitsi/dev.env diff --git a/docker/jitsi/jitsi-certs/.gitignore b/app_integration/jitsi/jitsi-certs/.gitignore similarity index 100% rename from docker/jitsi/jitsi-certs/.gitignore rename to 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 similarity index 100% rename from man/create_database/README.md rename to op_guide/create_database/README.md diff --git a/man/init_stolon/README.md b/op_guide/init_stolon/README.md similarity index 100% rename from man/init_stolon/README.md rename to op_guide/init_stolon/README.md diff --git a/man/nextcloud/README.md b/op_guide/nextcloud/README.md similarity index 100% rename from man/nextcloud/README.md rename to op_guide/nextcloud/README.md diff --git a/bootstrap/README.md b/os_build/README.md similarity index 100% rename from bootstrap/README.md rename to os_build/README.md diff --git a/bootstrap/build-installer.sh b/os_build/build-installer.sh similarity index 100% rename from bootstrap/build-installer.sh rename to os_build/build-installer.sh diff --git a/ansible/README.md b/os_config/README.md similarity index 100% rename from ansible/README.md rename to os_config/README.md diff --git a/ansible/README.more.md b/os_config/README.more.md similarity index 100% rename from ansible/README.more.md rename to os_config/README.more.md diff --git a/ansible/cluster_nodes.yml b/os_config/cluster_nodes.yml similarity index 100% rename from ansible/cluster_nodes.yml rename to os_config/cluster_nodes.yml diff --git a/ansible/group_vars/all/.gitignore b/os_config/group_vars/all/.gitignore similarity index 100% rename from ansible/group_vars/all/.gitignore rename to 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 similarity index 100% rename from ansible/group_vars/all/vars_file.yml.sample rename to os_config/group_vars/all/vars_file.yml.sample diff --git a/ansible/production b/os_config/production similarity index 100% rename from ansible/production rename to os_config/production diff --git a/ansible/roles/common/tasks/main.yml b/os_config/roles/common/tasks/main.yml similarity index 100% rename from ansible/roles/common/tasks/main.yml rename to os_config/roles/common/tasks/main.yml diff --git a/ansible/roles/consul/files/consul.service b/os_config/roles/consul/files/consul.service similarity index 100% rename from ansible/roles/consul/files/consul.service rename to os_config/roles/consul/files/consul.service diff --git a/ansible/roles/consul/tasks/main.yml b/os_config/roles/consul/tasks/main.yml similarity index 100% rename from ansible/roles/consul/tasks/main.yml rename to 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 similarity index 100% rename from ansible/roles/consul/templates/consul.json.j2 rename to 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 similarity index 100% rename from ansible/roles/consul/templates/resolv.conf.j2 rename to os_config/roles/consul/templates/resolv.conf.j2 diff --git a/ansible/roles/consul/vars/.gitignore b/os_config/roles/consul/vars/.gitignore similarity index 100% rename from ansible/roles/consul/vars/.gitignore rename to 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 similarity index 100% rename from ansible/roles/consul/vars/main.yml.sample rename to 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 similarity index 100% rename from ansible/roles/network/files/rules.v6 rename to os_config/roles/network/files/rules.v6 diff --git a/ansible/roles/network/tasks/main.yml b/os_config/roles/network/tasks/main.yml similarity index 100% rename from ansible/roles/network/tasks/main.yml rename to 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 similarity index 100% rename from ansible/roles/network/templates/rules.v4.j2 rename to 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 similarity index 100% rename from ansible/roles/nomad/files/nomad.service rename to os_config/roles/nomad/files/nomad.service diff --git a/ansible/roles/nomad/tasks/main.yml b/os_config/roles/nomad/tasks/main.yml similarity index 100% rename from ansible/roles/nomad/tasks/main.yml rename to 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 similarity index 100% rename from ansible/roles/nomad/templates/nomad.hcl.j2 rename to 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 similarity index 100% rename from ansible/roles/storage/handlers/main.yml rename to os_config/roles/storage/handlers/main.yml diff --git a/ansible/roles/storage/tasks/main.yml b/os_config/roles/storage/tasks/main.yml similarity index 100% rename from ansible/roles/storage/tasks/main.yml rename to 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 similarity index 100% rename from ansible/roles/users/files/alex-key1.pub rename to 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 similarity index 100% rename from ansible/roles/users/files/alex-key2.pub rename to 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 similarity index 100% rename from ansible/roles/users/files/florian-key1.pub rename to 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 similarity index 100% rename from ansible/roles/users/files/florian-key2.pub rename to 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 similarity index 100% rename from ansible/roles/users/files/maximilien-key1.pub rename to 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 similarity index 100% rename from ansible/roles/users/files/quentin-key1.pub rename to 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 similarity index 100% rename from ansible/roles/users/files/quentin-key2.pub rename to 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 similarity index 100% rename from ansible/roles/users/tasks/main.yml rename to os_config/roles/users/tasks/main.yml diff --git a/ansible/roles/users/vars/main.yml b/os_config/roles/users/vars/main.yml similarity index 100% rename from ansible/roles/users/vars/main.yml rename to os_config/roles/users/vars/main.yml diff --git a/ansible/site.yml b/os_config/site.yml similarity index 100% rename from ansible/site.yml rename to os_config/site.yml From 5337be94df4f79191fea244e8db4338489bc04b7 Mon Sep 17 00:00:00 2001 From: Quentin Date: Sat, 12 Sep 2020 11:15:07 +0200 Subject: [PATCH 02/14] Better handle jitsi versions --- app_build/docker-compose.yml | 3 +++ app_build/jitsi-conference-focus/Dockerfile | 5 +++-- app_build/jitsi-meet/Dockerfile | 13 ++++--------- app_build/jitsi-videobridge/Dockerfile | 9 +++++---- app_integration/jitsi/01_gen_certs.yml | 2 +- app_integration/jitsi/02_run.yml | 21 +++++---------------- 6 files changed, 21 insertions(+), 32 deletions(-) diff --git a/app_build/docker-compose.yml b/app_build/docker-compose.yml index afe363d..b7c17c1 100644 --- a/app_build/docker-compose.yml +++ b/app_build/docker-compose.yml @@ -33,6 +33,7 @@ services: context: ./jitsi-meet args: # https://github.com/jitsi/jitsi-meet + PREFIXV: stable/jitsi-meet_ VERSION: 4966 image: superboum/amd64_jitsi_meet:v1 @@ -41,6 +42,7 @@ services: context: ./jitsi-conference-focus args: # https://github.com/jitsi/jicofo + PREFIXV: stable/jitsi-meet_ VERSION: 4966 image: superboum/amd64_jitsi_conference_focus:v3 @@ -49,6 +51,7 @@ services: context: ./jitsi-videobridge args: # https://github.com/jitsi/jitsi-videobridge + PREFIXV: stable/jitsi-meet_ VERSION: 4966 image: superboum/amd64_jitsi_videobridge:v10 diff --git a/app_build/jitsi-conference-focus/Dockerfile b/app_build/jitsi-conference-focus/Dockerfile index 8999966..efb3010 100644 --- a/app_build/jitsi-conference-focus/Dockerfile +++ b/app_build/jitsi-conference-focus/Dockerfile @@ -1,9 +1,10 @@ FROM debian:buster AS builder -#ENV VERSION=4510 +ARG PREFIXV +ARG VERSION 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 && \ + wget https://github.com/jitsi/jicofo/archive/${PREFIXV}${VERSION}.zip -O jicofo.zip && \ unzip jicofo.zip && \ mv jicofo-jitsi-meet_${VERSION} jicofo && \ cd jicofo && \ diff --git a/app_build/jitsi-meet/Dockerfile b/app_build/jitsi-meet/Dockerfile index 0d908eb..7f84d9d 100644 --- a/app_build/jitsi-meet/Dockerfile +++ b/app_build/jitsi-meet/Dockerfile @@ -1,20 +1,15 @@ FROM debian:buster AS builder -#ENV VERSION=4048 +ARG PREFIXV +ARG VERSION 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 && \ + wget https://github.com/jitsi/jitsi-meet/archive/${PREFIXV}${VERSION}.zip -O jitsi-meet.zip && \ unzip jitsi-meet.zip && \ mv jitsi-meet-${VERSION} jitsi-meet && \ cd jitsi-meet && \ npm install && \ - make && \ - sed -i \ - "s/OPTIMAL_BROWSERS: \[.*\],/ OPTIMAL_BROWSERS: [ 'chrome', 'chromium', 'nwjs', 'electron' ],/g" \ - interface_config.js && \ - sed -i \ - "s/UNSUPPORTED_BROWSERS: \[.*\],/ UNSUPPORTED_BROWSERS: [ 'firefox' ],/g" \ - interface_config.js + make FROM debian:buster diff --git a/app_build/jitsi-videobridge/Dockerfile b/app_build/jitsi-videobridge/Dockerfile index c144e34..f18c156 100644 --- a/app_build/jitsi-videobridge/Dockerfile +++ b/app_build/jitsi-videobridge/Dockerfile @@ -1,10 +1,11 @@ FROM debian:buster AS builder -RUN apt-get update && \ - apt-get install -y wget unzip maven openjdk-11-jdk +ARG PREFIXV +ARG VERSION -#ENV VERSION=4468 -RUN wget https://github.com/jitsi/jitsi-videobridge/archive/stable/jitsi-meet_${VERSION}.zip -O jvb.zip && \ +RUN apt-get update && \ + apt-get install -y wget unzip maven openjdk-11-jdk && \ + wget https://github.com/jitsi/jitsi-videobridge/archive/${PREFIXV}${VERSION}.zip -O jvb.zip && \ unzip jvb.zip && \ mv jitsi-videobridge-stable-jitsi-meet_${VERSION} jvb && \ cd jvb && \ diff --git a/app_integration/jitsi/01_gen_certs.yml b/app_integration/jitsi/01_gen_certs.yml index 8c97384..c283f53 100644 --- a/app_integration/jitsi/01_gen_certs.yml +++ b/app_integration/jitsi/01_gen_certs.yml @@ -1,7 +1,7 @@ version: '3' services: jitsi-xmpp: - build: ./jitsi-xmpp + image: ./jitsi-xmpp command: ["/usr/local/bin/xmpp_gen"] volumes: [ './jitsi-certs/:/certs:rw' ] env_file: [ 'dev.env' ] diff --git a/app_integration/jitsi/02_run.yml b/app_integration/jitsi/02_run.yml index 3fc0e26..79127cb 100644 --- a/app_integration/jitsi/02_run.yml +++ b/app_integration/jitsi/02_run.yml @@ -1,8 +1,7 @@ version: '3.4' services: jitsi-xmpp: - build: ./jitsi-xmpp - image: superboum/amd64_jitsi_xmpp:v1 + image: superboum/amd64_jitsi_xmpp:v2 network_mode: host ports: - "5222:5222" @@ -10,28 +9,18 @@ services: - "5280:5280" env_file: [ 'dev.env' ] volumes: [ './jitsi-certs/:/certs:ro' ] - jitsi-front: - build: - context: ./jitsi-front - network: host - #^-- I have some DNS problems on Fedora 32 in Docker - image: superboum/amd64_jitsi_front:v5 + jitsi-meet: + image: superboum/amd64_jitsi_meet:v1 ports: - "443:443" env_file: [ 'dev.env' ] volumes: [ './jitsi-certs/:/certs:ro' ] jitsi-conference-focus: - build: - context: ./jitsi-conference-focus - network: host - image: superboum/amd64_jitsi_conference_focus:v2 + image: superboum/amd64_jitsi_conference_focus:v3 env_file: [ 'dev.env' ] volumes: [ './jitsi-certs/:/certs:ro' ] jitsi-videobridge: - build: - context: ./jitsi-videobridge - network: host - image: superboum/amd64_jitsi_videobridge:v9 + image: superboum/amd64_jitsi_videobridge:v10 network_mode: host ports: - "8080:8080/tcp" From 0c05730a5df3fa7f5e9884f265f4903453dfffb2 Mon Sep 17 00:00:00 2001 From: Quentin Date: Sat, 12 Sep 2020 11:27:32 +0200 Subject: [PATCH 03/14] Rationalize container building --- app_build/jitsi-conference-focus/Dockerfile | 7 ++++--- app_build/jitsi-meet/Dockerfile | 8 +++++--- app_build/jitsi-videobridge/Dockerfile | 7 ++++--- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/app_build/jitsi-conference-focus/Dockerfile b/app_build/jitsi-conference-focus/Dockerfile index efb3010..7fde9b0 100644 --- a/app_build/jitsi-conference-focus/Dockerfile +++ b/app_build/jitsi-conference-focus/Dockerfile @@ -4,9 +4,10 @@ ARG PREFIXV ARG VERSION RUN apt-get update && \ apt-get install -y openjdk-11-jdk maven wget unzip && \ - wget https://github.com/jitsi/jicofo/archive/${PREFIXV}${VERSION}.zip -O jicofo.zip && \ - unzip jicofo.zip && \ - mv jicofo-jitsi-meet_${VERSION} jicofo && \ + wget https://github.com/jitsi/jicofo/archive/${PREFIXV}${VERSION}.zip -O jicofo.zip + +RUN unzip jicofo.zip && \ + mv jicofo-jitsi-meet_*${VERSION} jicofo && \ cd jicofo && \ mvn package -DskipTests -Dassembly.skipAssembly=false && \ unzip target/jicofo-1.1-SNAPSHOT-archive.zip && \ diff --git a/app_build/jitsi-meet/Dockerfile b/app_build/jitsi-meet/Dockerfile index 7f84d9d..16b6557 100644 --- a/app_build/jitsi-meet/Dockerfile +++ b/app_build/jitsi-meet/Dockerfile @@ -2,11 +2,13 @@ FROM debian:buster AS builder ARG PREFIXV ARG VERSION + RUN apt-get update && \ apt-get install -y npm git nodejs make wget unzip && \ - wget https://github.com/jitsi/jitsi-meet/archive/${PREFIXV}${VERSION}.zip -O jitsi-meet.zip && \ - unzip jitsi-meet.zip && \ - mv jitsi-meet-${VERSION} jitsi-meet && \ + wget https://github.com/jitsi/jitsi-meet/archive/${PREFIXV}${VERSION}.zip -O jitsi-meet.zip + +RUN unzip jitsi-meet.zip && \ + mv jitsi-meet-*${VERSION} jitsi-meet && \ cd jitsi-meet && \ npm install && \ make diff --git a/app_build/jitsi-videobridge/Dockerfile b/app_build/jitsi-videobridge/Dockerfile index f18c156..530dc59 100644 --- a/app_build/jitsi-videobridge/Dockerfile +++ b/app_build/jitsi-videobridge/Dockerfile @@ -5,9 +5,10 @@ ARG VERSION RUN apt-get update && \ apt-get install -y wget unzip maven openjdk-11-jdk && \ - wget https://github.com/jitsi/jitsi-videobridge/archive/${PREFIXV}${VERSION}.zip -O jvb.zip && \ - unzip jvb.zip && \ - mv jitsi-videobridge-stable-jitsi-meet_${VERSION} jvb && \ + wget https://github.com/jitsi/jitsi-videobridge/archive/${PREFIXV}${VERSION}.zip -O jvb.zip + +RUN unzip jvb.zip && \ + mv jitsi-videobridge-*${VERSION} jvb && \ cd jvb && \ mvn package -DskipTests && \ unzip target/jitsi-videobridge-*.zip && \ From b00fc0eaf1004f57bd0c44b56422e2920690483f Mon Sep 17 00:00:00 2001 From: Quentin Date: Sat, 12 Sep 2020 12:21:30 +0200 Subject: [PATCH 04/14] Use a more recent npm --- app_build/jitsi-meet/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app_build/jitsi-meet/Dockerfile b/app_build/jitsi-meet/Dockerfile index 16b6557..feef115 100644 --- a/app_build/jitsi-meet/Dockerfile +++ b/app_build/jitsi-meet/Dockerfile @@ -4,7 +4,9 @@ ARG PREFIXV ARG VERSION RUN apt-get update && \ - apt-get install -y npm git nodejs make wget unzip && \ + apt-get install -y curl && \ + curl -sL https://deb.nodesource.com/setup_14.x | bash - && \ + apt-get install -y git nodejs make wget unzip && \ wget https://github.com/jitsi/jitsi-meet/archive/${PREFIXV}${VERSION}.zip -O jitsi-meet.zip RUN unzip jitsi-meet.zip && \ From fb4ffbc7faa0d123ce9bf817d240a8c670c494e3 Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Sat, 12 Sep 2020 18:01:34 +0000 Subject: [PATCH 05/14] Fix broken Jitsi... --- app_build/docker-compose.yml | 2 +- app_build/jitsi-conference-focus/Dockerfile | 2 +- app_build/jitsi-videobridge/Dockerfile | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app_build/docker-compose.yml b/app_build/docker-compose.yml index b7c17c1..e3cbca9 100644 --- a/app_build/docker-compose.yml +++ b/app_build/docker-compose.yml @@ -37,7 +37,7 @@ services: VERSION: 4966 image: superboum/amd64_jitsi_meet:v1 - jitsi-confererence-focus: + jitsi-conference-focus: build: context: ./jitsi-conference-focus args: diff --git a/app_build/jitsi-conference-focus/Dockerfile b/app_build/jitsi-conference-focus/Dockerfile index 7fde9b0..f66c426 100644 --- a/app_build/jitsi-conference-focus/Dockerfile +++ b/app_build/jitsi-conference-focus/Dockerfile @@ -7,7 +7,7 @@ RUN apt-get update && \ wget https://github.com/jitsi/jicofo/archive/${PREFIXV}${VERSION}.zip -O jicofo.zip RUN unzip jicofo.zip && \ - mv jicofo-jitsi-meet_*${VERSION} jicofo && \ + mv jicofo*${VERSION} jicofo && \ cd jicofo && \ mvn package -DskipTests -Dassembly.skipAssembly=false && \ unzip target/jicofo-1.1-SNAPSHOT-archive.zip && \ diff --git a/app_build/jitsi-videobridge/Dockerfile b/app_build/jitsi-videobridge/Dockerfile index 530dc59..dfbadb7 100644 --- a/app_build/jitsi-videobridge/Dockerfile +++ b/app_build/jitsi-videobridge/Dockerfile @@ -8,10 +8,11 @@ RUN apt-get update && \ wget https://github.com/jitsi/jitsi-videobridge/archive/${PREFIXV}${VERSION}.zip -O jvb.zip RUN unzip jvb.zip && \ - mv jitsi-videobridge-*${VERSION} jvb && \ + mv jitsi-videobridge*${VERSION} jvb && \ cd jvb && \ mvn package -DskipTests && \ - unzip target/jitsi-videobridge-*.zip && \ + ls jvb/target && \ + unzip jvb/target/jitsi-videobridge*.zip && \ mv jitsi-videobridge-*-SNAPSHOT build FROM debian:buster From a23e08ce20887efb4e158a02ffee1f775a0db89f Mon Sep 17 00:00:00 2001 From: Quentin Date: Sat, 12 Sep 2020 20:17:07 +0200 Subject: [PATCH 06/14] Refactor 2 --- .gitmodules | 2 +- README.md | 16 +++++++++------- {app_build => app/build}/README.md | 0 .../build}/blog-quentin/.dockerenv | 0 .../build}/blog-quentin/Dockerfile | 0 {app_build => app/build}/blog-quentin/README.md | 0 {app_build => app/build}/coturn/Dockerfile | 0 {app_build => app/build}/coturn/README.md | 0 {app_build => app/build}/docker-compose.yml | 0 {app_build => app/build}/dovecot/.gitignore | 0 {app_build => app/build}/dovecot/Dockerfile | 0 {app_build => app/build}/dovecot/README.md | 0 {app_build => app/build}/dovecot/entrypoint.sh | 0 .../build}/jitsi-conference-focus/Dockerfile | 0 .../build}/jitsi-conference-focus/jicofo | 0 {app_build => app/build}/jitsi-meet/Dockerfile | 0 {app_build => app/build}/jitsi-meet/config.js | 0 .../build}/jitsi-meet/entrypoint.sh | 0 .../build}/jitsi-videobridge/Dockerfile | 0 .../build}/jitsi-videobridge/jvb_run | 0 {app_build => app/build}/jitsi-xmpp/Dockerfile | 0 .../jitsi-xmpp/external_components.cfg.lua | 0 {app_build => app/build}/jitsi-xmpp/xmpp_conf | 0 {app_build => app/build}/jitsi-xmpp/xmpp_gen | 0 {app_build => app/build}/jitsi-xmpp/xmpp_run | 0 {app_build => app/build}/landing/README.md | 0 .../build}/mariadb/60-disable-dialog.cnf | 0 {app_build => app/build}/mariadb/60-ldap.cnf | 0 {app_build => app/build}/mariadb/60-remote.cnf | 0 {app_build => app/build}/mariadb/Dockerfile | 0 {app_build => app/build}/mariadb/README.md | 0 {app_build => app/build}/mariadb/entrypoint.sh | 0 {app_build => app/build}/mariadb/nsswitch.conf | 0 {app_build => app/build}/mariadb/pam-mariadb | 0 .../build}/matrix-synapse/Dockerfile | 0 .../build}/matrix-synapse/entrypoint.sh | 0 {app_build => app/build}/nextcloud/Dockerfile | 0 .../build}/nextcloud/container-setup.sh | 0 .../build}/nextcloud/entrypoint.sh | 0 {app_build => app/build}/opendkim/Dockerfile | 0 {app_build => app/build}/opendkim/README.md | 0 {app_build => app/build}/opendkim/opendkim.conf | 0 {app_build => app/build}/pithos/0.7.5.tar.gz | Bin {app_build => app/build}/pithos/Dockerfile | 0 {app_build => app/build}/pithos/README.md | 0 .../build}/pithos/pithos-0.7.5-standalone.jar | Bin {app_build => app/build}/postfix/Dockerfile | 0 {app_build => app/build}/postfix/README.md | 0 {app_build => app/build}/postfix/entrypoint.sh | 0 {app_build => app/build}/postgres/Dockerfile | 0 {app_build => app/build}/postgres/README.md | 0 .../build}/postgres/postgresql.conf | 0 {app_build => app/build}/postgres/start.sh | 0 {app_build => app/build}/riotweb/Dockerfile | 0 {app_build => app/build}/riotweb/config.json | 0 {app_build => app/build}/seafile/Dockerfile | 0 {app_build => app/build}/seafile/README.md | 0 {app_build => app/build}/seafile/seadocker | 0 {app_build => app/build}/seafile/seaenv | 0 {app_build => app/build}/sogo/Dockerfile | 0 {app_build => app/build}/sogo/README.md | 0 {app_build => app/build}/sogo/entrypoint | 0 {app_build => app/build}/sogo/sogo.nginx.conf | 0 {app_build => app/build}/static/Dockerfile | 0 {app_build => app/build}/static/README.md | 0 {app_build => app/build}/static/goStatic | 0 {app_build => app/build}/webpull/.gitignore | 0 .../build}/webpull/Dockerfile.nodejs | 0 .../build}/webpull/Dockerfile.ruby | 0 {app_build => app/build}/webpull/README.md | 0 {app_build => app/build}/webpull/main.go | 0 .../config}/configuration/.gitignore | 0 .../chat/coturn/turnserver.conf.tpl | 0 .../chat/easybridge/config.json.tpl | 0 .../chat/easybridge/registration.yaml.tpl | 0 .../configuration/chat/fb2mx/config.yaml | 0 .../configuration/chat/fb2mx/registration.yaml | 0 .../configuration/chat/riot_web/config.json | 0 .../chat/synapse/conf.d/report_stats.yaml | 0 .../chat/synapse/conf.d/server_name.yaml | 0 .../configuration/chat/synapse/homeserver.yaml | 0 .../config}/configuration/chat/synapse/log.yaml | 0 .../configuration/directory/bottin/config.json | 0 .../directory/guichet/config.json.tpl | 0 .../config}/configuration/email/dkim/keytable | 0 .../configuration/email/dkim/signingtable | 0 .../email/dkim/smtp.private.sample | 0 .../configuration/email/dkim/smtp.txt.sample | 0 .../config}/configuration/email/dkim/trusted | 0 .../configuration/email/dovecot/certs.gen | 0 .../email/dovecot/dovecot-ldap.conf.tpl | 0 .../configuration/email/postfix/certs.gen | 0 .../configuration/email/postfix/dynamicmaps.cf | 0 .../configuration/email/postfix/header_checks | 0 .../email/postfix/ldap-account.cf.tpl | 0 .../email/postfix/ldap-alias.cf.tpl | 0 .../email/postfix/ldap-virtual-domains.cf.tpl | 0 .../config}/configuration/email/postfix/main.cf | 0 .../configuration/email/postfix/master.cf | 0 .../configuration/email/postfix/transport | 0 .../configuration/email/postfix/transport.db | Bin .../configuration/email/sogo/sogo.conf.tpl | 0 .../config}/configuration/mariadb/main/env.tpl | 0 .../configuration/nextcloud/config.php.tpl | 0 .../configuration/postgres/keeper/env.tpl | 0 .../seafile/ccnet/mykey.peer.sample | 0 .../configuration/seafile/ccnet/seafile.ini | 0 .../configuration/seafile/conf/ccnet.conf.tpl | 0 .../seafile/conf/mykey.peer.sample | 0 .../configuration/seafile/conf/seafdav.conf | 0 .../configuration/seafile/conf/seafile.conf.tpl | 0 .../seafile/conf/seahub_settings.py.tpl | 0 .../config}/configuration/traefik/traefik.toml | 0 .../config}/restore_configuration.sh | 0 {app_config => app/config}/secrets/.gitignore | 0 .../secrets/chat/coturn/static-auth.sample | 0 .../config}/secrets/chat/fb2mx/as_token.sample | 0 .../config}/secrets/chat/fb2mx/db_url.sample | 0 .../config}/secrets/chat/fb2mx/hs_token.sample | 0 .../chat/synapse/homeserver.tls.crt.sample | 0 .../chat/synapse/homeserver.tls.dh.sample | 0 .../chat/synapse/homeserver.tls.key.sample | 0 .../secrets/chat/synapse/ldap_binddn.sample | 0 .../secrets/chat/synapse/ldap_bindpw.sample | 0 .../secrets/chat/synapse/postgres_db.sample | 0 .../secrets/chat/synapse/postgres_pwd.sample | 0 .../secrets/chat/synapse/postgres_user.sample | 0 .../synapse/registration_shared_secret.sample | 0 .../secrets/email/sogo/ldap_binddn.sample | 0 .../secrets/email/sogo/ldap_bindpw.sample | 0 .../secrets/email/sogo/postgre_auth.sample | 0 .../jitsi/auth.jitsi.deuxfleurs.fr.crt.sample | 0 .../jitsi/auth.jitsi.deuxfleurs.fr.key.sample | 0 .../config}/secrets/jitsi/global_env.sample | 0 .../jitsi/jitsi.deuxfleurs.fr.crt.sample | 0 .../jitsi/jitsi.deuxfleurs.fr.key.sample | 0 .../secrets/mariadb/main/ldap_binddn.sample | 0 .../secrets/mariadb/main/ldap_bindpwd.sample | 0 .../secrets/mariadb/main/mysql_pwd.sample | 0 .../config}/secrets/platoo/bddpw.sample | 0 .../secrets/postgres/keeper/pg_repl_pwd.sample | 0 .../postgres/keeper/pg_repl_username.sample | 0 .../secrets/postgres/keeper/pg_su_pwd.sample | 0 .../config}/secrets/web/home_token.sample | 0 .../secrets/web/quentin.dufour.io_token.sample | 0 {app_deployment => app/deployment}/bottin2.hcl | 0 {app_deployment => app/deployment}/core.hcl | 0 {app_deployment => app/deployment}/email.hcl | 0 {app_deployment => app/deployment}/garage.hcl | 0 {app_deployment => app/deployment}/im.hcl | 0 {app_deployment => app/deployment}/jitsi.hcl | 0 {app_deployment => app/deployment}/mariadb.hcl | 0 .../deployment}/nextcloud.hcl | 0 .../deployment}/object_storage.hcl | 0 {app_deployment => app/deployment}/platoo.hcl | 0 {app_deployment => app/deployment}/postgres.hcl | 0 {app_deployment => app/deployment}/science.hcl | 0 {app_deployment => app/deployment}/seafile.hcl | 0 {app_deployment => app/deployment}/traefik.hcl | 0 .../deployment}/web_static.hcl | 0 {app_deployment => app/deployment}/webcap.hcl | 0 .../integration}/jitsi/01_gen_certs.yml | 0 .../integration}/jitsi/02_run.yml | 0 .../integration}/jitsi/README.md | 0 .../integration}/jitsi/dev.env | 0 .../integration}/jitsi/jitsi-certs/.gitignore | 0 {os_build => os/build}/README.md | 0 {os_build => os/build}/build-installer.sh | 0 {os_config => os/config}/README.md | 0 {os_config => os/config}/README.more.md | 0 {os_config => os/config}/cluster_nodes.yml | 0 .../config}/group_vars/all/.gitignore | 0 .../config}/group_vars/all/vars_file.yml.sample | 0 {os_config => os/config}/production | 0 .../config}/roles/common/tasks/main.yml | 0 .../config}/roles/consul/files/consul.service | 0 .../config}/roles/consul/tasks/main.yml | 0 .../roles/consul/templates/consul.json.j2 | 0 .../roles/consul/templates/resolv.conf.j2 | 0 .../config}/roles/consul/vars/.gitignore | 0 .../config}/roles/consul/vars/main.yml.sample | 0 .../config}/roles/network/files/rules.v6 | 0 .../config}/roles/network/tasks/main.yml | 0 .../config}/roles/network/templates/rules.v4.j2 | 0 .../config}/roles/nomad/files/nomad.service | 0 .../config}/roles/nomad/tasks/main.yml | 0 .../config}/roles/nomad/templates/nomad.hcl.j2 | 0 .../config}/roles/storage/handlers/main.yml | 0 .../config}/roles/storage/tasks/main.yml | 0 .../config}/roles/users/files/alex-key1.pub | 0 .../config}/roles/users/files/alex-key2.pub | 0 .../config}/roles/users/files/florian-key1.pub | 0 .../config}/roles/users/files/florian-key2.pub | 0 .../roles/users/files/maximilien-key1.pub | 0 .../config}/roles/users/files/quentin-key1.pub | 0 .../config}/roles/users/files/quentin-key2.pub | 0 .../config}/roles/users/tasks/main.yml | 0 .../config}/roles/users/vars/main.yml | 0 {os_config => os/config}/site.yml | 0 199 files changed, 10 insertions(+), 8 deletions(-) rename {app_build => app/build}/README.md (100%) rename {app_build => app/build}/blog-quentin/.dockerenv (100%) rename {app_build => app/build}/blog-quentin/Dockerfile (100%) rename {app_build => app/build}/blog-quentin/README.md (100%) rename {app_build => app/build}/coturn/Dockerfile (100%) rename {app_build => app/build}/coturn/README.md (100%) rename {app_build => app/build}/docker-compose.yml (100%) rename {app_build => app/build}/dovecot/.gitignore (100%) rename {app_build => app/build}/dovecot/Dockerfile (100%) rename {app_build => app/build}/dovecot/README.md (100%) rename {app_build => app/build}/dovecot/entrypoint.sh (100%) rename {app_build => app/build}/jitsi-conference-focus/Dockerfile (100%) rename {app_build => app/build}/jitsi-conference-focus/jicofo (100%) rename {app_build => app/build}/jitsi-meet/Dockerfile (100%) rename {app_build => app/build}/jitsi-meet/config.js (100%) rename {app_build => app/build}/jitsi-meet/entrypoint.sh (100%) rename {app_build => app/build}/jitsi-videobridge/Dockerfile (100%) rename {app_build => app/build}/jitsi-videobridge/jvb_run (100%) rename {app_build => app/build}/jitsi-xmpp/Dockerfile (100%) rename {app_build => app/build}/jitsi-xmpp/external_components.cfg.lua (100%) rename {app_build => app/build}/jitsi-xmpp/xmpp_conf (100%) rename {app_build => app/build}/jitsi-xmpp/xmpp_gen (100%) rename {app_build => app/build}/jitsi-xmpp/xmpp_run (100%) rename {app_build => app/build}/landing/README.md (100%) rename {app_build => app/build}/mariadb/60-disable-dialog.cnf (100%) rename {app_build => app/build}/mariadb/60-ldap.cnf (100%) rename {app_build => app/build}/mariadb/60-remote.cnf (100%) rename {app_build => app/build}/mariadb/Dockerfile (100%) rename {app_build => app/build}/mariadb/README.md (100%) rename {app_build => app/build}/mariadb/entrypoint.sh (100%) rename {app_build => app/build}/mariadb/nsswitch.conf (100%) rename {app_build => app/build}/mariadb/pam-mariadb (100%) rename {app_build => app/build}/matrix-synapse/Dockerfile (100%) rename {app_build => app/build}/matrix-synapse/entrypoint.sh (100%) rename {app_build => app/build}/nextcloud/Dockerfile (100%) rename {app_build => app/build}/nextcloud/container-setup.sh (100%) rename {app_build => app/build}/nextcloud/entrypoint.sh (100%) rename {app_build => app/build}/opendkim/Dockerfile (100%) rename {app_build => app/build}/opendkim/README.md (100%) rename {app_build => app/build}/opendkim/opendkim.conf (100%) rename {app_build => app/build}/pithos/0.7.5.tar.gz (100%) rename {app_build => app/build}/pithos/Dockerfile (100%) rename {app_build => app/build}/pithos/README.md (100%) rename {app_build => app/build}/pithos/pithos-0.7.5-standalone.jar (100%) rename {app_build => app/build}/postfix/Dockerfile (100%) rename {app_build => app/build}/postfix/README.md (100%) rename {app_build => app/build}/postfix/entrypoint.sh (100%) rename {app_build => app/build}/postgres/Dockerfile (100%) rename {app_build => app/build}/postgres/README.md (100%) rename {app_build => app/build}/postgres/postgresql.conf (100%) rename {app_build => app/build}/postgres/start.sh (100%) rename {app_build => app/build}/riotweb/Dockerfile (100%) rename {app_build => app/build}/riotweb/config.json (100%) rename {app_build => app/build}/seafile/Dockerfile (100%) rename {app_build => app/build}/seafile/README.md (100%) rename {app_build => app/build}/seafile/seadocker (100%) rename {app_build => app/build}/seafile/seaenv (100%) rename {app_build => app/build}/sogo/Dockerfile (100%) rename {app_build => app/build}/sogo/README.md (100%) rename {app_build => app/build}/sogo/entrypoint (100%) rename {app_build => app/build}/sogo/sogo.nginx.conf (100%) rename {app_build => app/build}/static/Dockerfile (100%) rename {app_build => app/build}/static/README.md (100%) rename {app_build => app/build}/static/goStatic (100%) rename {app_build => app/build}/webpull/.gitignore (100%) rename {app_build => app/build}/webpull/Dockerfile.nodejs (100%) rename {app_build => app/build}/webpull/Dockerfile.ruby (100%) rename {app_build => app/build}/webpull/README.md (100%) rename {app_build => app/build}/webpull/main.go (100%) rename {app_config => app/config}/configuration/.gitignore (100%) rename {app_config => app/config}/configuration/chat/coturn/turnserver.conf.tpl (100%) rename {app_config => app/config}/configuration/chat/easybridge/config.json.tpl (100%) rename {app_config => app/config}/configuration/chat/easybridge/registration.yaml.tpl (100%) rename {app_config => app/config}/configuration/chat/fb2mx/config.yaml (100%) rename {app_config => app/config}/configuration/chat/fb2mx/registration.yaml (100%) rename {app_config => app/config}/configuration/chat/riot_web/config.json (100%) rename {app_config => app/config}/configuration/chat/synapse/conf.d/report_stats.yaml (100%) rename {app_config => app/config}/configuration/chat/synapse/conf.d/server_name.yaml (100%) rename {app_config => app/config}/configuration/chat/synapse/homeserver.yaml (100%) rename {app_config => app/config}/configuration/chat/synapse/log.yaml (100%) rename {app_config => app/config}/configuration/directory/bottin/config.json (100%) rename {app_config => app/config}/configuration/directory/guichet/config.json.tpl (100%) rename {app_config => app/config}/configuration/email/dkim/keytable (100%) rename {app_config => app/config}/configuration/email/dkim/signingtable (100%) rename {app_config => app/config}/configuration/email/dkim/smtp.private.sample (100%) rename {app_config => app/config}/configuration/email/dkim/smtp.txt.sample (100%) rename {app_config => app/config}/configuration/email/dkim/trusted (100%) rename {app_config => app/config}/configuration/email/dovecot/certs.gen (100%) rename {app_config => app/config}/configuration/email/dovecot/dovecot-ldap.conf.tpl (100%) rename {app_config => app/config}/configuration/email/postfix/certs.gen (100%) rename {app_config => app/config}/configuration/email/postfix/dynamicmaps.cf (100%) rename {app_config => app/config}/configuration/email/postfix/header_checks (100%) rename {app_config => app/config}/configuration/email/postfix/ldap-account.cf.tpl (100%) rename {app_config => app/config}/configuration/email/postfix/ldap-alias.cf.tpl (100%) rename {app_config => app/config}/configuration/email/postfix/ldap-virtual-domains.cf.tpl (100%) rename {app_config => app/config}/configuration/email/postfix/main.cf (100%) rename {app_config => app/config}/configuration/email/postfix/master.cf (100%) rename {app_config => app/config}/configuration/email/postfix/transport (100%) rename {app_config => app/config}/configuration/email/postfix/transport.db (100%) rename {app_config => app/config}/configuration/email/sogo/sogo.conf.tpl (100%) rename {app_config => app/config}/configuration/mariadb/main/env.tpl (100%) rename {app_config => app/config}/configuration/nextcloud/config.php.tpl (100%) rename {app_config => app/config}/configuration/postgres/keeper/env.tpl (100%) rename {app_config => app/config}/configuration/seafile/ccnet/mykey.peer.sample (100%) rename {app_config => app/config}/configuration/seafile/ccnet/seafile.ini (100%) rename {app_config => app/config}/configuration/seafile/conf/ccnet.conf.tpl (100%) rename {app_config => app/config}/configuration/seafile/conf/mykey.peer.sample (100%) rename {app_config => app/config}/configuration/seafile/conf/seafdav.conf (100%) rename {app_config => app/config}/configuration/seafile/conf/seafile.conf.tpl (100%) rename {app_config => app/config}/configuration/seafile/conf/seahub_settings.py.tpl (100%) rename {app_config => app/config}/configuration/traefik/traefik.toml (100%) rename {app_config => app/config}/restore_configuration.sh (100%) rename {app_config => app/config}/secrets/.gitignore (100%) rename {app_config => app/config}/secrets/chat/coturn/static-auth.sample (100%) rename {app_config => app/config}/secrets/chat/fb2mx/as_token.sample (100%) rename {app_config => app/config}/secrets/chat/fb2mx/db_url.sample (100%) rename {app_config => app/config}/secrets/chat/fb2mx/hs_token.sample (100%) rename {app_config => app/config}/secrets/chat/synapse/homeserver.tls.crt.sample (100%) rename {app_config => app/config}/secrets/chat/synapse/homeserver.tls.dh.sample (100%) rename {app_config => app/config}/secrets/chat/synapse/homeserver.tls.key.sample (100%) rename {app_config => app/config}/secrets/chat/synapse/ldap_binddn.sample (100%) rename {app_config => app/config}/secrets/chat/synapse/ldap_bindpw.sample (100%) rename {app_config => app/config}/secrets/chat/synapse/postgres_db.sample (100%) rename {app_config => app/config}/secrets/chat/synapse/postgres_pwd.sample (100%) rename {app_config => app/config}/secrets/chat/synapse/postgres_user.sample (100%) rename {app_config => app/config}/secrets/chat/synapse/registration_shared_secret.sample (100%) rename {app_config => app/config}/secrets/email/sogo/ldap_binddn.sample (100%) rename {app_config => app/config}/secrets/email/sogo/ldap_bindpw.sample (100%) rename {app_config => app/config}/secrets/email/sogo/postgre_auth.sample (100%) rename {app_config => app/config}/secrets/jitsi/auth.jitsi.deuxfleurs.fr.crt.sample (100%) rename {app_config => app/config}/secrets/jitsi/auth.jitsi.deuxfleurs.fr.key.sample (100%) rename {app_config => app/config}/secrets/jitsi/global_env.sample (100%) rename {app_config => app/config}/secrets/jitsi/jitsi.deuxfleurs.fr.crt.sample (100%) rename {app_config => app/config}/secrets/jitsi/jitsi.deuxfleurs.fr.key.sample (100%) rename {app_config => app/config}/secrets/mariadb/main/ldap_binddn.sample (100%) rename {app_config => app/config}/secrets/mariadb/main/ldap_bindpwd.sample (100%) rename {app_config => app/config}/secrets/mariadb/main/mysql_pwd.sample (100%) rename {app_config => app/config}/secrets/platoo/bddpw.sample (100%) rename {app_config => app/config}/secrets/postgres/keeper/pg_repl_pwd.sample (100%) rename {app_config => app/config}/secrets/postgres/keeper/pg_repl_username.sample (100%) rename {app_config => app/config}/secrets/postgres/keeper/pg_su_pwd.sample (100%) rename {app_config => app/config}/secrets/web/home_token.sample (100%) rename {app_config => app/config}/secrets/web/quentin.dufour.io_token.sample (100%) rename {app_deployment => app/deployment}/bottin2.hcl (100%) rename {app_deployment => app/deployment}/core.hcl (100%) rename {app_deployment => app/deployment}/email.hcl (100%) rename {app_deployment => app/deployment}/garage.hcl (100%) rename {app_deployment => app/deployment}/im.hcl (100%) rename {app_deployment => app/deployment}/jitsi.hcl (100%) rename {app_deployment => app/deployment}/mariadb.hcl (100%) rename {app_deployment => app/deployment}/nextcloud.hcl (100%) rename {app_deployment => app/deployment}/object_storage.hcl (100%) rename {app_deployment => app/deployment}/platoo.hcl (100%) rename {app_deployment => app/deployment}/postgres.hcl (100%) rename {app_deployment => app/deployment}/science.hcl (100%) rename {app_deployment => app/deployment}/seafile.hcl (100%) rename {app_deployment => app/deployment}/traefik.hcl (100%) rename {app_deployment => app/deployment}/web_static.hcl (100%) rename {app_deployment => app/deployment}/webcap.hcl (100%) rename {app_integration => app/integration}/jitsi/01_gen_certs.yml (100%) rename {app_integration => app/integration}/jitsi/02_run.yml (100%) rename {app_integration => app/integration}/jitsi/README.md (100%) rename {app_integration => app/integration}/jitsi/dev.env (100%) rename {app_integration => app/integration}/jitsi/jitsi-certs/.gitignore (100%) rename {os_build => os/build}/README.md (100%) rename {os_build => os/build}/build-installer.sh (100%) rename {os_config => os/config}/README.md (100%) rename {os_config => os/config}/README.more.md (100%) rename {os_config => os/config}/cluster_nodes.yml (100%) rename {os_config => os/config}/group_vars/all/.gitignore (100%) rename {os_config => os/config}/group_vars/all/vars_file.yml.sample (100%) rename {os_config => os/config}/production (100%) rename {os_config => os/config}/roles/common/tasks/main.yml (100%) rename {os_config => os/config}/roles/consul/files/consul.service (100%) rename {os_config => os/config}/roles/consul/tasks/main.yml (100%) rename {os_config => os/config}/roles/consul/templates/consul.json.j2 (100%) rename {os_config => os/config}/roles/consul/templates/resolv.conf.j2 (100%) rename {os_config => os/config}/roles/consul/vars/.gitignore (100%) rename {os_config => os/config}/roles/consul/vars/main.yml.sample (100%) rename {os_config => os/config}/roles/network/files/rules.v6 (100%) rename {os_config => os/config}/roles/network/tasks/main.yml (100%) rename {os_config => os/config}/roles/network/templates/rules.v4.j2 (100%) rename {os_config => os/config}/roles/nomad/files/nomad.service (100%) rename {os_config => os/config}/roles/nomad/tasks/main.yml (100%) rename {os_config => os/config}/roles/nomad/templates/nomad.hcl.j2 (100%) rename {os_config => os/config}/roles/storage/handlers/main.yml (100%) rename {os_config => os/config}/roles/storage/tasks/main.yml (100%) rename {os_config => os/config}/roles/users/files/alex-key1.pub (100%) rename {os_config => os/config}/roles/users/files/alex-key2.pub (100%) rename {os_config => os/config}/roles/users/files/florian-key1.pub (100%) rename {os_config => os/config}/roles/users/files/florian-key2.pub (100%) rename {os_config => os/config}/roles/users/files/maximilien-key1.pub (100%) rename {os_config => os/config}/roles/users/files/quentin-key1.pub (100%) rename {os_config => os/config}/roles/users/files/quentin-key2.pub (100%) rename {os_config => os/config}/roles/users/tasks/main.yml (100%) rename {os_config => os/config}/roles/users/vars/main.yml (100%) rename {os_config => os/config}/site.yml (100%) 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 From 51e4af08c04fbd132dbe71a285d3d3491cf528b8 Mon Sep 17 00:00:00 2001 From: Quentin Date: Sat, 12 Sep 2020 20:18:41 +0200 Subject: [PATCH 07/14] Reformat markdown --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 302bbe1..7c7a3a6 100644 --- a/README.md +++ b/README.md @@ -28,13 +28,13 @@ 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` 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 + 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 + 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) From 1af6eabc81cc5758809dff3997890fc6786f9b3e Mon Sep 17 00:00:00 2001 From: Quentin Date: Sat, 12 Sep 2020 22:18:30 +0200 Subject: [PATCH 08/14] Fix videobridge --- app/build/docker-compose.yml | 2 +- app/build/jitsi-videobridge/jvb_run | 3 ++- app/deployment/jitsi.hcl | 14 ++++---------- app/integration/jitsi/01_gen_certs.yml | 2 +- app/integration/jitsi/02_run.yml | 2 +- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/app/build/docker-compose.yml b/app/build/docker-compose.yml index e3cbca9..25e994f 100644 --- a/app/build/docker-compose.yml +++ b/app/build/docker-compose.yml @@ -53,7 +53,7 @@ services: # https://github.com/jitsi/jitsi-videobridge PREFIXV: stable/jitsi-meet_ VERSION: 4966 - image: superboum/amd64_jitsi_videobridge:v10 + image: superboum/amd64_jitsi_videobridge:v11 jitsi-xmpp: build: diff --git a/app/build/jitsi-videobridge/jvb_run b/app/build/jitsi-videobridge/jvb_run index 3352e8a..4514d99 100755 --- a/app/build/jitsi-videobridge/jvb_run +++ b/app/build/jitsi-videobridge/jvb_run @@ -35,4 +35,5 @@ EOF --host=${JITSI_PROSODY_HOST} \ --domain=jitsi.deuxfleurs.fr \ --port=5347 \ - --secret=${JITSI_SECRET_VIDEOBRIDGE} + --secret=${JITSI_SECRET_VIDEOBRIDGE} \ + --apis=rest,xmpp diff --git a/app/deployment/jitsi.hcl b/app/deployment/jitsi.hcl index 4ef2f98..8f98d61 100644 --- a/app/deployment/jitsi.hcl +++ b/app/deployment/jitsi.hcl @@ -1,9 +1,3 @@ -/* - * WIP WIP WIP WIP - * - * + NEED TO SET ENV VARIABLES - */ - job "jitsi" { datacenters = ["dc1"] type = "service" @@ -17,7 +11,7 @@ job "jitsi" { task "xmpp" { driver = "docker" config { - image = "superboum/amd64_jitsi_xmpp:v1" + image = "superboum/amd64_jitsi_xmpp:v2" network_mode = "host" port_map { xmpp_port = 5222 @@ -93,7 +87,7 @@ job "jitsi" { task "front" { driver = "docker" config { - image = "superboum/amd64_jitsi_front:v5" + image = "superboum/amd64_jitsi_meet:v1" network_mode = "host" port_map { https_port = 443 @@ -157,7 +151,7 @@ job "jitsi" { task "jicofo" { driver = "docker" config { - image = "superboum/amd64_jitsi_conference_focus:v2" + image = "superboum/amd64_jitsi_conference_focus:v3" network_mode = "host" } @@ -189,7 +183,7 @@ job "jitsi" { task "videobridge" { driver = "docker" config { - image = "superboum/amd64_jitsi_videobridge:v9" + image = "superboum/amd64_jitsi_videobridge:v10" network_mode = "host" port_map { video1_port = 8080 diff --git a/app/integration/jitsi/01_gen_certs.yml b/app/integration/jitsi/01_gen_certs.yml index c283f53..2ba3d1d 100644 --- a/app/integration/jitsi/01_gen_certs.yml +++ b/app/integration/jitsi/01_gen_certs.yml @@ -1,7 +1,7 @@ version: '3' services: jitsi-xmpp: - image: ./jitsi-xmpp + image: ./jitsi-xmpp:v2 command: ["/usr/local/bin/xmpp_gen"] volumes: [ './jitsi-certs/:/certs:rw' ] env_file: [ 'dev.env' ] diff --git a/app/integration/jitsi/02_run.yml b/app/integration/jitsi/02_run.yml index 79127cb..354a548 100644 --- a/app/integration/jitsi/02_run.yml +++ b/app/integration/jitsi/02_run.yml @@ -20,7 +20,7 @@ services: env_file: [ 'dev.env' ] volumes: [ './jitsi-certs/:/certs:ro' ] jitsi-videobridge: - image: superboum/amd64_jitsi_videobridge:v10 + image: superboum/amd64_jitsi_videobridge:v11 network_mode: host ports: - "8080:8080/tcp" From 7951d350354a9bcfff1b525f807b063464f2b691 Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Sat, 12 Sep 2020 21:04:25 +0000 Subject: [PATCH 09/14] WIP jitsi fix --- app/build/docker-compose.yml | 2 +- app/build/jitsi-conference-focus/Dockerfile | 1 + app/build/jitsi-conference-focus/sip-communicator.properties | 1 + app/build/jitsi-videobridge/jvb_run | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 app/build/jitsi-conference-focus/sip-communicator.properties diff --git a/app/build/docker-compose.yml b/app/build/docker-compose.yml index 25e994f..0e44928 100644 --- a/app/build/docker-compose.yml +++ b/app/build/docker-compose.yml @@ -53,7 +53,7 @@ services: # https://github.com/jitsi/jitsi-videobridge PREFIXV: stable/jitsi-meet_ VERSION: 4966 - image: superboum/amd64_jitsi_videobridge:v11 + image: superboum/amd64_jitsi_videobridge:v13 jitsi-xmpp: build: diff --git a/app/build/jitsi-conference-focus/Dockerfile b/app/build/jitsi-conference-focus/Dockerfile index f66c426..93301e9 100644 --- a/app/build/jitsi-conference-focus/Dockerfile +++ b/app/build/jitsi-conference-focus/Dockerfile @@ -20,5 +20,6 @@ RUN apt-get update && \ COPY --from=builder /srv/build /srv/jicofo COPY jicofo /usr/local/bin/jicofo +COPY sip-communicator.properties /root/.sip-communicator/sip-communicator.properties CMD ["/usr/local/bin/jicofo"] diff --git a/app/build/jitsi-conference-focus/sip-communicator.properties b/app/build/jitsi-conference-focus/sip-communicator.properties new file mode 100644 index 0000000..5347d51 --- /dev/null +++ b/app/build/jitsi-conference-focus/sip-communicator.properties @@ -0,0 +1 @@ +org.jitsi.jicofo.SHORT_ID=1 diff --git a/app/build/jitsi-videobridge/jvb_run b/app/build/jitsi-videobridge/jvb_run index 4514d99..c5852bc 100755 --- a/app/build/jitsi-videobridge/jvb_run +++ b/app/build/jitsi-videobridge/jvb_run @@ -36,4 +36,4 @@ EOF --domain=jitsi.deuxfleurs.fr \ --port=5347 \ --secret=${JITSI_SECRET_VIDEOBRIDGE} \ - --apis=rest,xmpp + --apis=xmpp,rest From c40095d02c12c9bd2dd1e0f196eddb9d31343109 Mon Sep 17 00:00:00 2001 From: Quentin Date: Sat, 12 Sep 2020 23:18:02 +0200 Subject: [PATCH 10/14] WIP jitsi --- app/deployment/jitsi.hcl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/deployment/jitsi.hcl b/app/deployment/jitsi.hcl index 8f98d61..2ab5b11 100644 --- a/app/deployment/jitsi.hcl +++ b/app/deployment/jitsi.hcl @@ -151,7 +151,7 @@ job "jitsi" { task "jicofo" { driver = "docker" config { - image = "superboum/amd64_jitsi_conference_focus:v3" + image = "superboum/amd64_jitsi_conference_focus:v4" network_mode = "host" } @@ -183,7 +183,7 @@ job "jitsi" { task "videobridge" { driver = "docker" config { - image = "superboum/amd64_jitsi_videobridge:v10" + image = "superboum/amd64_jitsi_videobridge:v13" network_mode = "host" port_map { video1_port = 8080 From da034dabfcedcded964b6022153cf5a8a7ae9380 Mon Sep 17 00:00:00 2001 From: Quentin Date: Sun, 13 Sep 2020 11:46:14 +0200 Subject: [PATCH 11/14] Finally it seems to work --- app/build/docker-compose.yml | 6 +-- app/build/jitsi-conference-focus/Dockerfile | 4 +- .../sip-communicator.properties | 1 + app/build/jitsi-videobridge/jvb_run | 19 ++++++++- app/build/jitsi-xmpp/xmpp_conf | 39 +++++++++++-------- app/build/jitsi-xmpp/xmpp_run | 1 + app/integration/jitsi/01_gen_certs.yml | 2 +- app/integration/jitsi/02_run.yml | 9 ++--- app/integration/jitsi/dev.env | 8 ++-- 9 files changed, 55 insertions(+), 34 deletions(-) diff --git a/app/build/docker-compose.yml b/app/build/docker-compose.yml index 0e44928..7774b66 100644 --- a/app/build/docker-compose.yml +++ b/app/build/docker-compose.yml @@ -44,7 +44,7 @@ services: # https://github.com/jitsi/jicofo PREFIXV: stable/jitsi-meet_ VERSION: 4966 - image: superboum/amd64_jitsi_conference_focus:v3 + image: superboum/amd64_jitsi_conference_focus:v4 jitsi-videobridge: build: @@ -53,11 +53,11 @@ services: # https://github.com/jitsi/jitsi-videobridge PREFIXV: stable/jitsi-meet_ VERSION: 4966 - image: superboum/amd64_jitsi_videobridge:v13 + image: superboum/amd64_jitsi_videobridge:v14 jitsi-xmpp: build: context: ./jitsi-xmpp args: VERSION: fake-1 - image: superboum/amd64_jitsi_xmpp:v2 + image: superboum/amd64_jitsi_xmpp:v3 diff --git a/app/build/jitsi-conference-focus/Dockerfile b/app/build/jitsi-conference-focus/Dockerfile index 93301e9..e2c459c 100644 --- a/app/build/jitsi-conference-focus/Dockerfile +++ b/app/build/jitsi-conference-focus/Dockerfile @@ -16,7 +16,9 @@ RUN unzip jicofo.zip && \ FROM debian:buster RUN apt-get update && \ - apt-get install -y openjdk-11-jdk ca-certificates + apt-get install -y openjdk-11-jre-headless ca-certificates + +ENV JAVA_SYS_PROPS="-Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=/root -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=.sip-communicator -Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/jitsi" COPY --from=builder /srv/build /srv/jicofo COPY jicofo /usr/local/bin/jicofo diff --git a/app/build/jitsi-conference-focus/sip-communicator.properties b/app/build/jitsi-conference-focus/sip-communicator.properties index 5347d51..53c32e2 100644 --- a/app/build/jitsi-conference-focus/sip-communicator.properties +++ b/app/build/jitsi-conference-focus/sip-communicator.properties @@ -1 +1,2 @@ org.jitsi.jicofo.SHORT_ID=1 +org.jitsi.jicofo.BRIDGE_MUC=JvbBrewery@internal.auth.jitsi.deuxfleurs.fr diff --git a/app/build/jitsi-videobridge/jvb_run b/app/build/jitsi-videobridge/jvb_run index c5852bc..b86c911 100755 --- a/app/build/jitsi-videobridge/jvb_run +++ b/app/build/jitsi-videobridge/jvb_run @@ -8,9 +8,24 @@ EOF mkdir -p /root/.sip-communicator cat > /root/.sip-communicator/sip-communicator.properties < /etc/prosody/conf.avail/jitsi.deuxfleurs.fr.cfg.lua < Date: Sun, 13 Sep 2020 11:47:07 +0200 Subject: [PATCH 12/14] Increment once to be sure --- app/build/docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build/docker-compose.yml b/app/build/docker-compose.yml index 7774b66..94bc154 100644 --- a/app/build/docker-compose.yml +++ b/app/build/docker-compose.yml @@ -44,7 +44,7 @@ services: # https://github.com/jitsi/jicofo PREFIXV: stable/jitsi-meet_ VERSION: 4966 - image: superboum/amd64_jitsi_conference_focus:v4 + image: superboum/amd64_jitsi_conference_focus:v5 jitsi-videobridge: build: @@ -53,11 +53,11 @@ services: # https://github.com/jitsi/jitsi-videobridge PREFIXV: stable/jitsi-meet_ VERSION: 4966 - image: superboum/amd64_jitsi_videobridge:v14 + image: superboum/amd64_jitsi_videobridge:v15 jitsi-xmpp: build: context: ./jitsi-xmpp args: VERSION: fake-1 - image: superboum/amd64_jitsi_xmpp:v3 + image: superboum/amd64_jitsi_xmpp:v4 From d76d82fccb10911278fc32882ee4809212822f81 Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Sun, 13 Sep 2020 09:48:04 +0000 Subject: [PATCH 13/14] Use jre headless for more leightweight images --- app/build/jitsi-videobridge/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build/jitsi-videobridge/Dockerfile b/app/build/jitsi-videobridge/Dockerfile index dfbadb7..c17fb4f 100644 --- a/app/build/jitsi-videobridge/Dockerfile +++ b/app/build/jitsi-videobridge/Dockerfile @@ -18,7 +18,7 @@ RUN unzip jvb.zip && \ FROM debian:buster RUN apt-get update && \ - apt-get install -y openjdk-11-jdk + apt-get install -y openjdk-11-jre-headless COPY --from=builder /jvb/build /srv/jvb ENV HOME=/root From d5bfc38fe826aa12f46de64790195cc8e76756de Mon Sep 17 00:00:00 2001 From: Quentin Date: Sun, 13 Sep 2020 12:00:48 +0200 Subject: [PATCH 14/14] Final step for jitsi --- app/deployment/jitsi.hcl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/deployment/jitsi.hcl b/app/deployment/jitsi.hcl index 2ab5b11..c1bee73 100644 --- a/app/deployment/jitsi.hcl +++ b/app/deployment/jitsi.hcl @@ -11,7 +11,7 @@ job "jitsi" { task "xmpp" { driver = "docker" config { - image = "superboum/amd64_jitsi_xmpp:v2" + image = "superboum/amd64_jitsi_xmpp:v4" network_mode = "host" port_map { xmpp_port = 5222 @@ -151,7 +151,7 @@ job "jitsi" { task "jicofo" { driver = "docker" config { - image = "superboum/amd64_jitsi_conference_focus:v4" + image = "superboum/amd64_jitsi_conference_focus:v5" network_mode = "host" } @@ -183,7 +183,7 @@ job "jitsi" { task "videobridge" { driver = "docker" config { - image = "superboum/amd64_jitsi_videobridge:v13" + image = "superboum/amd64_jitsi_videobridge:v15" network_mode = "host" port_map { video1_port = 8080