Merge branch 'master' into dist/envole/7/master

Makefile

@@ -7,6 +7,7 @@ EOLE_VERSION=2.7
 EOLE_RELEASE=2.7.1
 PKGAPPS=web
 
+
 ################################
 # Début de zone à ne pas éditer
 ################################

src/nineschool-1.0/scripts/.env.model

@@ -0,0 +1,63 @@
+# Symfony
+APP_ENV=PROD
+APP_SECRET=changemeinenvlocal
+#TRUSTED_PROXIES=127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
+#TRUSTED_HOSTS='^(localhost|example\.com)$'
+
+
+# Basic
+APP_WEBURL=
+APP_MASTERIDENTITY=LDAP
+APP_AUTH=MYSQL
+APP_ALIAS=
+APP_NAME=
+APP_CRON=1
+APP_MASTERURL=
+APP_MASTERKEY=
+
+# BDD
+DATABASE_NAME=
+DATABASE_USER=
+DATABASE_PASSWORD=
+DATABASE_HOST=
+
+
+# MAIL sendmail / smtp
+MAILER_METHOD=sendmail
+MAILER_URL=
+MAILER_NOREPLY=noreply@noreply.fr
+
+
+# LDAP
+LDAP_MODEL=open
+LDAP_HOST=
+LDAP_PORT=
+LDAP_USER=
+LDAP_PASSWORD=
+LDAP_BASEDN=
+LDAP_USERNAME=uid
+LDAP_FIRSTNAME=givenname
+LDAP_LASTNAME=sn
+LDAP_EMAIL=mail
+LDAP_ADMINS='["admin"]'
+
+
+# If APP_AUTH = CAS
+CAS_HOST=
+CAS_PORT=
+CAS_PATH=
+CAS_USERNAME=username
+CAS_EMAIL=email
+CAS_LASTNAME=lastname
+CAS_FIRSTNAME=firstname
+
+
+# Proxy
+PROXY_USE=0
+PROXY_HOST=
+PROXY_PORT=
+
+
+# Sonde statistic
+SONDE_USE=0
+SONDE_URL=

src/nineschool-1.0/scripts/reconfigure.sh

@@ -10,9 +10,7 @@ DIR=$(pwd)
 . $DIR/scripts/proxy.sh
 
 # Mise en place du fichier d'environnement model
-if [ ! -f $DIR/.env ]; then
-    mv $DIR/scripts/.env.model $DIR/.env
-fi
+yes 2>/dev/null | cp $DIR/scripts/.env.model $DIR/.env
 
 # Installation des dépendances composer
 echo COMPOSER = Install