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

Makefile

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

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 @@
+var/www/html

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)

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

@@ -1,63 +0,0 @@
-# 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=