Changes have been made in Git for this ticket:

Exceptions not PEAR errors (Ticket #8172).

http://git.horde.org/diff.php/framework/Core/lib/Horde.php?rt=horde-git&r1=837be59133c0b29f14d5b97f5a187685dbc1be85&r2=c2d8b814fdfb9bdddd98b1396da1c5d59d625dfc

Changes have been made in Git for this ticket:

Update CHANGES for ticket #8172

http://git.horde.org/diff.php/horde/docs/CHANGES?rt=horde-git&r1=2c85abba6e6b4677ffd5c43a0ddb62936f374f9d&r2=442c4ced45a7f25adda4fb54146a9ccea2837188

Agreed.

There is one thing that might still need to be corrected for this patch:

If a distribution uses the "conf.d" directory in order to override 
settings from "conf.php" and has the admin section enabled then it 
might be confusing to the admin user that setting certain values in 
the admin interface seem to have no effect.

On the one hand the admin section does not read more than the conf.php 
file. So anything that is set in conf.d will not be displayed in the 
admin section. And if you change a value that is being overwritten in 
conf.d then changing it has no effect.

I would suggest that we add a notification in the admin section that 
gets displayed in case the conf.d directory holds php-files. It should 
indicate that there are files present that override settings visible 
in the admin view.

Changes have been made in CVS for this ticket:

MFH: Allow conf.d style directory configuration overriding (Bug #8172)
http://cvs.horde.org/diff.php/framework/Horde/Attic/Horde.php?rt=horde&r1=1.489.2.116&r2=1.489.2.117&ty=u

Changes have been made in Git for this ticket:

Allow conf.d style directory configuration overriding (Bug #8172)

http://git.horde.org/diff.php/framework/Core/lib/Horde.php?rt=horde-git&r1=2c85abba6e6b4677ffd5c43a0ddb62936f374f9d&r2=9774304b900cf35a6091e7be1761e5c07efa70bb

Thanks. This is great!

Just a note to Mathieu that I'm on it... This would be the updated 
patch: 
http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolab-webclient/horde/patches/horde-3.3.6/t_horde_HK__MP_ConfdStyleConfigurationOverride.diff

I still need to test it before I commit.

A few comments, otherwise looks fine:
- $output shouldn't be concatenated, it should be checked once for 
each loaded file individually.
- I don't think it makes sense to apply the same for the vhost 
configuration files. It should be sufficient to still have a single 
vhost file, those are not being used by distributions anyway.

attached is a patch for fw3

OK, I have found the proper function for this: Horde::loadConfiguration.



Attached a patch for trunk

No, the conf.d loading has to be done where the configuration files 
are loaded, not *inside* the configuration files.

Also, please create a single patch.

I've submitted patches for

- framework (3 and 4)

- horde (3 and 4)

- imp (4 and 5)



If they are ok, can you commit them, I will then prepare patches for 
the other apps

Is this the good way to go?



If so, I will provide patches for apps (fw3, fw4, horde3, horde4, 
imp4, imp5, ...)

Here is the relevant part for horde3 (probably in Horde/Config.php):



     /**

      * Load conf.d style directory configuration

      *

      * @param string $path    Path to the directory

      *                        or to the parent file (must match *.php)

      */

      function includeConfD($path) {

         #mangle the path if needed (*.php -> *.d)

         $path = preg_replace('/\.php$/', '.d', $path);

         if (file_exists($path) && is_dir($path)) {

             $files = glob("$path/*.php");

             if ($files) {

                 foreach ($files as $conf) {

                     include_once $conf;

                 }

             }

         }

     }



=========================

It can be used with "Horde_Config::includeConfD(__FILE__);" in, for 
example, config/hooks.php

On Debian systems configuration files could only be owned by one 
package. Modifying a file from another package is forbidden (against 
policy).



I'm currently creating a debian package for kolab-webclient, that 
depends on several horde apps (imp, kronolith, turba, ...) and change 
the configuration. As I am not allowed to patch files from other 
packages, I wanted to override settings with mine (to have a plug and 
play behavior).

Why?

(Inspired by apache's conf.d directory, and also horde's registry.d)



Every bla.php config file (config/*.php of app/config/*.php) when 
loaded, would then load all *.php files in the bla.d/ directory 
alphabetically (convention would be to name them 
01_toto.php...99_toto.php).



I'm affecting this to horde3 but this also applies to horde git.



Example of php config files :

config/conf.php

config/hooks.php

config/mime_drivers.php

config/motd.php

config/nls.php

config/prefs.php

config/registry.php (done)

imp/config/conf.php

imp/config/header.php

imp/config/hooks.php

imp/config/menu.php

...

turba/config/conf.php

...(other apps)