diff --git a/env/.env b/env/.env index 77d63a1..a957704 100644 --- a/env/.env +++ b/env/.env @@ -22,7 +22,7 @@ ADMIN_PASSWORD=changeme ADMIN_EMAIL=admin@noreply.fr # MASTERIDENTITY -# SQL or SSO or (to do LDAP) +# SQL or SSO or LDAP MASTERIDENTITY=SQL # AUTHENTIFICATION @@ -46,8 +46,9 @@ NINEAPACHE_LETSENCRYPT=0 # FAKESMTP # fake-smtp server FAKESMTP_SERVICE_NAME=fakesmtp +FAKESMTP_ACTIVATE=0 FAKESMTP_LOCAL=0 -FAKESMTP_ACTIVATE=1 +FAKESMTP_URL=${PROTOCOLE}://${WEB_URL}/fakesmtp # MTA # passerelle courriel @@ -220,12 +221,6 @@ NINESCHOOL_ACTIVATE=1 NINESCHOOL_LOCAL=1 NINESCHOOL_URL=${PROTOCOLE}://${WEB_URL}/nineschool -# NINESKELETOR -NINESKELETOR_SERVICE_NAME=nineskeletor -NINESKELETOR_ACTIVATE=0 -NINESKELETOR_LOCAL=1 -NINESKELETOR_URL=${PROTOCOLE}://${WEB_URL}/nineskeletor - # PIWIGO PIWIGO_SERVICE_NAME=piwigo PIWIGO_ACTIVATE=0 diff --git a/services/50-nineskeletor/apache/apache.conf b/services/50-nineskeletor/apache/apache.conf deleted file mode 100644 index dbcf372..0000000 --- a/services/50-nineskeletor/apache/apache.conf +++ /dev/null @@ -1,5 +0,0 @@ - -# nineskeletor -ProxyPass /nineskeletor http://nineskeletor/nineskeletor retry=0 keepalive=On -ProxyPassReverse /nineskeletor http://nineskeletor/nineskeletor retry=0 - diff --git a/services/50-nineskeletor/dockercompose/dockercompose.yml b/services/50-nineskeletor/dockercompose/dockercompose.yml deleted file mode 100644 index 98b8126..0000000 --- a/services/50-nineskeletor/dockercompose/dockercompose.yml +++ /dev/null @@ -1,14 +0,0 @@ -services: - # Nineskeletor - # Portail collaboratif - # Port interne 80 - nineskeletor: - image: reg.cadoles.com/envole/nineskeletor - container_name: nine-nineskeletor - restart: unless-stopped - env_file: ./services/50-nineskeletor/env/.env.merge - networks: - - nine-network - volumes: - - ./services/50-nineskeletor/volume/data/private:/app/uploads - - ./services/50-nineskeletor/volume/data/public:/app/public/uploads \ No newline at end of file diff --git a/services/50-nineskeletor/env/.env b/services/50-nineskeletor/env/.env deleted file mode 100644 index a5f0b1d..0000000 --- a/services/50-nineskeletor/env/.env +++ /dev/null @@ -1,91 +0,0 @@ - -# == NINESKELETOR ========================================================================================================================= - -# Attention si vous changez cette valeur, il est necessaire de regen votre service (vous pouvez préservez la bdd) -NINESKELETOR_PREFIX=nineskeletor - -APP_SECRET=${ADMIN_PASSWORD} -DATABASE_URL="mysql://${MARIADB_USER}:${MARIADB_PASSWORD}@${MARIADB_SERVICE_NAME}:${MARIADB_PORT}/${NINESKELETOR_SERVICE_NAME}" -LOCK_DSN="mysql://${MARIADB_USER}:${MARIADB_PASSWORD}@${MARIADB_SERVICE_NAME}:${MARIADB_PORT}/${NINESKELETOR_SERVICE_NAME}" - -# Webpack -APP_PUBLIC_PATH=/${NINESKELETOR_PREFIX}/build -APP_MANIFEST_KEY_PREFIX=${NINESKELETOR_PREFIX} - -# Mailer -MAILER_METHOD=smtp -MAILER_DSN=smtp://mailer:1025 -MAILER_NOREPLY=noreply@noreply.fr - -# Basic -APP_WEBURL=${WEB_URL} -APP_MASTERIDENTITY=LDAP # SQL | SSO | LDAP -APP_AUTH=${MODE_AUTH} # SQL | CAS | LDAP | OPENID -APP_ALIAS=/${NINESKELETOR_PREFIX}/ -APP_NAME=Nineskeletor -APP_MODEREGISTRATION= # null | BYADMIN | BYUSER -APP_ADMINS='["admin"]' - -# Module = PORTAL | DOCUMENT -APP_MODULES='["PORTAL"]' - -# Structure Organisationnelle -APP_NIVEAUUPDATABLE=0 # Quel degres de niveau est modifiable par les utilisateurs seule les admin et modo via console peuvent outre passer ce param - -APP_NIVEAU01LABEL="Niveau 01" -APP_NIVEAU01LABELS="Niveaux 01" - -APP_NIVEAU02USE=1 -APP_NIVEAU02LABEL="Niveau 02" -APP_NIVEAU02LABELS="Niveaux 02" -APP_NIVEAU02MANDATORY='[""]' - -APP_NIVEAU03USE=0 -APP_NIVEAU03LABEL="Niveau 03" -APP_NIVEAU03LABELS="Niveaux 03" -APP_NIVEAU03MANDATORY='[""]' - -APP_NIVEAU04USE=0 -APP_NIVEAU04LABEL="Niveau 04" -APP_NIVEAU04LABELS="Niveaux 04" -APP_NIVEAU04MANDATORY='[""]' - -APP_GROUPUSE=1 -APP_GROUPSUBMITER='["ALL"]' - -APP_ANNUSCOPEADMIN=ALL # ALL or number of niveau view : 1||2||3||4 -APP_ANNUSCOPEMODO=ALL # ALL or number of niveau view : 1||2||3||4 -APP_ANNUSCOPEMASTER=ALL # ALL or number of niveau view : 1||2||3||4 -APP_ANNUSCOPEMANAGER=ALL # ALL or number of niveau view : 1||2||3||4 -APP_ANNUSCOPEUSER=ALL # ALL or number of niveau view : 1||2||3||4 - -APP_USERVIEWISVISIBLE=1 # Profil user with isvisible field - -# Synchronisation -APP_SYNCHRO=LDAP2NINE # Synchronisation null | LDAP2NINE | NINE2LDAP | NINE2NINE -APP_SYNDCHROPURGENIVEAU01=1 # Purger les niveau01s obsolète en cas de synchronisation -APP_SYNDCHROPURGENIVEAU02=1 # Purger les niveau02s obsolète en cas de synchronisation -APP_SYNDCHROPURGENIVEAU03=0 # Purger les niveau03s obsolète en cas de synchronisation -APP_SYNDCHROPURGENIVEAU04=0 # Purger les niveau04s obsolète en cas de synchronisation -APP_SYNDCHROPURGEGROUP=1 # Purger les groups obsolète en cas de synchronisation -APP_SYNDCHROPURGEUSER=1 # Purger les users obsolète en cas de synchronisation - -# LDAP -LDAP_USETLS=${LDAP_TLS} # connection TLS 0/1 -LDAP_USERWRITER=1 # LDAP_USER compte writer ? 0/1 - -LDAP_GROUPGID=${LDAP_GROUP_GID} # Attribut gid d'un groupe -LDAP_GROUPNAME=${LDAP_GROUP_NAME} # Attribut name d'un groupe -LDAP_GROUPMEMBER=${LDAP_GROUP_MEMBER} # Attribut stockant les membres d'un groupe -LDAP_GROUPMEMBERISDN=${LDAP_GROUP_MEMBERISDN} # LDAP_GROUPMEMBER stocke un uid ou un dn ? 0/1 -LDAP_FILTERGROUP=${LDAP_GROUP_FILTER} # requete ldap pour rechercher les groupes -LDAP_FILTERUSER=${LDAP_USER_FILTER} # requete ldap pour rechercher les users -LDAP_AUTOSUBMIT=1 # if APP_AUTH = LDAP autocréer les users non existant -LDAP_AUTOUPDATE=1 # if APP_AUTH = LDAP automodifier les users existant - -# Minio -MINIO_URL=http://${MINIO_SERVICE_NAME}:${MINIO_PORT} -MINIO_KEY=${ADMIN_USER} -MINIO_SECRET=${ADMIN_PASSWORD} -MINIO_BUCKET=nine - diff --git a/services/50-nineskeletor/misc/nine.sh b/services/50-nineskeletor/misc/nine.sh deleted file mode 100644 index 33aa2bc..0000000 --- a/services/50-nineskeletor/misc/nine.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - - -function upnineskeletor { - if [[ $NINESKELETOR_ACTIVATE == 1 && $NINESKELETOR_LOCAL == 1 ]] - then - Title ${NINESKELETOR_SERVICE_NAME^^} - - if [[ $MARIADB_ACTIVATE == 1 && $MARIADB_LOCAL == 1 ]] - then - EchoVert "DATABASE" - Echo ${NINESKELETOR_SERVICE_NAME^^} - docker-compose exec $MARIADB_SERVICE_NAME /nine/init.sh $NINESKELETOR_SERVICE_NAME - Echo - fi - - EchoVert "CONTAINER" - upservice ${NINESKELETOR_SERVICE_NAME} - chmod -R a+wr ./services/50-nineskeletor/volume/data - Echo - fi -} - -function destroynineskeletor { - if [[ $NINESKELETOR_LOCAL == 1 ]] - then - Title "DESTROY $NINESKELETOR_SERVICE_NAME" - - stop $NINESKELETOR_SERVICE_NAME 1 - docker-compose rm -s -v -f "$NINESKELETOR_SERVICE_NAME" - - if [[ -z $1 ]]; then - Question_ouinon "Souhaitez-vous supprimer la BDD associé à $NINESKELETOR_SERVICE_NAME ?"; - response=$? - fi - if [[ "$response" == 0 || ! -z $1 ]] - then - EchoRouge "Delete BDD = "$NINESKELETOR_SERVICE_NAME - docker-compose exec $MARIADB_SERVICE_NAME /nine/delete.sh $NINESKELETOR_SERVICE_NAME - rm -rf services/50-nineskeletor/volume/apache - fi - - echo "" - fi -} \ No newline at end of file diff --git a/services/50-nineskeletor/volume/data/private/.gitkeep b/services/50-nineskeletor/volume/data/private/.gitkeep deleted file mode 100644 index e69de29..0000000