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

debian/compat

@@ -0,0 +1 @@
+7

debian/control

@@ -0,0 +1,24 @@
+Source: eole-nineschool
+Section: web
+Priority: optional
+Maintainer: Equipe Envole <eole@ac-dijon.fr>
+Build-Depends: debhelper (>= 7.0.50)
+Standards-Version: 3.8.4
+Homepage: http://eole.orion.education.fr/diff/
+Vcs-Git: http://dev-eole.ac-dijon.fr/git/nineschool
+Vcs-Browser: http://dev-eole.ac-dijon.fr/projects/nineschool/repository
+
+Package: nineschool-sso
+Architecture: all
+Depends: ${misc:Depends}, eole-sso
+Description: Filtre SSO pour nineschool "EOLE".
+
+Package: eole-nineschool
+Architecture: all
+Depends: ${misc:Depends}, eole-envole-dependances, nineschool-sso
+Description: Eolisation de l'application nineschool.
+
+Package: nineschool-apps
+Architecture: all
+Depends: ${misc:Depends}, envole-dependances-apps
+Description: Sources pour nineschool "EOLE".

debian/copyright

@@ -0,0 +1,44 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: {PROJECT}
+Source: {URL}
+
+Files: *
+Copyright: YEAR {UPSTREAM} {AUTHOR} <{MAIL}>
+License: {UPSTREAM LICENSE}
+
+Files: debian/*
+Copyright: 2012 Équipe EOLE <eole@ac-dijon.fr>
+License: CeCILL-2
+
+License: {UPSTREAM LICENSE}
+ {TEXT OF THE LICENSE}
+
+License: CeCILL-2
+ This software is governed by the CeCILL-2 license under French law and
+ abiding by the rules of distribution of free software.  You can  use,
+ modify and or redistribute the software under the terms of the CeCILL-2
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info";.
+ .
+ As a counterpart to the access to the source code and  rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty  and the software's author,  the holder of the
+ economic rights,  and the successive licensors  have only  limited
+ liability.
+ .
+ In this respect, the user's attention is drawn to the risks associated
+ with loading,  using,  modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean  that it is complicated to manipulate,  and  that  also
+ therefore means  that it is reserved for developers  and  experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and,  more generally, to use and operate it in the
+ same conditions as regards security.
+ .
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL-2 license and that you accept its terms.
+ .
+ On Eole systems, the complete text of the CeCILL-2 License can be found
+ in '/usr/share/common-licenses/CeCILL-2-en'.

debian/eole-nineschool.install

@@ -0,0 +1 @@
+usr/share/eole

debian/gbp.conf

@@ -0,0 +1,3 @@
+# Set per distribution debian tag
+[DEFAULT]
+debian-tag = debian/envole/%(version)s

debian/nineschool-apps.install

@@ -0,0 +1,2 @@
+var/www/html
+etc

debian/nineschool-sso.install

@@ -0,0 +1 @@
+usr/share/sso

debian/rules

@@ -0,0 +1,8 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

dicos/90_nineschool.xml

@@ -2,7 +2,6 @@
 <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>
@@ -20,11 +19,10 @@
 	</containers>
 
 	<variables>
-        <family name='nineschool' icon='eye-open'>
+        <family name='nineschool'>
             <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>
 
@@ -54,9 +52,8 @@
             <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'/>
@@ -69,7 +66,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 EoleDB associés à Nineschool</separator>
+            <separator name="nineschool_db_mode">Paramètres associés à la Base de Données</separator>
         </separators> 
 	</variables>
 
@@ -78,15 +75,9 @@
         <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'>
@@ -116,7 +107,6 @@
             <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,19 +1,36 @@
-# Symfony
+# In all environments, the following files are loaded if they exist,
-APP_ENV=PROD
+# the latter taking precedence over the former:
-APP_SECRET=changemeinenvlocal
+#
+#  * .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
 #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_WEBURL=
+APP_ALIAS=nineschool
-APP_MASTERIDENTITY=LDAP
 APP_AUTH=MYSQL
-APP_ALIAS=
+APP_NAME=Nineschool
-APP_NAME=
+APP_ENV=PROD
-APP_CRON=1
+APP_CRON=false
-APP_MASTERURL=
-APP_MASTERKEY=
 
 # BDD
 DATABASE_NAME=
@@ -21,15 +38,12 @@ 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=
@@ -41,7 +55,6 @@ LDAP_LASTNAME=sn
 LDAP_EMAIL=mail
 LDAP_ADMINS='["admin"]'
 
-
 # If APP_AUTH = CAS
 CAS_HOST=
 CAS_PORT=
@@ -51,18 +64,9 @@ CAS_EMAIL=email
 CAS_LASTNAME=lastname
 CAS_FIRSTNAME=firstname
 
-
+###> symfony/swiftmailer-bundle ###
-# WEBSOCKET
+# For Gmail as a transport, use: "gmail://username:password@localhost"
-WSS_USE=0
+# For a generic SMTP server, use: "smtp://localhost:25?encryption=&auth_mode="
-WSS_PORT=5586
+# Delivery is disabled by default via "null://localhost"
-
+MAILER_URL=null://localhost
-
+###< symfony/swiftmailer-bundle ###
-# Proxy
-PROXY_USE=0
-PROXY_HOST=
-PROXY_PORT=
-
-
-# Sonde statistic
-SONDE_USE=0
-SONDE_URL=

src/nineschool-1.0/config/routes.yaml

@@ -28,10 +28,6 @@ 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,7 +28,6 @@ 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)%'
@@ -67,7 +66,6 @@ services:
         bind:
             $ldapHost: '%ldapHost%'
             $ldapPort: '%ldapPort%'
-            $ldapTls: '%ldapTls%'
             $ldapUser: '%ldapUser%'
             $ldapPassword: '%ldapPassword%'
             $ldapBasedn: '%ldapBasedn%'
@@ -107,7 +105,7 @@ services:
     app.ldap.service:
         public: true
         class: App\Service\ldapService
-        arguments: ["%ldapHost%","%ldapPort%","%ldapTls%","%ldapUser%","%ldapPassword%","%ldapBasedn%"]
+        arguments: ["%ldapHost%","%ldapPort%","%ldapUser%","%ldapPassword%","%ldapBasedn%"]
 
     app.upload.samename:
         public: true