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

src/ninesurvey-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=ninesurvey
+APP_WEBURL=
+APP_MASTERIDENTITY=LDAP
 APP_AUTH=MYSQL
-APP_NAME=Ninesurvey
-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,17 @@ 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=5576
+
+
+# Proxy
+PROXY_USE=0
+PROXY_HOST=
+PROXY_PORT=
+
+
+# Sonde statistic
+SONDE_USE=0

src/ninesurvey-1.0/config/packages/twig.yaml

@@ -16,5 +16,4 @@ twig:
       wssuse: '%wssuse%'
       wssurl: '%wssurl%'      
       sondeUse: '%sondeUse%'
-      sondeUrl: '%sondeUrl%'
 

src/ninesurvey-1.0/config/services.yaml

@@ -56,7 +56,6 @@ parameters:
   proxyPort: '%env(resolve:PROXY_PORT)%'
 
   sondeUse: '%env(resolve:SONDE_USE)%'
-  sondeUrl: '%env(resolve:SONDE_URL)%'
 
 services:
     # default configuration for services in *this* file