[Fusionforge-commits] r16007 - in branches/Branch_5_2/src: debian etc/config.ini.d packaging/install

Olivier Berger olberger at fusionforge.org
Wed Jul 18 19:39:44 CEST 2012


Author: olberger
Date: 2012-07-18 19:39:43 +0200 (Wed, 18 Jul 2012)
New Revision: 16007

Added:
   branches/Branch_5_2/src/etc/config.ini.d/zz_my_settings.ini
Modified:
   branches/Branch_5_2/src/debian/README.Debian.tmpl
   branches/Branch_5_2/src/etc/config.ini.d/defaults.ini
   branches/Branch_5_2/src/packaging/install/common
Log:
Add a new zz_my_settings.ini file to suggest overriding defaults instead of changing provided files

Modified: branches/Branch_5_2/src/debian/README.Debian.tmpl
===================================================================
--- branches/Branch_5_2/src/debian/README.Debian.tmpl	2012-07-18 17:38:32 UTC (rev 16006)
+++ branches/Branch_5_2/src/debian/README.Debian.tmpl	2012-07-18 17:39:43 UTC (rev 16007)
@@ -97,7 +97,13 @@
 change the name of the database, you will need to perform the
 appropriate steps in the database server too.
 
+Instead of changing the contents of the existing file, you may wish to
+add only your custom local settings which differ from the packaged
+defaults in a dedicated overriding file, for example in the provided
+/etc/fusionforge/config.ini.d/zz_my_settings.ini. This will make it
+easier to track local customizations.
 
+
 Adminning notes
 ---------------
   Once @FORGENAME@ is setup, it pretty much runs by itself.  There

Modified: branches/Branch_5_2/src/etc/config.ini.d/defaults.ini
===================================================================
--- branches/Branch_5_2/src/etc/config.ini.d/defaults.ini	2012-07-18 17:38:32 UTC (rev 16006)
+++ branches/Branch_5_2/src/etc/config.ini.d/defaults.ini	2012-07-18 17:39:43 UTC (rev 16007)
@@ -2,6 +2,9 @@
 ;
 ; Documentation at:
 ; https://fusionforge.org/plugins/mediawiki/wiki/fusionforge/index.php/Configuration#Configuration_variables
+;
+; Note : instead of modifying this file, you may wish to place changed
+; settings in an overriding config.ini.d file, like the provided zz_my_settings.ini
 
 [core]
 

Added: branches/Branch_5_2/src/etc/config.ini.d/zz_my_settings.ini
===================================================================
--- branches/Branch_5_2/src/etc/config.ini.d/zz_my_settings.ini	                        (rev 0)
+++ branches/Branch_5_2/src/etc/config.ini.d/zz_my_settings.ini	2012-07-18 17:39:43 UTC (rev 16007)
@@ -0,0 +1,12 @@
+; Local customizations which should override the defaults.
+;
+; Instead of changing the defaults.ini, you may copy/paste only the
+; needed changes into this file
+;
+; This file is named zz_... so that alphabetical order sortering
+;  places is at the end (thus overriding previous settings)
+;
+
+; For instance, uncomment the following to allow project submission by any logged-in user :
+;[core]
+;project_registration_restricted = no

Modified: branches/Branch_5_2/src/packaging/install/common
===================================================================
--- branches/Branch_5_2/src/packaging/install/common	2012-07-18 17:38:32 UTC (rev 16006)
+++ branches/Branch_5_2/src/packaging/install/common	2012-07-18 17:39:43 UTC (rev 16007)
@@ -1,6 +1,7 @@
 etc/config.ini-fhs                     etc/@PACKAGE@
 etc/config.ini.d/defaults.ini          etc/@PACKAGE@/config.ini.d/
 etc/config.ini.d/debug.ini             etc/@PACKAGE@/config.ini.d/
+etc/config.ini.d/zz_my_settings.ini    etc/@PACKAGE@/config.ini.d/
 deb-specific/cvssh                     bin/
 #
 deb-specific/install-chroot.sh         usr/share/@OLDPACKAGE@/bin/




More information about the Fusionforge-commits mailing list