diff --git a/src/nineskeletor-1.0/.env b/src/nineskeletor-1.0/.env index e9c5b15..6c7ca2f 100644 --- a/src/nineskeletor-1.0/.env +++ b/src/nineskeletor-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_WEBURL= +APP_MASTERIDENTITY=SQL +APP_AUTH=SQL APP_ALIAS= -APP_AUTH=MYSQL APP_NAME= -APP_ENV=PROD -APP_CRON=false +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=1 +WSS_PORT=5546 + + +# Proxy +PROXY_USE=0 +PROXY_HOST= +PROXY_PORT= + + +# Sonde statistic +SONDE_USE=0 diff --git a/src/nineskeletor-1.0/config/packages/twig.yaml b/src/nineskeletor-1.0/config/packages/twig.yaml index 8cd8f7f..a5b140b 100644 --- a/src/nineskeletor-1.0/config/packages/twig.yaml +++ b/src/nineskeletor-1.0/config/packages/twig.yaml @@ -15,6 +15,5 @@ twig: wssuse: '%wssuse%' wssurl: '%wssurl%' sondeUse: '%sondeUse%' - sondeUrl: '%sondeUrl%' diff --git a/src/nineskeletor-1.0/config/services.yaml b/src/nineskeletor-1.0/config/services.yaml index 90ec1f0..0aff70b 100644 --- a/src/nineskeletor-1.0/config/services.yaml +++ b/src/nineskeletor-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 diff --git a/src/nineskeletor-1.0/scripts/.env.model b/src/nineskeletor-1.0/scripts/.env.model index e90e4ee..6c7ca2f 100644 --- a/src/nineskeletor-1.0/scripts/.env.model +++ b/src/nineskeletor-1.0/scripts/.env.model @@ -65,4 +65,3 @@ PROXY_PORT= # Sonde statistic SONDE_USE=0 -SONDE_URL= diff --git a/tmpl/nineskeletor-env.local b/tmpl/nineskeletor-env.local index 7e0b639..9e35b41 100755 --- a/tmpl/nineskeletor-env.local +++ b/tmpl/nineskeletor-env.local @@ -112,11 +112,10 @@ PROXY_PORT= # Sonde statistic %if %%getVar("activer_sondepiwik_local", 'non') == "oui" SONDE_USE=1 -SONDE_URL=/sondepiwik/envoleTrackeur.js.php %else if %%getVar("activer_piwik", 'non') == "oui" SONDE_USE=1 -SONDE_URL=/piwik/envoleTrackeur.js.php +%else if %%getVar("activer_sondednma", 'non') == "oui" +SONDE_USE=1 %else SONDE_USE=0 -SONDE_URL= %end if \ No newline at end of file