From c74dc92febd1841c8ea5ff31caab0f941d57527d Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Sat, 16 Jan 2021 17:07:01 +0100 Subject: Proposal: reorganize app/ folder by modules --- app/integration/jitsi/01_gen_certs.yml | 8 ------- app/integration/jitsi/02_run.yml | 27 ------------------------ app/integration/jitsi/README.md | 26 ----------------------- app/integration/jitsi/dev.env | 10 --------- app/integration/jitsi/jitsi-certs/.gitignore | 2 -- app/integration/nextcloud/README.md | 20 ------------------ app/integration/nextcloud/bottin.json | 31 ---------------------------- app/integration/nextcloud/docker-compose.yml | 27 ------------------------ app/integration/plume/bottin.json | 31 ---------------------------- app/integration/plume/docker-compose.yml | 28 ------------------------- app/integration/plume/plume.env | 31 ---------------------------- 11 files changed, 241 deletions(-) delete mode 100644 app/integration/jitsi/01_gen_certs.yml delete mode 100644 app/integration/jitsi/02_run.yml delete mode 100644 app/integration/jitsi/README.md delete mode 100644 app/integration/jitsi/dev.env delete mode 100644 app/integration/jitsi/jitsi-certs/.gitignore delete mode 100644 app/integration/nextcloud/README.md delete mode 100644 app/integration/nextcloud/bottin.json delete mode 100644 app/integration/nextcloud/docker-compose.yml delete mode 100644 app/integration/plume/bottin.json delete mode 100644 app/integration/plume/docker-compose.yml delete mode 100644 app/integration/plume/plume.env (limited to 'app/integration') diff --git a/app/integration/jitsi/01_gen_certs.yml b/app/integration/jitsi/01_gen_certs.yml deleted file mode 100644 index bf73291..0000000 --- a/app/integration/jitsi/01_gen_certs.yml +++ /dev/null @@ -1,8 +0,0 @@ -version: '3' -services: - jitsi-xmpp: - image: superboum/amd64_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 deleted file mode 100644 index 73eefad..0000000 --- a/app/integration/jitsi/02_run.yml +++ /dev/null @@ -1,27 +0,0 @@ -version: '3.4' -services: - jitsi-xmpp: - image: superboum/amd64_jitsi_xmpp:v3 - ports: - - "5222:5222" - - "5347:5347" - - "5280:5280" - env_file: [ 'dev.env' ] - volumes: [ './jitsi-certs/:/certs:ro' ] - jitsi-meet: - image: superboum/amd64_jitsi_meet:v1 - ports: - - "443:443" - env_file: [ 'dev.env' ] - volumes: [ './jitsi-certs/:/certs:ro' ] - jitsi-conference-focus: - image: superboum/amd64_jitsi_conference_focus:v4 - env_file: [ 'dev.env' ] - volumes: [ './jitsi-certs/:/certs:ro' ] - jitsi-videobridge: - image: superboum/amd64_jitsi_videobridge:v14 - ports: - - "8080:8080/tcp" - - "10000:10000/udp" - env_file: [ 'dev.env' ] - volumes: [ './jitsi-certs/:/certs:ro' ] diff --git a/app/integration/jitsi/README.md b/app/integration/jitsi/README.md deleted file mode 100644 index 70b59fc..0000000 --- a/app/integration/jitsi/README.md +++ /dev/null @@ -1,26 +0,0 @@ -This installation is inspired by: https://github.com/jitsi/jitsi-meet/blob/master/doc/manual-install.md - -To build images: - -``` -docker-compose -f 02_run.yml build -``` - -To gen the certs: - -``` -docker-compose -f 01_gen_certs.yml up --force-recreate -``` - -To run the stack: - - -``` -docker-compose -f 02_run.yml up --force-recreate -``` - -To push the stack on the docker registry: - -``` -docker-compose -f 02_run.yml push -``` diff --git a/app/integration/jitsi/dev.env b/app/integration/jitsi/dev.env deleted file mode 100644 index 1dd2122..0000000 --- a/app/integration/jitsi/dev.env +++ /dev/null @@ -1,10 +0,0 @@ -JITSI_SECRET_VIDEOBRIDGE=S3CR3T01 -JITSI_SECRET_JICOFO_COMPONENT=S3CR3T02 -JITSI_SECRET_JICOFO_USER=S3CR3T03 -JITSI_PROSODY_BOSH_PORT=5280 -JITSI_PROSODY_BOSH_HOST=172.17.0.1 -JITSI_PROSODY_HOST=172.17.0.1 -JITSI_CERTS_FOLDER=/certs/ -JITSI_NAT_PUBLIC_IP=37.164.35.154 -JITSI_NAT_LOCAL_IP=192.168.0.231 -JITSI_VIDEO_TCP=8080 diff --git a/app/integration/jitsi/jitsi-certs/.gitignore b/app/integration/jitsi/jitsi-certs/.gitignore deleted file mode 100644 index d6b7ef3..0000000 --- a/app/integration/jitsi/jitsi-certs/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/app/integration/nextcloud/README.md b/app/integration/nextcloud/README.md deleted file mode 100644 index 3d49768..0000000 --- a/app/integration/nextcloud/README.md +++ /dev/null @@ -1,20 +0,0 @@ -Install Owncloud CLI: - -php ./occ \ - --no-interaction \ - --verbose \ - maintenance:install \ - --database pgsql \ - --database-name nextcloud \ - --database-host postgres \ - --database-user nextcloud \ - --database-pass nextcloud \ - --admin-user nextcloud \ - --admin-pass nextcloud \ - --admin-email coucou@deuxfleurs.fr - -Official image entrypoint: - -https://github.com/nextcloud/docker/blob/master/20.0/fpm/entrypoint.sh - - diff --git a/app/integration/nextcloud/bottin.json b/app/integration/nextcloud/bottin.json deleted file mode 100644 index a970762..0000000 --- a/app/integration/nextcloud/bottin.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "suffix": "dc=deuxfleurs,dc=fr", - "bind": "0.0.0.0:389", - "consul_host": "http://consul:8500", - "log_level": "debug", - "acl": [ - "*,dc=deuxfleurs,dc=fr::read:*:* !userpassword", - "*::read modify:SELF:*", - "ANONYMOUS::bind:*,ou=users,dc=deuxfleurs,dc=fr:", - "ANONYMOUS::bind:cn=admin,dc=deuxfleurs,dc=fr:", - "*,ou=services,ou=users,dc=deuxfleurs,dc=fr::bind:*,ou=users,dc=deuxfleurs,dc=fr:*", - "*,ou=services,ou=users,dc=deuxfleurs,dc=fr::read:*:*", - - "*:cn=asso_deuxfleurs,ou=groups,dc=deuxfleurs,dc=fr:add:*,ou=invitations,dc=deuxfleurs,dc=fr:*", - "ANONYMOUS::bind:*,ou=invitations,dc=deuxfleurs,dc=fr:", - "*,ou=invitations,dc=deuxfleurs,dc=fr::delete:SELF:*", - - "*:cn=asso_deuxfleurs,ou=groups,dc=deuxfleurs,dc=fr:add:*,ou=users,dc=deuxfleurs,dc=fr:*", - "*,ou=invitations,dc=deuxfleurs,dc=fr::add:*,ou=users,dc=deuxfleurs,dc=fr:*", - - "*:cn=asso_deuxfleurs,ou=groups,dc=deuxfleurs,dc=fr:modifyAdd:cn=email,ou=groups,dc=deuxfleurs,dc=fr:*", - "*,ou=invitations,dc=deuxfleurs,dc=fr::modifyAdd:cn=email,ou=groups,dc=deuxfleurs,dc=fr:*", - "*:cn=asso_deuxfleurs,ou=groups,dc=deuxfleurs,dc=fr:modifyAdd:cn=seafile,ou=groups,dc=deuxfleurs,dc=fr:*", - "*,ou=invitations,dc=deuxfleurs,dc=fr::modifyAdd:cn=seafile,ou=groups,dc=deuxfleurs,dc=fr:*", - "*:cn=asso_deuxfleurs,ou=groups,dc=deuxfleurs,dc=fr:modifyAdd:cn=nextcloud,ou=groups,dc=deuxfleurs,dc=fr:*", - "*,ou=invitations,dc=deuxfleurs,dc=fr::modifyAdd:cn=seafile,ou=nextcloud,dc=deuxfleurs,dc=fr:*", - - "cn=admin,dc=deuxfleurs,dc=fr::read add modify delete:*:*", - "*:cn=admin,ou=groups,dc=deuxfleurs,dc=fr:read add modify delete:*:*" - ] -} diff --git a/app/integration/nextcloud/docker-compose.yml b/app/integration/nextcloud/docker-compose.yml deleted file mode 100644 index 7ba090b..0000000 --- a/app/integration/nextcloud/docker-compose.yml +++ /dev/null @@ -1,27 +0,0 @@ -version: '3.4' -services: - php: - image: lxpz/deuxfleurs_nextcloud_amd64:8 - depends_on: - - bottin - - postgres - ports: - - "80:80" - - postgres: - image: postgres:9.6.19 - environment: - - POSTGRES_DB=nextcloud - - POSTGRES_USER=nextcloud - - POSTGRES_PASSWORD=nextcloud - - bottin: - image: lxpz/bottin_amd64:14 - depends_on: - - consul - volumes: - - ./bottin.json:/config.json - - consul: - image: consul:1.8.4 - diff --git a/app/integration/plume/bottin.json b/app/integration/plume/bottin.json deleted file mode 100644 index a970762..0000000 --- a/app/integration/plume/bottin.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "suffix": "dc=deuxfleurs,dc=fr", - "bind": "0.0.0.0:389", - "consul_host": "http://consul:8500", - "log_level": "debug", - "acl": [ - "*,dc=deuxfleurs,dc=fr::read:*:* !userpassword", - "*::read modify:SELF:*", - "ANONYMOUS::bind:*,ou=users,dc=deuxfleurs,dc=fr:", - "ANONYMOUS::bind:cn=admin,dc=deuxfleurs,dc=fr:", - "*,ou=services,ou=users,dc=deuxfleurs,dc=fr::bind:*,ou=users,dc=deuxfleurs,dc=fr:*", - "*,ou=services,ou=users,dc=deuxfleurs,dc=fr::read:*:*", - - "*:cn=asso_deuxfleurs,ou=groups,dc=deuxfleurs,dc=fr:add:*,ou=invitations,dc=deuxfleurs,dc=fr:*", - "ANONYMOUS::bind:*,ou=invitations,dc=deuxfleurs,dc=fr:", - "*,ou=invitations,dc=deuxfleurs,dc=fr::delete:SELF:*", - - "*:cn=asso_deuxfleurs,ou=groups,dc=deuxfleurs,dc=fr:add:*,ou=users,dc=deuxfleurs,dc=fr:*", - "*,ou=invitations,dc=deuxfleurs,dc=fr::add:*,ou=users,dc=deuxfleurs,dc=fr:*", - - "*:cn=asso_deuxfleurs,ou=groups,dc=deuxfleurs,dc=fr:modifyAdd:cn=email,ou=groups,dc=deuxfleurs,dc=fr:*", - "*,ou=invitations,dc=deuxfleurs,dc=fr::modifyAdd:cn=email,ou=groups,dc=deuxfleurs,dc=fr:*", - "*:cn=asso_deuxfleurs,ou=groups,dc=deuxfleurs,dc=fr:modifyAdd:cn=seafile,ou=groups,dc=deuxfleurs,dc=fr:*", - "*,ou=invitations,dc=deuxfleurs,dc=fr::modifyAdd:cn=seafile,ou=groups,dc=deuxfleurs,dc=fr:*", - "*:cn=asso_deuxfleurs,ou=groups,dc=deuxfleurs,dc=fr:modifyAdd:cn=nextcloud,ou=groups,dc=deuxfleurs,dc=fr:*", - "*,ou=invitations,dc=deuxfleurs,dc=fr::modifyAdd:cn=seafile,ou=nextcloud,dc=deuxfleurs,dc=fr:*", - - "cn=admin,dc=deuxfleurs,dc=fr::read add modify delete:*:*", - "*:cn=admin,ou=groups,dc=deuxfleurs,dc=fr:read add modify delete:*:*" - ] -} diff --git a/app/integration/plume/docker-compose.yml b/app/integration/plume/docker-compose.yml deleted file mode 100644 index b88de8a..0000000 --- a/app/integration/plume/docker-compose.yml +++ /dev/null @@ -1,28 +0,0 @@ -version: '3.4' -services: - plume: - image: superboum/plume:v1 - env_file: - - plume.env - depends_on: - - consul - - postgres - ports: - - "7878:7878" - - postgres: - image: postgres:9.6.19 - environment: - - POSTGRES_DB=plume - - POSTGRES_USER=plume - - POSTGRES_PASSWORD=plume - - bottin: - image: lxpz/bottin_amd64:14 - depends_on: - - consul - volumes: - - ./bottin.json:/config.json - - consul: - image: consul:1.8.4 diff --git a/app/integration/plume/plume.env b/app/integration/plume/plume.env deleted file mode 100644 index 88c62dc..0000000 --- a/app/integration/plume/plume.env +++ /dev/null @@ -1,31 +0,0 @@ -BASE_URL=integration.env -# generate one with openssl rand -base64 32 -ROCKET_SECRET_KEY=cXZbKoxWIBo0wdaD8tbA1B3BlH2LBSUmgzdyZZr8QxI= - -# Mail settings -#MAIL_SERVER=smtp.example.org -#MAIL_USER=example -#MAIL_PASSWORD=123456 -#MAIL_HELO_NAME=example.org - -# DATABASE SETUP -POSTGRES_PASSWORD=plume -POSTGRES_USER=plume -POSTGRES_DB=plume -DATABASE_URL=postgres://plume:plume@postgres:5432/plume -MIGRATION_DIRECTORY=migrations/postgres - -USE_HTTPS=0 -ROCKET_ADDRESS=0.0.0.0 -ROCKET_PORT=7878 - -MEDIA_UPLOAD_DIRECTORY=/app/static/media -SEARCH_INDEX=/app/search_index -DOMAIN_NAME="integration.env" -INSTANCE_NAME="Integration Instance" - -LDAP_ADDR=ldap://bottin:389 -LDAP_BASE_DN=ou=users,dc=deuxfleurs,dc=fr -LDAP_USER_NAME_ATTR=cn -LDAP_USER_MAIL_ATTR=mail -LDAP_TLS=false -- cgit v1.2.3