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

src/ninegate-1.0/app/config/config.yml

@@ -18,7 +18,7 @@ monolog:
         main:
             type:  rotating_file
             path:  '%kernel.logs_dir%/%kernel.environment%.log'
-            level: debug
+            level: error
             max_files: 10
 
 framework:

src/ninegate-1.0/scripts/ninegate-cron.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 cd /var/www/html/ninegate
-php bin/console Cron:Exec
+php bin/console Cron:Exec --env=prod

src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql

@@ -8,7 +8,7 @@ INSERT IGNORE INTO `niveau01` (`id`, `label`, `siren`) VALUES
 (-100, 'Interne', 'SIREN');
 
 INSERT IGNORE INTO `user` (`id`, `niveau01_id`, `username`, `firstname`, `lastname`, `password`, `email`, `avatar`, `role`,`siren`,`authlevel`) VALUES
-(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}DaOp1rZbdNu4Njbw+JpKmuufVKXN9s/5
+(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}sh/qcK9rVlrIFTJVhcolNLa3Ww0g4ZzK
 ', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple');