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

dicos/90_nineschool.xml

@@ -2,6 +2,7 @@
 <creole>
     <files>
         <file filelist='nineschool' name='/etc/eole/eole-db.d/nineschool-db.yml' rm='True' mkdir='True'/>
+        <file filelist='nineschool_nginx' name='/etc/nginx/web.d/nineschool.conf' source='nineschool-nginx.conf' rm='True' mkdir='True' />   
     </files>
 
 	<containers>
@@ -19,10 +20,11 @@
 	</containers>
 
 	<variables>
-        <family name='nineschool'>
+        <family name='nineschool' icon='eye-open'>
             <variable name="ninegate_test_ninegate" type="oui/non" hidden='True' exists='False'><value>non</value></variable>
+            <variable name="activer_revprox" type="oui/non" description="Activer le reverse proxy Nginx" hidden='True' exists='False'><value>non</value></variable>
 
-			<variable name='activer_nineschool' type='oui/non' description='Activer nineschool'>
+			<variable name='activer_nineschool' type='oui/non' description='Activer Nineschool'>
 				<value>oui</value>
 			</variable>
 
@@ -52,8 +54,9 @@
             <variable type='string' name='nineschool_smtppwd' description='Mot de passe associé du compte SMTP' mandatory='True' />
             <variable type='string' name='nineschool_smtpencryption' description='Type Encryptage du serveur SMTP' mandatory='True' />
             <variable type='string' name='nineschool_smtpauthmode' description='Mode Authentification du serveur SMTP' mandatory='True' />
+        </family>
 
-
+        <family name='EoleDB' icon='database' mode='expert'>
             <!-- BDD -->
             <variable type='string' name='nineschool_db_mode' description='Serveur de bases de données à utiliser' mode='expert'/>
             <variable type='string' name='nineschool_dbserver' description='Adresse du serveur de base de données' mode='expert'/>
@@ -66,7 +69,7 @@
         <separators>
             <separator name="nineschool_ldaptemplate">Paramètres associés à l'Annuaire</separator>
             <separator name="nineschool_noreply">Paramètres associés aux Mails</separator>
-            <separator name="nineschool_db_mode">Paramètres associés à la Base de Données</separator>
+            <separator name="nineschool_db_mode">Paramètres EoleDB associés à Nineschool</separator>
         </separators> 
 	</variables>
 
@@ -75,9 +78,15 @@
         <condition name='hidden_if_in' source='activer_apache'>
             <param>non</param>
             <target type='filelist'>nineschool</target>
+            <target type='filelist'>nineschool_nginx</target>
             <target type='servicelist'>nineschool</target>
         </condition>
 
+        <!-- AFFICHAGE EN FONCTION DE REVERSE PROXY -->
+        <condition name='hidden_if_in' source='activer_revprox'>
+            <param>non</param>
+            <target type='filelist'>nineschool_nginx</target>
+        </condition>
 
         <!-- AFFICHAGE EN FONCTION DE NINESCHOOL -->
 		<condition name='hidden_if_in' source='activer_nineschool'>
@@ -107,6 +116,7 @@
             <target type='variable'>nineschool_dbpass</target>
 
 			<target type='filelist'>nineschool</target>
+            <target type='filelist'>nineschool_nginx</target>
 			<target type='servicelist'>nineschool</target>
 		</condition>
 

src/nineschool-1.0/.env

@@ -1,36 +1,19 @@
-# In all environments, the following files are loaded if they exist,
-# the latter taking precedence over the former:
-#
-#  * .env                contains default values for the environment variables needed by the app
-#  * .env.local          uncommitted file with local overrides
-#  * .env.$APP_ENV       committed environment-specific defaults
-#  * .env.$APP_ENV.local uncommitted environment-specific overrides
-#
-# Real environment variables win over .env files.
-#
-# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
-#
-# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
-# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
-
-###> symfony/framework-bundle ###
-APP_SECRET=52c1cb88ee822cd2643abe29e16a68a6
+# 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)$'
-###< symfony/framework-bundle ###
 
-###> symfony/mailer ###
-# MAILER_DSN=smtp://localhost
-###< symfony/mailer ###
-
-###< doctrine/doctrine-bundle ###
 
 # Basic
-APP_ALIAS=nineschool
+APP_WEBURL=
+APP_MASTERIDENTITY=LDAP
 APP_AUTH=MYSQL
-APP_NAME=Nineschool
-APP_ENV=PROD
-APP_CRON=false
+APP_ALIAS=
+APP_NAME=
+APP_CRON=1
+APP_MASTERURL=
+APP_MASTERKEY=
 
 # BDD
 DATABASE_NAME=
@@ -38,12 +21,15 @@ 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=
@@ -55,6 +41,7 @@ LDAP_LASTNAME=sn
 LDAP_EMAIL=mail
 LDAP_ADMINS='["admin"]'
 
+
 # If APP_AUTH = CAS
 CAS_HOST=
 CAS_PORT=
@@ -64,9 +51,18 @@ CAS_EMAIL=email
 CAS_LASTNAME=lastname
 CAS_FIRSTNAME=firstname
 
-###> symfony/swiftmailer-bundle ###
-# For Gmail as a transport, use: "gmail://username:password@localhost"
-# For a generic SMTP server, use: "smtp://localhost:25?encryption=&auth_mode="
-# Delivery is disabled by default via "null://localhost"
-MAILER_URL=null://localhost
-###< symfony/swiftmailer-bundle ###
+
+# WEBSOCKET
+WSS_USE=0
+WSS_PORT=5586
+
+
+# Proxy
+PROXY_USE=0
+PROXY_HOST=
+PROXY_PORT=
+
+
+# Sonde statistic
+SONDE_USE=0
+SONDE_URL=

src/nineschool-1.0/config/routes.yaml

@@ -28,6 +28,10 @@ app_logoutcas:
     path:   /logoutcas
     defaults: { _controller: App\Controller\SecurityController:logout }
 
+app_casdebug:
+    path:   /user/casdebug
+    defaults: { _controller: App\Controller\SecurityController:casdebug }
+
 #== Config ========================================================================================================
 app_config:
     path: /admin/config

src/nineschool-1.0/config/services.yaml

@@ -28,6 +28,7 @@ parameters:
   ldapModel: '%env(resolve:LDAP_MODEL)%'
   ldapHost: '%env(resolve:LDAP_HOST)%'
   ldapPort: '%env(resolve:LDAP_PORT)%'
+  ldapTls: '%env(resolve:LDAP_TLS)%'
   ldapUser: '%env(resolve:LDAP_USER)%'
   ldapPassword: '%env(resolve:LDAP_PASSWORD)%'
   ldapBasedn: '%env(resolve:LDAP_BASEDN)%'
@@ -66,6 +67,7 @@ services:
         bind:
             $ldapHost: '%ldapHost%'
             $ldapPort: '%ldapPort%'
+            $ldapTls: '%ldapTls%'
             $ldapUser: '%ldapUser%'
             $ldapPassword: '%ldapPassword%'
             $ldapBasedn: '%ldapBasedn%'
@@ -105,7 +107,7 @@ services:
     app.ldap.service:
         public: true
         class: App\Service\ldapService
-        arguments: ["%ldapHost%","%ldapPort%","%ldapUser%","%ldapPassword%","%ldapBasedn%"]
+        arguments: ["%ldapHost%","%ldapPort%","%ldapTls%","%ldapUser%","%ldapPassword%","%ldapBasedn%"]
 
     app.upload.samename:
         public: true