Thanks all who replied with good advice. I think I'll go for the (short) local.conf solution. I don't like messing around with all separate files in conf.d. As long as they don't conflict with my settings, it will be OK.
Egbert Jan Charles Marcus schreef op 19-6-2014 15:55: > On 6/19/2014 4:54 AM, Jiri Bourek <bou...@thinline.cz> wrote: >> For example, let's say you have single config file and only single >> line differs from default configuration - say "auth_verbose". When >> you upgrade, the packaging system tells you "the configuration was >> changed" and you need to either manually figure out all changes and >> apply them to your configuration or lose your own configuration >> changes (or attempt a 3-way merge) > > I prefer putting all of mine in one file in conf.d named > 99-myconfig.conf. > > This causes this file to be loaded last, so it overwrites any settings > defined in the other config files. > > > Charles