Hello devs
With today's commit [1] we took the first step towards a new and simplified configuration for Roundcube. We merged the two files main.inc.php and db.inc.php into one single config.inc.php file and a defaults.inc.php file respectively. The config.inc.php is meant to be the local config file and only containing those options which differ from the defaults. The defaults.inc.php will be part of the distribution is will be updated with every software update and thus should not be modified.
The current git master will remain using the old config files as a fallback but we strongly recommend to upgrade your configs if you're running a bleeding edge git master version somewhere. You can do this by running bin/update.sh and letting the script migrate your config. The manual way of doing this is to copy config.inc.php.sample file and start from scratch.
There's more to come related to configs [2] but this was the major change that just found its way back into git master.
Kind regards, Thomas
[1] https://github.com/roundcube/roundcubemail/commit/0703bfecd0 [2] http://trac.roundcube.net/ticket/1487311
Hello again
After the initial commit there was still a tiny error that made the update.sh script only generate a minimal local config ignoring all your old properties that differ from default values. This is now solved in git master.
If you already migrated your config, you can undo it by removing the config.inc.php file again and renaming the backup'ed old config files back from main.old.php to main.inc.php and db.old.php to db.inc.php. Then run update.sh again and your new config should be fine.
Regards, Thomas
Thomas Bruederli wrote:
Hello devs
With today's commit [1] we took the first step towards a new and simplified configuration for Roundcube. We merged the two files main.inc.php and db.inc.php into one single config.inc.php file and a defaults.inc.php file respectively. The config.inc.php is meant to be the local config file and only containing those options which differ from the defaults. The defaults.inc.php will be part of the distribution is will be updated with every software update and thus should not be modified.
The current git master will remain using the old config files as a fallback but we strongly recommend to upgrade your configs if you're running a bleeding edge git master version somewhere. You can do this by running bin/update.sh and letting the script migrate your config. The manual way of doing this is to copy config.inc.php.sample file and start from scratch.
There's more to come related to configs [2] but this was the major change that just found its way back into git master.
Kind regards, Thomas
[1] https://github.com/roundcube/roundcubemail/commit/0703bfecd0 [2] http://trac.roundcube.net/ticket/1487311
Am 10.07.2013 23:04, schrieb Thomas Bruederli:
The current git master will remain using the old config files as a fallback but we strongly recommend to upgrade your configs if you're running a bleeding edge git master version somewhere. You can do this by running bin/update.sh and letting the script migrate your config.
Done. Just one problem: additional headers doesn't show any additional headers anymore.
We placed the config line of additional headers in config.inc.php, of course. BTW: Why does especially this plugin (and this plugin only) need to be configured in the main config rather than having its own config file?
Cheers,
Michael Heydekamp Co-Admin freexp.de Düsseldorf/Germany
On Sun, Jul 14, 2013 at 9:27 AM, Michael Heydekamp listuser@freexp.de wrote:
Am 10.07.2013 23:04, schrieb Thomas Bruederli:
The current git master will remain using the old config files as a fallback but we strongly recommend to upgrade your configs if you're running a bleeding edge git master version somewhere. You can do this by running bin/update.sh and letting the script migrate your config.
Done. Just one problem: additional headers doesn't show any additional headers anymore.
We placed the config line of additional headers in config.inc.php, of course.
It's not surprising that there remain some glitches after such a major change. Fixed in https://github.com/roundcube/roundcubemail/commit/68eb1835
BTW: Why does especially this plugin (and this plugin only) need to be configured in the main config rather than having its own config file?
Simplicity and laziness...
Thanks for reporting!
~Thomas
Am 17.07.2013 21:30, schrieb Thomas Bruederli:
On Sun, Jul 14, 2013 at 9:27 AM, Michael Heydekamp listuser@freexp.de wrote:
Done. Just one problem: additional headers doesn't show any additional headers anymore.
We placed the config line of additional headers in config.inc.php, of course.
It's not surprising that there remain some glitches after such a major change. Fixed in https://github.com/roundcube/roundcubemail/commit/68eb1835
You're working too long till night - your commit happened after our daily git-pull at 21:10 our local time. ;) So I'll see the result only by tomorrow and will report, if any issues.
BTW: Why does especially this plugin (and this plugin only) need to be configured in the main config rather than having its own config file?
Simplicity and laziness...
As we can see now, in the long run it would have been more simple to have an own config for additional_headers, right...? ;)
Thanks for reporting!
Dafür nicht.
Anyway, a general question with regards to the new config:
As I understand it, if a new additionl key is being invented, upon git-pull it will automatically go to defaults.inc.php, right? As long as it's not manually being included in the local config.inc.php as well, the default of this key in defaults.inc.php will apply, right?
But what if a key is being renamed/replaced by a different one... (we recently had this case, IIRC)? How does this work then, and how can we make sure that outdated config keys in the local config.inc.php will be replaced by the current ones (if the outdated key does exist there at all)?
Cheers,
Michael Heydekamp Co-Admin freexp.de Düsseldorf/Germany
Am 17.07.2013 23:27, schrieb Michael Heydekamp:
Am 17.07.2013 21:30, schrieb Thomas Bruederli:
On Sun, Jul 14, 2013 at 9:27 AM, Michael Heydekamp listuser@freexp.de wrote:
Done. Just one problem: additional headers doesn't show any additional headers anymore.
We placed the config line of additional headers in config.inc.php, of course.
It's not surprising that there remain some glitches after such a major change. Fixed in https://github.com/roundcube/roundcubemail/commit/68eb1835
You're working too long till night - your commit happened after our daily git-pull at 21:10 our local time. ;) So I'll see the result only by tomorrow and will report, if any issues.
Well, the one and only issue is: I still don't see any additional headers...!?
I'm not a developer, but to my understanding any changes in ./installer/rcube_install.php can't fix this problem anyway. I mean, how is rcube_install.php related to the task of displaying messages?
May I ask you to look into that again? And/or tell me what we have to do at our end? (Hopefully not reinstalling Roundcube... ;-))
Anyway, a general question with regards to the new config:
As I understand it, if a new additionl key is being invented, upon git-pull it will automatically go to defaults.inc.php, right? As long as it's not manually being included in the local config.inc.php as well, the default of this key in defaults.inc.php will apply, right?
But what if a key is being renamed/replaced by a different one... (we recently had this case, IIRC)? How does this work then, and how can we make sure that outdated config keys in the local config.inc.php will be replaced by the current ones (if the outdated key does exist there at all)?
Reply to the above would also be most appreciated.
Cheers,
Michael Heydekamp Co-Admin freexp.de Düsseldorf/Germany
On Thu, Jul 18, 2013 at 8:42 PM, Michael Heydekamp listuser@freexp.de wrote:
Am 17.07.2013 23:27, schrieb Michael Heydekamp:
Am 17.07.2013 21:30, schrieb Thomas Bruederli:
On Sun, Jul 14, 2013 at 9:27 AM, Michael Heydekamp listuser@freexp.de wrote:
Done. Just one problem: additional headers doesn't show any additional headers anymore.
We placed the config line of additional headers in config.inc.php, of course.
It's not surprising that there remain some glitches after such a major change. Fixed in https://github.com/roundcube/roundcubemail/commit/68eb1835
You're working too long till night - your commit happened after our daily git-pull at 21:10 our local time. ;) So I'll see the result only by tomorrow and will report, if any issues.
Well, the one and only issue is: I still don't see any additional headers...!?
If you previously migrated your config, the according options are gone. Running update.sh again will not bring them back.
I'm not a developer, but to my understanding any changes in ./installer/rcube_install.php can't fix this problem anyway. I mean, how is rcube_install.php related to the task of displaying messages?
May I ask you to look into that again? And/or tell me what we have to do at our end? (Hopefully not reinstalling Roundcube... ;-))
You need to do the config migration again. That's what I mentioned in my follow-up post:
"If you already migrated your config, you can undo it by removing the config.inc.php file again and renaming the backup'ed old config files back from main.old.php to main.inc.php and db.old.php to db.inc.php. Then run update.sh again and your new config should be fine."
~Thomas
Am 22.07.2013 18:01, schrieb Thomas Bruederli:
Well, the one and only issue is: I still don't see any additional headers...!?
...
May I ask you to look into that again? And/or tell me what we have to do at our end? (Hopefully not reinstalling Roundcube... ;-))
You need to do the config migration again.
Now, I done this, and the additional headers are visible.
On Wed, Jul 17, 2013 at 11:27 PM, Michael Heydekamp listuser@freexp.de wrote:
Anyway, a general question with regards to the new config:
As I understand it, if a new additionl key is being invented, upon git-pull it will automatically go to defaults.inc.php, right? As long as it's not manually being included in the local config.inc.php as well, the default of this key in defaults.inc.php will apply, right?
Exactly.
But what if a key is being renamed/replaced by a different one... (we recently had this case, IIRC)? How does this work then, and how can we make sure that outdated config keys in the local config.inc.php will be replaced by the current ones (if the outdated key does exist there at all)?
The rcube_installer class (which is used by update.sh) has a mapping of renamed config options and alters the local config file accordingly. If the installer/update script doesn't have the permission to write new configs directly, a list of renamed properties is displayed which you then need to update manually.
~Thomas
-
Martin Wodrich -
Michael Heydekamp
-
Thomas Bruederli