[koha-commits] main Koha release repository branch master updated. v3.14.00-alpha2-56-gfb1748e
Git repo owner
gitmaster at git.koha-community.org
Wed Oct 30 04:14:57 CET 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, master has been updated
via fb1748ee8ba8003742e497e059c187b64bde7fa2 (commit)
via c6f091cc2348512e5a707cc9e0d8286b8e2ada0c (commit)
via 578205746fc22e6ff8aecc97d646420d8e847291 (commit)
from 2234ef3ebda67d8397c855e6af9c5cd44b78c08f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit fb1748ee8ba8003742e497e059c187b64bde7fa2
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Fri Sep 13 10:14:30 2013 -0300
Bug 10733: Follow up - unset variables from koha-sites.conf if USE_MEMCACHED=no
As configuration variables from koha-sites.conf overwrite the ones in the
koha-create script we need to unset them in case we have USE_MEMCACHED="no".
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit c6f091cc2348512e5a707cc9e0d8286b8e2ada0c
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Fri May 31 15:56:59 2013 -0300
Bug 10733: Memcached on package installs
This patch makes the koha-create script adjust the koha-conf.xml file
with the proper string substitutions to enable the use of memcached
for the created Koha instance.
It adds three option switches that control this:
--use-memcached (defaults to "no")
--memcached-servers "host1:port1,..." (defaults to '127.0.0.1:11211')
--memcached-prefix "desired_namespace prefix" (defaults to 'koha_')
It respects the current schema configuration schema, where configuration
values are pondered like this:
hardcoded < koha-sites.conf < koha-create option switches
koha-sites.conf is read for USE_MEMCACHED, MEMCACHED_SERVERS and
MEMCACHED_PREFIX.
Note: the docs discourage setting user's own namespace prefix.
Using memcached is off as the default. The relevant configuration
variables will remain empty if the user doesn't pass --use-memcached
to the command. It matches the current behaviour.
To test:
- Apply the patch
- Build your own packages and install them on a test server
a) Create a new instance without using the new switches like:
$ koha-create --create-db memctest
- Check that /etc/koha/sites/memctest/koha-conf.xml contains:
* Empty <memcached_servers> tag.
* Empty <memcached_namespace> tag.
b) Play with the possible combination of option switches
(Note that the code defaults to empty and will remain like that if
--use-memcached is not used, so less tests...)
$ koha-create --create-db --use-memcached memctest
$ koha-create --create-db --use-memcached --memcached-servers "anything:xxx" memctest
$ koha-create --create-db --use-memcached --memcached-servers "anything:xxx" --memcached-prefix "something" memctest
$ koha-create --create-db --use-memcached --memcached-prefix "something" memctest
- Check the koha-conf.xml and /etc/apache2/sites-enabled/memctest
file reflect the chosen options.
c) Run
$ koha-create --help
- It should advertise this addition accordingly.
d) Run
$ man koha-create
- Man page for koha-create should provide good information on the new
switches behaviour
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 578205746fc22e6ff8aecc97d646420d8e847291
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Wed Aug 14 19:26:08 2013 -0300
Bug 10733: add 'memcached' as suggested dependency
Adds 'memcached' to the control.in file so the user is suggested by apt
to install it.
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
-----------------------------------------------------------------------
Summary of changes:
debian/control.in | 3 +-
debian/docs/koha-create.xml | 46 +++++++++++++
debian/scripts/koha-create | 118 +++++++++++++++++++++++++++-----
debian/templates/apache-site.conf.in | 4 ++
debian/templates/koha-conf-site.xml.in | 4 +-
5 files changed, 154 insertions(+), 21 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list