diff --git a/env/.env b/env/.env index 330d2e7..eb2509a 100644 --- a/env/.env +++ b/env/.env @@ -28,6 +28,10 @@ MASTERIDENTITY=SQL # SQL or CAS (todo LDAP or OPENID) MODE_AUTH=CAS +# REGISTRATION +# none or byadmin or byuser +MODEREGISTRATION=byadmin + # SERVER SMTP MAILER_DSN=sendmail://default @@ -122,7 +126,7 @@ LDAP_SYNC=1 LDAP_TEMPLATE=open LDAP_USERNAME=uid -LDAP_FIRSTNAME=givenname +LDAP_FIRSTNAME=givenName LDAP_LASTNAME=sn LDAP_DISPLAYNAME=displayName LDAP_EMAIL=mail @@ -156,6 +160,10 @@ CAS_HOST=${WEB_URL} CAS_PORT=443 CAS_PATH=/auth/realms/nine/protocol/cas CAS_URL=${PROTOCOLE}://${CAS_HOST}:${CAS_PORT} +CAS_USERNAME=${LDAP_USERNAME} +CAS_MAIL=${LDAP_EMAIL} +CAS_LASTNAME=${LDAP_LASTNAME} +CAS_FIRSTNAME=${LDAP_FIRSTNAME} # DOKUWIKI DOKUWIKI_SERVICE_NAME=dokuwiki diff --git a/nine.sh b/nine.sh index d342883..fb2a80e 100755 --- a/nine.sh +++ b/nine.sh @@ -304,6 +304,11 @@ then elif [[ $1 == "pull" ]] then pull $2 +elif [[ $1 == "pulluplogs" ]] +then + pull $2 + up $2 + docker-compose logs -f $2 elif [[ $1 == "services" ]] then services @@ -365,6 +370,8 @@ else EchoRouge "nine.sh destroy monservice > détruit monservices et si souhaitez sa BDD et ses volumes persistant" EchoRouge "nine.sh pull > Mettre à jour l'ensemble des images" EchoRouge "nine.sh pull monservice > Mettre à jour l'image de monservice" + EchoRouge "nine.sh pulluplogs > Mettre à jour l'ensemble des images et uplogs de l'ensemble des services" + EchoRouge "nine.sh pulluplogs monservice > Mettre à jour l'image de monservice et uplogs de mon service" EchoRouge "nine.sh services > Liste des Services" EchoRouge "nine.sh logs > LOGS de l'ensemble des services" EchoRouge "nine.sh logs monservice > LOGS de monservice" diff --git a/services/30-openldap/volume/nine/ldif/nine.ldif b/services/30-openldap/volume/nine/ldif/nine.ldif index 09d398c..1b2afc8 100644 --- a/services/30-openldap/volume/nine/ldif/nine.ldif +++ b/services/30-openldap/volume/nine/ldif/nine.ldif @@ -57,7 +57,7 @@ uid: admin cn: admin sn: admin displayName: admin -givenname: admin +givenName: admin mail: arno.nanor@gmail.com siren: nine niveau01: niveau01 diff --git a/services/50-ninefolio/env/.env b/services/50-ninefolio/env/.env index fa2e7f1..125e576 100644 --- a/services/50-ninefolio/env/.env +++ b/services/50-ninefolio/env/.env @@ -25,3 +25,4 @@ DATABASE_HOST=${MARIADB_SERVICE_NAME} +