[commits] Horde branch master updated. 5d01e3c6b869eb4eda2dcd35c5926cee061337c8
Jan Schneider
jan at horde.org
Fri Feb 11 18:35:28 UTC 2011
The branch "master" has been updated.
The following is a summary of the commits.
from: 7b56cd8b6078f3ebae95ff272e24694c48ceb37c
32e8fb9 Revamp configuration file layout.
5d01e3c Creating configuration files is no longer necessary for most apps.
-----------------------------------------------------------------------
commit 32e8fb9bb90bc0140a0bf9e1545924cb16cd41eb
Author: Jan Schneider <jan at horde.org>
Date: Fri Feb 11 19:07:33 2011 +0100
Revamp configuration file layout.
I changed my mind. I'm convinced now that it makes more sense to provide
default configuration files instead of .dist versions that have to be
copied for each installation. This makes at least sense for any
configuration files that 99% of the people won't change from the
defaults anyway. Instead load *.local.php versions of those
configuration files if they exist. This makes both installation and
upgrading much easier.
I left those .dist files untouched that either *must* be edited to make
any sense, or that are optional and just examples (menu.php.dist,
hooks.php.dist).
I'm still considering to do the same with the backends.php files.
Providing sane defaults and adding a configuration option to pick from
one of the shipped examples might make sense in most cases.
.gitignore | 8 +-
agora/config/prefs.php | 290 ++++++
agora/config/prefs.php.dist | 283 ------
ansel/config/prefs.php | 250 +++++
ansel/config/prefs.php.dist | 241 -----
ansel/config/styles.php | 179 ++++
ansel/config/styles.php.dist | 170 ----
beatnik/config/prefs.php | 49 +
beatnik/config/prefs.php.dist | 40 -
chora/config/mime_drivers.php | 20 +
chora/config/mime_drivers.php.dist | 13 -
chora/config/prefs.php | 23 +
chora/config/prefs.php.dist | 16 -
folks/config/prefs.php | 124 +++
folks/config/prefs.php.dist | 123 ---
framework/Core/lib/Horde/Registry.php | 4 +-
gollem/config/mime_drivers.php | 27 +
gollem/config/mime_drivers.php.dist | 20 -
gollem/config/prefs.php | 104 +++
gollem/config/prefs.php.dist | 97 --
hermes/config/prefs.php | 35 +
hermes/config/prefs.php.dist | 26 -
horde/config/mime_drivers.php | 512 +++++++++++
horde/config/mime_drivers.php.dist | 505 ----------
horde/config/motd.php | 23 +
horde/config/motd.php.dist | 6 -
horde/config/nls.php | 6 +-
horde/config/prefs.php | 700 ++++++++++++++
horde/config/prefs.php.dist | 692 --------------
horde/config/registry.php | 346 +++++++
horde/config/registry.php.dist | 339 -------
horde/config/spelling.php | 20 +
horde/config/spelling.php.dist | 13 -
horde/docs/CHANGES | 1 +
horde/templates/login/login.inc | 2 +-
hylax/config/prefs.php | 31 +
hylax/config/prefs.php.dist | 24 -
imp/config/mime_drivers.php | 250 +++++
imp/config/mime_drivers.php.dist | 243 -----
imp/config/portal.php | 56 ++
imp/config/portal.php.dist | 49 -
imp/config/prefs.php | 1615 +++++++++++++++++++++++++++++++++
imp/config/prefs.php.dist | 1608 --------------------------------
ingo/config/fields.php | 117 +++
ingo/config/fields.php.dist | 110 ---
ingo/config/prefs.php | 106 +++
ingo/config/prefs.php.dist | 99 --
jonah/config/routes.php | 29 +
jonah/config/routes.php.dist | 29 -
jonah/config/templates.php | 66 ++
jonah/config/templates.php.dist | 59 --
kronolith/config/prefs.php | 382 ++++++++
kronolith/config/prefs.php.dist | 375 --------
luxor/config/languages.php | 293 ++++++
luxor/config/languages.php.dist | 286 ------
luxor/config/mime_drivers.php | 20 +
luxor/config/mime_drivers.php.dist | 13 -
mnemo/config/prefs.php | 101 ++
mnemo/config/prefs.php.dist | 94 --
nag/config/prefs.php | 219 +++++
nag/config/prefs.php.dist | 212 -----
operator/config/prefs.php | 35 +
operator/config/prefs.php.dist | 29 -
pastie/config/prefs.php | 27 +
pastie/config/prefs.php.dist | 20 -
skeleton/config/horde.local.php.dist | 4 -
skeleton/config/prefs.php | 27 +
skeleton/config/prefs.php.dist | 20 -
trean/config/prefs.php | 69 ++
trean/config/prefs.php.dist | 62 --
turba/config/attributes.php | 580 ++++++++++++
turba/config/attributes.php.dist | 574 ------------
turba/config/mime_drivers.php | 20 +
turba/config/mime_drivers.php.dist | 13 -
turba/config/prefs.php | 152 +++
turba/config/prefs.php.dist | 145 ---
vilma/config/prefs.php | 26 +
vilma/config/prefs.php.dist | 17 -
whups/config/mime_drivers.php | 32 +
whups/config/mime_drivers.php.dist | 25 -
whups/config/prefs.php | 176 ++++
whups/config/prefs.php.dist | 169 ----
whups/config/reminders.php | 53 ++
whups/config/reminders.php.dist | 44 -
whups/config/templates.php | 66 ++
whups/config/templates.php.dist | 57 --
whups/docs/INSTALL | 2 +-
wicked/config/prefs.php | 21 +
wicked/config/prefs.php.dist | 14 -
89 files changed, 7284 insertions(+), 6988 deletions(-)
create mode 100644 agora/config/prefs.php
delete mode 100644 agora/config/prefs.php.dist
create mode 100644 ansel/config/prefs.php
delete mode 100644 ansel/config/prefs.php.dist
create mode 100644 ansel/config/styles.php
delete mode 100644 ansel/config/styles.php.dist
create mode 100644 beatnik/config/prefs.php
delete mode 100644 beatnik/config/prefs.php.dist
create mode 100644 chora/config/mime_drivers.php
delete mode 100644 chora/config/mime_drivers.php.dist
create mode 100644 chora/config/prefs.php
delete mode 100644 chora/config/prefs.php.dist
create mode 100644 folks/config/prefs.php
delete mode 100644 folks/config/prefs.php.dist
create mode 100644 gollem/config/mime_drivers.php
delete mode 100644 gollem/config/mime_drivers.php.dist
create mode 100644 gollem/config/prefs.php
delete mode 100644 gollem/config/prefs.php.dist
create mode 100644 hermes/config/prefs.php
delete mode 100644 hermes/config/prefs.php.dist
create mode 100644 horde/config/mime_drivers.php
delete mode 100644 horde/config/mime_drivers.php.dist
create mode 100644 horde/config/motd.php
delete mode 100644 horde/config/motd.php.dist
create mode 100644 horde/config/prefs.php
delete mode 100644 horde/config/prefs.php.dist
create mode 100644 horde/config/registry.php
delete mode 100644 horde/config/registry.php.dist
create mode 100644 horde/config/spelling.php
delete mode 100644 horde/config/spelling.php.dist
create mode 100644 hylax/config/prefs.php
delete mode 100644 hylax/config/prefs.php.dist
create mode 100644 imp/config/mime_drivers.php
delete mode 100644 imp/config/mime_drivers.php.dist
create mode 100644 imp/config/portal.php
delete mode 100644 imp/config/portal.php.dist
create mode 100644 imp/config/prefs.php
delete mode 100644 imp/config/prefs.php.dist
create mode 100644 ingo/config/fields.php
delete mode 100644 ingo/config/fields.php.dist
create mode 100644 ingo/config/prefs.php
delete mode 100644 ingo/config/prefs.php.dist
create mode 100644 jonah/config/routes.php
delete mode 100644 jonah/config/routes.php.dist
create mode 100644 jonah/config/templates.php
delete mode 100644 jonah/config/templates.php.dist
create mode 100644 kronolith/config/prefs.php
delete mode 100644 kronolith/config/prefs.php.dist
create mode 100644 luxor/config/languages.php
delete mode 100644 luxor/config/languages.php.dist
create mode 100644 luxor/config/mime_drivers.php
delete mode 100644 luxor/config/mime_drivers.php.dist
create mode 100644 mnemo/config/prefs.php
delete mode 100644 mnemo/config/prefs.php.dist
create mode 100644 nag/config/prefs.php
delete mode 100644 nag/config/prefs.php.dist
create mode 100644 operator/config/prefs.php
delete mode 100644 operator/config/prefs.php.dist
create mode 100644 pastie/config/prefs.php
delete mode 100644 pastie/config/prefs.php.dist
delete mode 100644 skeleton/config/horde.local.php.dist
create mode 100644 skeleton/config/prefs.php
delete mode 100644 skeleton/config/prefs.php.dist
create mode 100644 trean/config/prefs.php
delete mode 100644 trean/config/prefs.php.dist
create mode 100644 turba/config/attributes.php
delete mode 100644 turba/config/attributes.php.dist
create mode 100644 turba/config/mime_drivers.php
delete mode 100644 turba/config/mime_drivers.php.dist
create mode 100644 turba/config/prefs.php
delete mode 100644 turba/config/prefs.php.dist
create mode 100644 vilma/config/prefs.php
delete mode 100644 vilma/config/prefs.php.dist
create mode 100644 whups/config/mime_drivers.php
delete mode 100644 whups/config/mime_drivers.php.dist
create mode 100644 whups/config/prefs.php
delete mode 100644 whups/config/prefs.php.dist
create mode 100644 whups/config/reminders.php
delete mode 100644 whups/config/reminders.php.dist
create mode 100644 whups/config/templates.php
delete mode 100644 whups/config/templates.php.dist
create mode 100644 wicked/config/prefs.php
delete mode 100644 wicked/config/prefs.php.dist
http://git.horde.org/horde-git/-/commit/32e8fb9bb90bc0140a0bf9e1545924cb16cd41eb
-----------------------------------------------------------------------
commit 5d01e3c6b869eb4eda2dcd35c5926cee061337c8
Author: Jan Schneider <jan at horde.org>
Date: Fri Feb 11 19:26:35 2011 +0100
Creating configuration files is no longer necessary for most apps.
agora/docs/INSTALL | 12 ------------
ansel/docs/INSTALL | 15 ---------------
beatnik/docs/INSTALL | 17 ++++-------------
hermes/docs/INSTALL | 15 ---------------
jonah/docs/INSTALL | 15 ---------------
kronolith/docs/INSTALL | 12 ------------
mnemo/docs/INSTALL | 12 ------------
nag/docs/INSTALL | 12 ------------
operator/docs/INSTALL | 16 ----------------
pastie/docs/INSTALL | 16 ----------------
skeleton/docs/INSTALL | 2 ++
vilma/docs/INSTALL | 13 -------------
wicked/docs/INSTALL | 16 ----------------
13 files changed, 6 insertions(+), 167 deletions(-)
http://git.horde.org/horde-git/-/commit/5d01e3c6b869eb4eda2dcd35c5926cee061337c8
More information about the commits
mailing list