commit d34dc06dce8364725258fb5aa4f758ab28733d1e
parent 0af6de354386172a286e5e553b928dce5fc78772
Author: Timo A. Hummel <felicitus@felicitus.org>
Date: Fri, 6 Nov 2015 23:24:11 +0100
Added note regarding custom parameters, related to #459
Diffstat:
2 files changed, 31 insertions(+), 20 deletions(-)
diff --git a/app/config/config_custom.yml.dist b/app/config/config_custom.yml.dist
@@ -0,0 +1,2 @@
+imports:
+ - { resource: parameters_custom.php }+
\ No newline at end of file
diff --git a/app/config/parameters.php.dist b/app/config/parameters.php.dist
@@ -30,26 +30,6 @@ $container->setParameter('database_user', 'root');
*/
$container->setParameter('database_password', null);
-/**
- * Specifies if the frontend should perform an auto-login
- */
-$container->setParameter('partkeepr.frontend.auto_login.enabled', false);
-
-/**
- * Specifies the auto-login username
- */
-$container->setParameter('partkeepr.frontend.auto_login.username', 'admin');
-
-/**
- * Specifies the auto-login password
- */
-$container->setParameter('partkeepr.frontend.auto_login.password', 'admin');
-
-/**
- * Specifies the category path separator
- */
-$container->setParameter('partkeepr.category.path_separator', ' ➤ ');
-
$container->setParameter('mailer_transport', null);
$container->setParameter('mailer_host', null);
$container->setParameter('mailer_port', null);
@@ -83,3 +63,31 @@ $container->setParameter('fr3d_ldap.user.filter', null);
$container->setParameter('fr3d_ldap.user.attribute.username', null);
$container->setParameter('fr3d_ldap.user.attribute.name', null);
$container->setParameter('fr3d_ldap.user.attribute.email', null);
+
+/**
+ * !!!!!!!!!!!!!!!!!!!!!!!!Note: All parameters below will be overwritten on setup! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ *
+ * The recommended way is to copy the config_custom.yml.dist to config_custom.yml, and put your custom parameters in the
+ * parameters_custom.php file.
+ */
+
+/**
+ * Specifies if the frontend should perform an auto-login
+ */
+$container->setParameter('partkeepr.frontend.auto_login.enabled', false);
+
+/**
+ * Specifies the auto-login username
+ */
+$container->setParameter('partkeepr.frontend.auto_login.username', 'admin');
+
+/**
+ * Specifies the auto-login password
+ */
+$container->setParameter('partkeepr.frontend.auto_login.password', 'admin');
+
+/**
+ * Specifies the category path separator
+ */
+$container->setParameter('partkeepr.category.path_separator', ' ➤ ');
+