diff --git a/app/science/deploy/science.hcl b/app/bagage/deploy/bagage.hcl similarity index 60% rename from app/science/deploy/science.hcl rename to app/bagage/deploy/bagage.hcl index 1701027..2c8884b 100644 --- a/app/science/deploy/science.hcl +++ b/app/bagage/deploy/bagage.hcl @@ -1,45 +1,46 @@ -job "science" { +job "bagage" { datacenters = ["dc1"] type = "service" - priority = 10 + priority = 90 constraint { attribute = "${attr.cpu.arch}" value = "amd64" } - group "diagnet" { + group "main" { + count = 1 + network { - port "web_port" { to = 8000 } + port "web_port" { to = 8080 } } - task "main" { + task "server" { driver = "docker" config { - image = "lesterpig/diagnet-landmark:latest" - args = [ - "-name", "landmark-deuxfleurs", - "-chrome", "-chrome-interval", "60m", - "-http", ":8000" - ] + image = "superboum/amd64_bagage:v5" + readonly_rootfs = true ports = [ "web_port" ] } + env { + BAGAGE_LDAP_ENDPOINT = "bottin2.service.2.cluster.deuxfleurs.fr:389" + } + resources { - cpu = 100 - memory = 250 + memory = 100 } service { + name = "bagage" tags = [ - "diagnet", + "bagage", "traefik.enable=true", "traefik.frontend.entryPoints=https,http", - "traefik.frontend.rule=Host:diagnet.science.deuxfleurs.fr;PathPrefix:/" + "traefik.frontend.rule=Host:bagage.deuxfleurs.fr", ] port = "web_port" address_mode = "host" - name = "diagnet" check { type = "tcp" port = "web_port" diff --git a/app/nextcloud/build/nextcloud/Dockerfile b/app/nextcloud/build/nextcloud/Dockerfile deleted file mode 100644 index 9f817f6..0000000 --- a/app/nextcloud/build/nextcloud/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -FROM debian:10 - -RUN apt-get update && \ - apt-get -qq -y full-upgrade - -RUN apt-get install -y apache2 php php-gd php-mbstring php-pgsql php-curl php-dom php-xml php-zip \ - php-intl php-ldap php-fileinfo php-exif php-apcu php-redis php-imagick unzip curl wget && \ - phpenmod gd && \ - phpenmod curl && \ - phpenmod mbstring && \ - phpenmod pgsql && \ - phpenmod dom && \ - phpenmod zip && \ - phpenmod intl && \ - phpenmod ldap && \ - phpenmod fileinfo && \ - phpenmod exif && \ - phpenmod apcu && \ - phpenmod redis && \ - phpenmod imagick && \ - phpenmod xml - -COPY container-setup.sh /tmp -RUN /tmp/container-setup.sh - -COPY entrypoint.sh / -CMD /entrypoint.sh diff --git a/app/nextcloud/build/nextcloud/container-setup.sh b/app/nextcloud/build/nextcloud/container-setup.sh deleted file mode 100755 index 8330291..0000000 --- a/app/nextcloud/build/nextcloud/container-setup.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -set -ex - -curl https://download.nextcloud.com/server/releases/nextcloud-19.0.0.zip > /tmp/nextcloud.zip -cd /var/www -unzip /tmp/nextcloud.zip -rm /tmp/nextcloud.zip -mv html html.old -mv nextcloud html - -cd html -mkdir data - -cd apps -wget https://github.com/nextcloud/tasks/releases/download/v0.13.1/tasks.tar.gz -tar xf tasks.tar.gz -wget https://github.com/nextcloud/maps/releases/download/v0.1.6/maps-0.1.6.tar.gz -tar xf maps-0.1.6.tar.gz -wget https://github.com/nextcloud/calendar/releases/download/v2.0.3/calendar.tar.gz -tar xf calendar.tar.gz -wget https://github.com/nextcloud/news/releases/download/14.1.11/news.tar.gz -tar xf news.tar.gz -wget https://github.com/nextcloud/notes/releases/download/v3.6.0/notes.tar.gz -tar xf notes.tar.gz -wget https://github.com/nextcloud/contacts/releases/download/v3.3.0/contacts.tar.gz -tar xf contacts.tar.gz -wget https://github.com/nextcloud/mail/releases/download/v1.4.0/mail.tar.gz -tar xf mail.tar.gz -wget https://github.com/nextcloud/groupfolders/releases/download/v6.0.6/groupfolders.tar.gz -tar xf groupfolders.tar.gz -rm *.tar.gz - -chown -R www-data:www-data /var/www/html - -cd /var/www/html -php occ diff --git a/app/nextcloud/build/nextcloud/entrypoint.sh b/app/nextcloud/build/nextcloud/entrypoint.sh deleted file mode 100755 index 72b4f94..0000000 --- a/app/nextcloud/build/nextcloud/entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -set -xe - -chown www-data:www-data /var/www/html/config/config.php -touch /var/www/html/data/.ocdata - -exec apachectl -DFOREGROUND diff --git a/app/nextcloud/config/config.php.tpl b/app/nextcloud/config/config.php.tpl deleted file mode 100644 index 7dcfc6e..0000000 --- a/app/nextcloud/config/config.php.tpl +++ /dev/null @@ -1,49 +0,0 @@ - false, - 'instanceid' => '{{ key "secrets/nextcloud/instance_id" | trimSpace }}', - 'passwordsalt' => '{{ key "secrets/nextcloud/password_salt" | trimSpace }}', - 'secret' => '{{ key "secrets/nextcloud/secret" | trimSpace }}', - 'trusted_domains' => array ( - 0 => 'nextcloud.deuxfleurs.fr', - ), - 'memcache.local' => '\\OC\\Memcache\\APCu', - - 'objectstore' => array( - 'class' => '\\OC\\Files\\ObjectStore\\S3', - 'arguments' => array( - 'bucket' => 'nextcloud', - 'autocreate' => false, - 'key' => '{{ key "secrets/nextcloud/garage_access_key" | trimSpace }}', - 'secret' => '{{ key "secrets/nextcloud/garage_secret_key" | trimSpace }}', - 'hostname' => 'garage.deuxfleurs.fr', - 'port' => 443, - 'use_ssl' => true, - 'region' => 'garage', - // required for some non Amazon S3 implementations - 'use_path_style' => true - ), - ), - - 'dbtype' => 'pgsql', - 'dbhost' => 'psql-proxy.service.2.cluster.deuxfleurs.fr', - 'dbname' => 'nextcloud', - 'dbtableprefix' => 'nc_', - 'dbuser' => '{{ key "secrets/nextcloud/db_user" | trimSpace }}', - 'dbpassword' => '{{ key "secrets/nextcloud/db_pass" | trimSpace }}', - - 'default_language' => 'fr', - 'default_locale' => 'fr_FR', - - 'mail_domain' => 'deuxfleurs.fr', - 'mail_from_address' => 'nextcloud@deuxfleurs.fr', - // TODO SMTP CONFIG - - // TODO REDIS CACHE - - 'version' => '19.0.0.12', - 'overwrite.cli.url' => 'https://nextcloud.deuxfleurs.fr', - - 'installed' => true, -); - diff --git a/app/nextcloud/deploy/nextcloud.hcl b/app/nextcloud/deploy/nextcloud.hcl deleted file mode 100644 index 8852787..0000000 --- a/app/nextcloud/deploy/nextcloud.hcl +++ /dev/null @@ -1,65 +0,0 @@ -job "nextcloud" { - datacenters = ["dc1", "belair"] - type = "service" - priority = 40 - - constraint { - attribute = "${attr.cpu.arch}" - value = "amd64" - } - - group "nextcloud" { - count = 1 - - network { - port "web_port" { - to = 80 - } - } - - task "nextcloud" { - driver = "docker" - config { - image = "lxpz/deuxfleurs_nextcloud_amd64:8" - ports = [ "web_port" ] - volumes = [ - "secrets/config.php:/var/www/html/config/config.php" - ] - } - - template { - data = file("../config/config.php.tpl") - destination = "secrets/config.php" - } - - resources { - memory = 1000 - cpu = 2000 - } - - service { - name = "nextcloud" - tags = [ - "nextcloud", - "traefik.enable=true", - "traefik.frontend.entryPoints=https,http", - "traefik.frontend.rule=Host:nextcloud.deuxfleurs.fr", - ] - port = "web_port" - address_mode = "host" - check { - type = "tcp" - port = "web_port" - interval = "60s" - timeout = "5s" - check_restart { - limit = 3 - grace = "90s" - ignore_warnings = false - } - } - } - } - } -} - diff --git a/app/nextcloud/integration/README.md b/app/nextcloud/integration/README.md deleted file mode 100644 index 3d49768..0000000 --- a/app/nextcloud/integration/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/nextcloud/integration/bottin.json b/app/nextcloud/integration/bottin.json deleted file mode 100644 index a970762..0000000 --- a/app/nextcloud/integration/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/nextcloud/integration/docker-compose.yml b/app/nextcloud/integration/docker-compose.yml deleted file mode 100644 index 7ba090b..0000000 --- a/app/nextcloud/integration/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/seafile/build/mariadb/60-disable-dialog.cnf b/app/seafile/build/mariadb/60-disable-dialog.cnf deleted file mode 100644 index d41731a..0000000 --- a/app/seafile/build/mariadb/60-disable-dialog.cnf +++ /dev/null @@ -1,3 +0,0 @@ -[mariadb] -pam_use_cleartext_plugin -bind-address = 0.0.0.0 diff --git a/app/seafile/build/mariadb/60-ldap.cnf b/app/seafile/build/mariadb/60-ldap.cnf deleted file mode 100644 index 72ffb9f..0000000 --- a/app/seafile/build/mariadb/60-ldap.cnf +++ /dev/null @@ -1,3 +0,0 @@ -[mariadb] -plugin-load=auth_pam.so - diff --git a/app/seafile/build/mariadb/60-remote.cnf b/app/seafile/build/mariadb/60-remote.cnf deleted file mode 100644 index acf8f9b..0000000 --- a/app/seafile/build/mariadb/60-remote.cnf +++ /dev/null @@ -1,2 +0,0 @@ -[mysqld] -bind-address = * diff --git a/app/seafile/build/mariadb/Dockerfile b/app/seafile/build/mariadb/Dockerfile deleted file mode 100644 index 15ef954..0000000 --- a/app/seafile/build/mariadb/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM debian:stretch - -RUN apt-get update && \ - apt-get dist-upgrade -y && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y mariadb-server mariadb-client libnss-ldapd - -COPY 60-ldap.cnf /etc/mysql/mariadb.conf.d/60-ldap.cnf -COPY 60-remote.cnf /etc/mysql/mariadb.conf.d/60-remote.cnf -COPY 60-disable-dialog.cnf /etc/mysql/mariadb.conf.d/60-disable-dialog.cnf -COPY pam-mariadb /etc/pam.d/mariadb -COPY nsswitch.conf /etc/nsswitch.conf -COPY entrypoint.sh /usr/local/bin/entrypoint - -ENTRYPOINT ["/usr/local/bin/entrypoint"] diff --git a/app/seafile/build/mariadb/README.md b/app/seafile/build/mariadb/README.md deleted file mode 100644 index 1a3b8aa..0000000 --- a/app/seafile/build/mariadb/README.md +++ /dev/null @@ -1,19 +0,0 @@ -``` -sudo docker build -t superboum/amd64_mariadb:v3 . - -sudo docker run \ - -t -i \ - -p 3306:3306 \ - -v /tmp/mysql:/var/lib/mysql \ - -e LDAP_URI='ldap://bottin.service.2.cluster.deuxfleurs.fr' \ - -e LDAP_BASE='ou=users,dc=deuxfleurs,dc=fr' \ - -e LDAP_VERSION=3 \ - -e LDAP_BIND_DN='cn=admin,dc=deuxfleurs,dc=fr' \ - -e LDAP_BIND_PW='xxxx' \ - -e MYSQL_PASSWORD='xxxx' \ - superboum/amd64_mariadb:v1 \ - tail -f /var/log/mysql/error.log - -CREATE USER quentin@localhost IDENTIFIED VIA pam USING 'mariadb'; - -``` diff --git a/app/seafile/build/mariadb/entrypoint.sh b/app/seafile/build/mariadb/entrypoint.sh deleted file mode 100755 index 1bb2f01..0000000 --- a/app/seafile/build/mariadb/entrypoint.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -set -e - -cat > /etc/nslcd.conf <