Merge remote-tracking branch 'upstream/master'

app/config/default_parameters.yml

@@ -1,5 +1,19 @@
 # This file contains defaults for optional parameters, which you can override in parameters.yml
 parameters:
+    locale_fallback: en
+
+    # Setting for mail system, used by SwiftMailer
+    mailer_transport:  smtp
+    mailer_host:       127.0.0.1
+    mailer_user:       ~
+    mailer_password:   ~
+
+    # One of `legacy` (default) or `solr`
+    search_engine: legacy
+
+    # Solr root endpoint, relevant if `solr` is set as search_engine
+    solr_dsn: http://localhost:8983/solr
+
     ## Logging settings
     # Log type is one of "stream", "error_log" or other types supported by monolog
     log_type: stream

app/config/parameters.yml.dist

@@ -2,13 +2,6 @@
 parameters:
     # A secret key that's used to generate certain security-related tokens
     secret: ThisTokenIsNotSoSecretChangeIt
-    locale_fallback: en
-
-    # Setting for mail system, used by SwiftMailer
-    mailer_transport:  smtp
-    mailer_host:       127.0.0.1
-    mailer_user:       ~
-    mailer_password:   ~
 
     # Settings for database backend used by Doctrine DBAL
     # In turn used for Content Repository Persistence, and default database powered search engine
@@ -18,9 +11,3 @@ parameters:
     database_name: ezstudio
     database_user: root
     database_password:
-
-    # One of `legacy` (default) or `solr`
-    search_engine: legacy
-
-    # Solr root endpoint, relevant if `solr` is set as search_engine
-    solr_dsn: http://localhost:8983/solr

composer.json

@@ -89,6 +89,7 @@
         "___symfony-assets-install": "One of 'symlink', 'relative' (symlinks) or 'hard'",
         "symfony-assets-install": "relative",
         "incenteev-parameters": {
+            "keep-outdated": true,
             "file": "app/config/parameters.yml"
         },
         "branch-alias": {

doc/apache2/vhost.template

@@ -48,7 +48,7 @@
     # Defaults to enabled if SYMFONY_ENV is set to "dev" if env value is omitted or empty
     #if[SYMFONY_DEBUG] SetEnv SYMFONY_DEBUG "%SYMFONY_DEBUG%"
 
-    # Optional: Whether to use Symfony's HTTP Caching.
+    # Optional: Whether to use Symfony's builtin HTTP Caching Proxy.
     # Disable it if you are using an external reverse proxy (e.g. Varnish)
     # Possible values: 0, 1 or ""
     # Defaults to disabled if SYMFONY_ENV is set to "dev" or SYMFONY_TRUSTED_PROXIES is set,

doc/nginx/vhost.template

@@ -49,21 +49,21 @@ server {
             # Defaults to 0 if omitted, unless SYMFONY_ENV is set to: "dev"
             #if[SYMFONY_DEBUG] fastcgi_param SYMFONY_DEBUG "%SYMFONY_DEBUG%";
 
-            # Whether to use Symfony's HTTP Caching.
+            # Optional: Whether to use Symfony's builtin HTTP Caching Proxy.
             # Disable it if you are using an external reverse proxy (e.g. Varnish)
             # Possible values: 0 or 1
             # Defaults to 1 if omitted, unless SYMFONY_ENV is set to: "dev"
             #if[SYMFONY_HTTP_CACHE] fastcgi_param SYMFONY_HTTP_CACHE "%SYMFONY_HTTP_CACHE%";
 
-            # Whether to use custom HTTP Cache class if SYMFONY_HTTP_CACHE is enabled
+            # Optional: Whether to use custom HTTP Cache class if SYMFONY_HTTP_CACHE is enabled
             # Value must be na autoloadable cache class
             # Defaults to "AppCache"
             #if[SYMFONY_HTTP_CACHE_CLASS] fastcgi_param SYMFONY_HTTP_CACHE_CLASS "%SYMFONY_HTTP_CACHE_CLASS%";
 
-            # Defines the proxies to trust.
-            # Separate entries by a comma
-            # Example: "proxy1.example.com,proxy2.example.org"
-            # By default, no trusted proxies are set
+            # Optional: Defines the proxies to trust
+            # Needed when using Varnish as proxy, if so disable SYMFONY_HTTP_CACHE.
+            # Separate entries by a comma, example: "proxy1.example.com,proxy2.example.org"
+            # Defaults to not be set if env value is omitted or empty
             #if[SYMFONY_TRUSTED_PROXIES] fastcgi_param SYMFONY_TRUSTED_PROXIES "%SYMFONY_TRUSTED_PROXIES%";
         }
     }