Koha-community/Koha - Koha - Koha: The world's first free and open source library system

Commit Graph

Author	SHA1	Message	Date
Jonathan Druart	bee097b39b	Bug 14302: Remove GRS1 specific code Remove: - BIB_INDEX_MODE and AUTH_INDEX_MODE env var - bib_index_mode and auth_index_mode options from scripts - Warnings from about page, just kept one if zebra_bib_index_mode or zebra_auth_index_mode still exist in config and are set to grs1 Test plan: - Install Koha from src - Install Koha from pkg - Read the code, carefully! Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Rebased Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	7 years ago
Ere Maijala	133df5e912	Bug 20073: Move Elasticsearch configs to yaml files and improve the default settings. Improvements: 1) Index settings moved from code to etc/searchengine/elasticsearch/index_config.yaml. An alternative can be specified in koha-conf.xml. 2) Field settings moved from code to etc/searchengine/elasticsearch/field_config.yaml. An alternative can be specified in koha-conf.xml. 3) mappings.yaml has been moved from admin/searchengine/elasticsearch to etc/searchengine/elasticsearch. An alternative can be specified in koha-conf.xml. 4) Default settings have been improved to remove punctuation from phrases used for sorting etc. 5) State variables are used for storing configuration to avoid parsing it multiple times. 6) A possibility to reset the fields too has been added to the reset operation of mappings administration. 7) mappings.yaml has been moved from admin/searchengine/elasticsearch to etc/searchengine/elasticsearch. 8) An stdno field type has been added for standard identifiers. To test: 1) Run tests in t/Koha/SearchEngine/Elasticsearch.t 2) Clear tables search_fields and search_marc_map 3) Go to admin/searchengine/elasticsearch/mappings.pl?op=reset&i_know_what_i_am_doing=1 4) Verify that admin/searchengine/elasticsearch/mappings.pl displays the mappings properly, including ISBN and other standard number fields. 5) Index some records using the -d parameter with misc/search_tools/rebuild_elastic_search.pl to recreate the index 6) Verify that you can find the records 7) Put <elasticsearch_index_mappings>non_existent</elasticsearch_index_mappings> to koha-conf.xml 8) Verify that admin/searchengine/elasticsearch/mappings.pl?op=reset&i_know_what_i_am_doing=1 fails because it can't find non_existent. 9) Copy etc/searchengine/elasticsearch/mappings.yaml to a new location and make elasticsearch_index_mappings setting in koha-conf.xml point to it. 10) Make a change in the new mappings.yaml. 11) Clear table search_fields (mappings reset doesn't do it yet, see bug 20248) 12) Go to admin/searchengine/elasticsearch/mappings.pl?op=reset&i_know_what_i_am_doing=1 13) Verify that the changes you made are now visible in the mappings UI Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Bug 20073: Move Elasticsearch yaml files back to admin directory Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	6 years ago
Jonathan Druart	cff62796ea	Revert "Bug 20073: Move Elasticsearch configs to yaml files and improve the default settings." This reverts commit `f489d2034b`. This commit breaks the install process when using debian packages. Reverting as we are very close to the 18.05.00 release Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	6 years ago
Tomás Cohen Arazi	fdb5d0ca1a	Bug 20428: Make upload_tmp a more general tmp directory Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	6 years ago
Tomás Cohen Arazi	d90d8c9b27	Bug 20428: Add the option to specify a tmp uploads dir This patch adds an option to the koha-conf.xml file for specifying a temporary uploaded files directory. The koha-create script is adjusted to handle it and a convenient option switch is added. If ommited, it will default to /var/lib/koha/<instance>/uploads_tmp. koha-create-dirs is patched to create the required directory with the right permissions. The docs get the new parameter documented. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	6 years ago
Tomás Cohen Arazi	896bb7ec54	Bug 20525: Add --timezone switch to koha-create This patch adds a --timezone switch to koha-create so the timezone can be set on creation time. It defaults to empty (i.e. using the server's local time). To test: - Create an instance: $ sudo koha-create --create-db timezone1 => SUCCESS: /etc/koha/sites/timezone1/koha-conf.xml contains an empty <timezone> entry. - Apply this patch - Run: $ perl misc4dev/cp_debian_files.pl - Create a new instance: $ sudo koha-create --create-db timezone2 => SUCCESS: /etc/koha/sites/timezone2/koha-conf.xml contains an empty <timezone> entry (i.e. the current behaviour is preserved). - Create a new instance: $ sudo koha-create --create-db --timezone Your/Timezone timezone3 => SUCCESS: /etc/koha/sites/timezone3/koha-conf.xml contains <timezone>Your/Timezone</timezone> (i.e. introduced behaviour works) - Sign off :-D Sponsored-by: ByWater Solutions Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	6 years ago
Roch D'Amour	67ec2ead88	Bug 11317: (follow-up) Add two-level entry to koha-conf and remove unwanted characters - Removed merge marker - Changed include path in favor of using the Asset tt plugin (bug 20538) - Changed access_dir to a two-level entry for clarity Test plans stay the same, just make sure that the two-level configuration entry work properly and everything pass QA. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	6 years ago
Roch D'Amour	0f9ec12875	Bug 11317: Add a way to access files from the intranet This squash contains all of these commits: - Adds a page to access log files on the server from the intranet - Update ID to allow for permalinking - Rename config to "'accessdir' and fix qa - Allows for multiple directories to be accessible - Update the link under reports - (Follow-up) Fixing merge error and cosmetic changes - (Follow-up) Fix tab chars and move javascript to the footer - (QA Follow-up) Fix datatable - Make filename unicode-proof, renamed accessdir to access_dir and fix update Test plans: - Apply patch, update database - Add to koha-conf: <access_dir>/tmp/koha-public/one</access_dir> <access_dir>/tmp/koha-public/two</access_dir> <access_dir>/tmp/koha-public</access_dir> - Create these directories ( mkdir /tmp/koha-public , etc...) - Create these files: echo "hello world!" > /tmp/koha-public/❤ echo "test" > /tmp/koha-public/one/samename.txt echo "this is not the same" > /tmp/koha-public/two/samename.txt - Login as Superadmin, go to tools > reports files - Click on ❤, make sure it's downloadable and readable - Click on both samename.txt, look inside and make sure the file is different - Login as NON-superadmin. Go under tools, see no Report/Log under the third column - Go to add tools/access_file permission to user - See new entry under tools third column. - validate link is ok. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	6 years ago
Ere Maijala	f489d2034b	Bug 20073: Move Elasticsearch configs to yaml files and improve the default settings. Improvements: 1) Index settings moved from code to etc/searchengine/elasticsearch/index_config.yaml. An alternative can be specified in koha-conf.xml. 2) Field settings moved from code to etc/searchengine/elasticsearch/field_config.yaml. An alternative can be specified in koha-conf.xml. 3) mappings.yaml has been moved from admin/searchengine/elasticsearch to etc/searchengine/elasticsearch. An alternative can be specified in koha-conf.xml. 4) Default settings have been improved to remove punctuation from phrases used for sorting etc. 5) State variables are used for storing configuration to avoid parsing it multiple times. 6) A possibility to reset the fields too has been added to the reset operation of mappings administration. 7) mappings.yaml has been moved from admin/searchengine/elasticsearch to etc/searchengine/elasticsearch. 8) An stdno field type has been added for standard identifiers. To test: 1) Run tests in t/Koha/SearchEngine/Elasticsearch.t 2) Clear tables search_fields and search_marc_map 3) Go to admin/searchengine/elasticsearch/mappings.pl?op=reset&i_know_what_i_am_doing=1 4) Verify that admin/searchengine/elasticsearch/mappings.pl displays the mappings properly, including ISBN and other standard number fields. 5) Index some records using the -d parameter with misc/search_tools/rebuild_elastic_search.pl to recreate the index 6) Verify that you can find the records 7) Put <elasticsearch_index_mappings>non_existent</elasticsearch_index_mappings> to koha-conf.xml 8) Verify that admin/searchengine/elasticsearch/mappings.pl?op=reset&i_know_what_i_am_doing=1 fails because it can't find non_existent. 9) Copy etc/searchengine/elasticsearch/mappings.yaml to a new location and make elasticsearch_index_mappings setting in koha-conf.xml point to it. 10) Make a change in the new mappings.yaml. 11) Clear table search_fields (mappings reset doesn't do it yet, see bug 20248) 12) Go to admin/searchengine/elasticsearch/mappings.pl?op=reset&i_know_what_i_am_doing=1 13) Verify that the changes you made are now visible in the mappings UI Signed-off-by: Nicolas Legrand <nicolas.legrand@bulac.fr> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	6 years ago
Tomás Cohen Arazi	015e7ee333	Bug 20123: Make the timezone entry empty and uncommented by default Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	6 years ago
Kyle M Hall	cb35784d3c	Bug 20123: Add commented out example to koha-conf.xml Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	6 years ago
Nick Clemens	97b8bd5ebc	Bug 20275: Add comment to let user know they can define multiple plugindirs Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	6 years ago
Tomás Cohen Arazi	06a1f18a1b	Bug 17951: Make koha-create set template_cache_dir correctly This patch makes koha-create (and friends) handle the template_cache_dir config entry correctly. It does so by: - Adding a replaceable string to the template for koha-conf.xml - Making koha-create-dirs create the needed directories (i.e. /var/cache/koha/instance and /var/cache/koha/instance/templates) - Adding a --template-cache-dir switch to koha-create (so sysadmins can specify their favourite directory for the templates cache). - koha-remove now takes care of the instance's templates dir. - The install scripts now automatically create /var/cache/koha so it can be used later by koha-create and friends. It does so the same way it does for other install-created directories. To test, you should ideally be able to build your own packages. This instructions can be followed by people that doesn't have that ability yet. But can be used on a custom packages setup too. To test: - Make sure you have the latest misc4dev in your kohadevbox (if it is a fresh box you have it already) - Run: $ sudo perl misc4dev/cp_debian_files.pl - Manually create the /var/cache/koha dir (skip if you have your own packages): $ sudo mkdir /var/cache/koha - Create a new instance: $ sudo koha-create --create-db cachetest => SUCCESS: * /etc/koha/sites/cachetest/koha-conf.xml contains template_cache_dir and is populated with /var/cache/koha/cachetest/templates * The directory /var/cache/koha/cachetest/templates exists! - Create a new instance, pass your own cache dir: $ sudo koha-create --create-db --template-cache-dir /tmp cachetest2 => SUCCESS: etc/koha/sites/cachetest2/koha-conf.xml contains template_cache_dir and is populated with /tmp - Run: $ man koha-create => SUCCESS: The docs mention the --template-cache-dir option switch correctly. - Sign off :-D! Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	7 years ago
Tomás Cohen Arazi	ba139ec880	Bug 7317: Adjust packages koha-conf.xml Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Magnus Enger <magnus@libriotech.no> Original sign off message: It's impossible to give a test plan for this... I have implemented a "plugin" for Norwegian ILL (based on NCIP): https://github.com/Libriotech/koha-illbackend-nncipp Several issues have been discovered while writing the plugin, and Alex has fixed them along the way. Currently I do not know about any funcional issues, and I am happy to sign off. Update: I have applied the new patchset and done some exploratory testing, using the Dummy backend. Everything seems to be fine after the patches were re-arranged and with the followups from Tomas. All tests pass. Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Benjamin Rokseth <benjamin.rokseth@kul.oslo.kommune.no> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	7 years ago
Tomás Cohen Arazi	2855107383	Bug 18571: Add default ES configuration to koha-conf-site.xml.in This patch adds a default configuration entry for elasticsearch. It will add localhost:9200 to the server subsection, and koha_instance (replacing instance for the corresponding instance name) for the namespace. To test: - Apply the patch - Copy the file to the /etc/koha dir: $ sudo cp kohaclone/debian/templates/koha-conf-site.xml.in /etc/koha - Create a new instance: $ sudo koha-create --create-db test => SUCCESS: /etc/koha/sites/test/koha-conf.xml includes the mentioned section: <elasticsearch> <server>localhost:9200</server> <index_name>koha_test</index_name> </elasticsearch> - Sign off :-D Note: As the use of ES is syspref driven, this default entry doesn't have any use until ES is installed and SearchEngine set to Elasticsearch. So it doesn't hurt but will help end users test the ES integration. Advanced users will take care of this config entry manually (pointing to external servers/clusters, etc). Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	7 years ago
Kyle Hall	af34598448	Bug 17610 - Allow the number of plack workers and max connections to be set in koha-conf.xml It would be nice if we could control the number of workers and max requests on a per instance basis, rather than the numbers being hardcoded in the plack startup script. Test Plan: 1) Build a new package of Koha with this patch applied ; ) 2) Verify koha-plack still works 3) Add the following to the config section of your koha-conf.xml: <plack_max_requests>75</plack_max_requests> <plack_workers>4</plack_workers> 4) Stop plack 5) Start plack 6) Verify the number of works and max requests worked! Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Larry Baerveldt <larry@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Rebased against master and added a description for the new configuration entries Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Jonathan Druart	819cea62f2	Bug 7533: Add the template_cache_dir entry to koha-conf.xml And comment it, as we don't know what are the sysop's preferences Signed-off-by: Magnus Enger <magnus@libriotech.no> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	7 years ago
Chris Cormack	b222e7d921	Bug 13029 : Follow up Adding POD, changing the config files to live in a path pointed to by koha-conf.xml This means multiple instances can have their own config Please test the 2 patches together Signed-off-by: Magnus Enger <magnus@libriotech.no> Works as advertised. Arbitrary arguments can be passed to SMS:Send drivers. If an argument is provided that has already been set by SMS::Send or the driver, it will be overwritten by the value from the YAML file. My only suggestion for an improvement would be an example of what the YAML should look like, but that is a minor thing. Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Tomás Cohen Arazi	242722e99d	Bug 17336: Add api_secret_passphrase entry in packages setup Bug 13799 introduced the api_secret_passphrase on source installs, but missed to do so on packages. This patch introduces the entry on the template koha-conf-site.xml.in file, and patches koha-create so it generates a randomized string (64 chars) to put in it. To test: - Apply the patch - Grab the new template file: $ sudo cp kohaclone/debian/templates/koha-conf-site.xml.in \ /etc/koha - Create a new instance: $ kohaclone/debian/scripts/koha-create --create-db blah => SUCCESS: The script runs fine, /etc/koha/sites/blah/koha-conf.xml contains the api_secret_passphrase entry. - Sign off :-D Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Tomás Cohen Arazi	1c957af7bc	Bug 17332: Include memcached configuration in koha-conf files This patch introduces the memcached_servers and memcached_namespace configuration entries as expected by 11921. Note: better test this one and the followup together to ease the process. To test: - Do a source Koha install (dev, standard, single) => SUCCESS: The resulting koha-conf.xml file includes the memcached_* entries which are filled with the right values. - In kohadevbox (packages setup): - Replace /etc/koha/koha-conf-site.xml.in with the one from this patch - Create a new koha instance => SUCCESS: The instance's koha-conf.xml includes the relevant entries - Sign off Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Marcel de Rooy	aa369c80c1	Bug 16084: [QA Follow-up] Correct three occurrences of __KOHA_CONF_DIR__ This bug correctly inserts substitutions for this variable. Four occurrences will now be changed. The line for log4perl.conf is now correct, but the three other changes point to a location that does not exist: /etc/koha/sites/$instance/zebradb. That should just be: /etc/koha/zebradb. All three cases concern the explain files. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com	8 years ago
Tomás Cohen Arazi	360cdea295	Bug 16084: log4perl.conf not properly set on packages - Run koha-create to create an instance or just fire kohadevbox:ansible => FAIL: Notice the instance's koha-conf.xml points to __KOHA_CONF_DIR__ instead of /etc/koha/sites/kohadev/ on the log4perl entry. => FAIL: the /etc/koha/sites/kohadev/log4perl.conf contains __LOG_DIR__ instead of /var/log/koha/kohadev/ - Apply this patch and pick the koha-conf-site.xml.in and koha-create files - Create a new instance => SUCCESS: All placeholders are filled correctly. - Sign off Regards Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com	8 years ago
Marcel de Rooy	af6488b157	Bug 15714: Add zebra_loglevels to koha-conf.xml This patch adds a commented zebra_loglevels line to the config file. Behavior does not change, but an admin can easily edit the variable. Test plan: Nothing really changed. But if you are not so sure about that, apply the change to /etc/koha/koha-conf-site.xml.in and run koha-create. Check that the new koha-conf contains the line and is not messed up. Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com	8 years ago
Tomás Cohen Arazi	4a714313fe	Bug 14674: koha-create should populate upload_path This patch makes koha-create and koha-create-dirs aware of the new upload_path configuration entry. It defaults to /var/lib/koha/<instance>/uploads as proposed by Robin but lets the user specify its own directory, using the --upload-path option switch that is added by this patch. koha-create-dirs is tweaked so it also creates this new directory. The docs are updated accordingly. To test: - Apply the patch, have a packages setup (either by grabbing the relevant files [1] or by creating your own package). - Run koha-create --create-db instance => SUCCESS: /var/lib/koha/instance/uploads directory is created => SUCCESS: /etc/koha/sites/instance/koha-config.xml has upload_path set correctly - Create a new instance using the --upload-path making it point to whatever you want => SUCCESS: koha-conf.xml points to your chosen path - Sign off :-D Regards Sponsored-by: Universidad Nacional de Cordoba Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Does not work in its current state. Needs a follow-up. Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>	9 years ago
Tomas Cohen Arazi	7fe69d8e5d	Bug 6874: (QA followup) upload_path missing in koha-conf.xml.in Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>	9 years ago
Kyle Hall	1044e620ca	Bug 14167: (QA followup) Add template and changes needed for packages Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Amended: upgraded DEBUG level to WARN in config file. Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>	9 years ago
Robin Sheat	9db34fe875	Bug 13571: followup to remove some now-unused options The memcache parameters aren't used by anything (except C4::SQLHelper, but that's a cancer on the face of the earth) anymore, so they can go. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	9 years ago
Rochelle	0a19149639	Bug 13571: Koha-conf.xml.in has fallen out of sync with koha-conf.xml To test: 1- Build new koha packages 2- Check that the conflist file contains the changes we have made Signed-off-by: Robin Sheat <robin@catalyst.net.nz> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	9 years ago
Tomás Cohen Arazi	b2649cbcba	Bug 12750: koha-create should be able to configure the Z39.50/SRU server This patch adds two parameters to the koha-create command: --enable-sru: makes the koha-create script enabled the SRU server for the created instance --sru-port: lets the user specify a desired port for the SRU server to listen at. It defaults to 7090 To test: - Apply the patch on top of master - Build your own package and install / can be tested just using the koha-create command on a 3.16+ packages install - Create an instance as usual (i.e. without --enable-sru and --sru-port) => SUCCESS: The instance is created, the publicserver sections are both commented out. The first publicserver section has 7090 set as the listening port. - Create an instance as usual, passing --sru-port 456 => SUCCESS: The instance is created, the port is set but the publicserver sections are commented out - Create an instance with --enable-sru (with and without --sru-port) => SUCCESS: Verify the instance is created as expected, with the SRU server enabled (port 7090 if no --sru-port passed, the one we chose otherwise). - Verify that the docs also talk about this new parameters addition. - Sign off :-D Regards To+ Sponsored-by: Universidad Nacional de Cordoba Signed-off-by: Jesse Maseto <jesse@bywatersolutions.com> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com> Signed-off-by: Robin Sheat <robin@catalyst.net.nz> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	10 years ago
Tomás Cohen Arazi	1d28da41fb	Bug 11232: (followup) Configuration variable for enabling Zebra facets This patch adds a variable to koha-conf.xml controlling the use of Zebra facets. Usage: - use_zebra_facets = 1 \| 0 Zebra facets work only on DOM. Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	10 years ago
Doug Kingston	88e7faf860	Bug 11078: Add locking to rebuild_zebra This patch adds locking to rebuild_zebra.pl to ensure that simultaneous changes are prevented (as one is likely to overwrite the other). Incremental updates in daemon mode will skipped if the lock is busy and they will be picked up on the next pass. Non-daemon mode invocations will also exit immediately if they cannot get the lock unless the new flag -wait-for-lock is specified, in which case they will wait until the get the lock and then proceed. Supporting changes made to Makefile.PL and templates for the new locking directory (paralleling the other zebra lock directories). We stash the zebra_lockdir in koha-conf.xml so rebuild_zebra.pl can find it. To address earlier QA concerns we: 1. added code to check if flock is available and ignore locking if it's missing (from M. de Rooy) 2. changed default for adhoc invocations to abort if they cannot obtain the lock. Added option -wait-for-lock if the user prefers to wait until the lock is free, and then continue processing. 3. added missing entry to t/db_dependent/zebra_config.pl 4. added a fallback locking directory of /tmp Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Doug merged the original patch with the QA changes. Just for the record, noting here that the original patch was tested extensively too by Martin Renvoize. I have added a followup for some exceptional cases. Signed-off-by: Galen Charlton <gmc@esilibrary.com>	10 years ago
Tomás Cohen Arazi	c6f091cc23	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@hotmail.com> Signed-off-by: Robin Sheat <robin@catalyst.net.nz> Signed-off-by: Galen Charlton <gmc@esilibrary.com>	11 years ago
Mirko Tietgen	5868490f02	Bug 8507: (follow-up) fix one reference to __ZEBRA_BIBLIOS_CFG__ Fixed the path to __ZEBRA_BIBLIOS_CFG__ for <server id="mergeserver"> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com> Good catach drojf. Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Galen Charlton <gmc@esilibrary.com>	11 years ago
Tomás Cohen Arazi	aba3db2628	Bug 8507: koha-create now supports using DOM indexing for bibs This patch makes the koha-create script install the file zebra-biblios-dom.cfg with the proper string substitutions inside on the new instance koha-conf.xml file. It also adds two option switches that control the indexing mode for the instance: --biblio-idx {dom\|grs1} --auth-idx {dom\|grs1} DOM indexing is set as the default for both authorities and bibliographic records. Following drojf (thanks!) advice I arranged stuff like explained here: http://wiki.koha-community.org/wiki/Switching_to_dom_indexing 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 domtest - Check there's a file /etc/koha/sites/domtest/zebra-biblios-dom.cfg - Check that /etc/koha/sites/domtest/koha-conf.xml points to: * zebra-biblios-dom.cfg (biblioserver section) * zebra-biblios-dom.cfg (publicserver section) * zebra-authorities-dom.cfg (authorityserver section) - Success means the new default is DOM b) Play with the 4 possible combination of option switches $ koha-create --create-db --auth-idx grs1 --biblio-idx grs1 domtest $ koha-create --create-db --auth-idx grs1 --biblio-idx dom domtest $ koha-create --create-db --auth-idx dom --biblio-idx grs1 domtest $ koha-create --create-db --auth-idx dom --biblio-idx dom domtest - Check the koha-conf.xml file reflects 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: Mirko Tietgen <mirko@abunchofthings.net> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Galen Charlton <gmc@esilibrary.com>	11 years ago
Tomás Cohen Arazi	0fe3d053ff	Bug 8911: make sure history.txt gets installed where history.txt can see it This patch makes Makefile.PL put the history.txt file in the right places depending on the chosen setup layout, adds a reference to that place in koha-conf.xml (and debian template version), and finally tweaks about.pl to use it. To test, apply the patch and verify that perl Makefile.PL runs fine, and installing in - dev - single - standard layouts works as expected. Then go to the about.pl page and see if Koha's history shows there. Then, build your packages and test on your newly created instances. Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Galen Charlton <gmc@esilibrary.com>	11 years ago
Kyle M Hall	5eabc672fd	Bug 7804 - Add Koha Plugin System Adds support for custom plugins. At the moment the Plugins feature supports two types of plugins, reports and tools. Plugins are installed by uploading KPZ ( Koha Plugin Zip ) packages. A KPZ file is just a zip file containing the perl files, template files, and any other files neccessary to make the plugin work. Test plan: 1) Apply patch 2) Run updatedatabase.pl 3) Create the directory /var/lib/koha/plugins 4) Add the lines <pluginsdir>/var/lib/koha/plugins</pluginsdir> <enable_plugins>1</enable_plugins>" to your koha-conf.xml file 5) Add the line Alias /plugin/ "/var/lib/koha/plugins/" to your koha-httpd.conf file 6) Restart your webserver 7) Access the plugins system from the "More" pulldown 8) Upload the example plugin file provided here 9) Try it out! Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>	14 years ago
Magnus Enger	be69176982	Bug 9256 - Fix search for the packages See the bug for a description of the problem. This patch tries to restore searching for marcflavour != MARC21 as well as allowing instances with different marcflavors to co-exist on the same server. To test: - Do a package install with e.g. the official squeeze-dev packages and create at least two instances, with different marcflavours, e.g.: sudo koha-create --create-db --marcflavor marc21 test1 sudo koha-create --create-db --marcflavor normarc test2 - Run through the web installers for both instances and add a couple of records to each. Wait for the records to be indexed or run indexing manually with sudo koha-rebuild-zebra -f test1 sudo koha-rebuild-zebra -f test2 - Try searching for the records you added. It should work in test1 but not in test2. - Apply the patch and build packages with the build-git-snapshot script - Install the new koha-common package - Create two instances (because of Bug 9754 it is probably best to give the instances different names than the ones you created above, or to do this on a fresh VM or similar) and add records, as described above. Searching should now work equally well for both instances. Please note: Because of Bug 9752 you will have to set marcflavour = NORMARC by hand before you do the searching, if you choose NORMARC as the marc flavour on one of the instances you create. Please note too: I am not confident that this is the perfect solution, so merciless and thorough testing is necessary! ;-) Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Works for me for GRS-1 (package installation out of the box). Could not figure out how to set up DOM indexing and eventually stopped caring about it. Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Build packages with the patch and checked that creating instances and search within them works for both MARC21 and NORMARC. All tests and QA script pass. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>	11 years ago
Jared Camins-Esakov	09de3b93be	Bug 9239 follow-up: update koha-conf.xml The previous patches were missing the koha-conf.xml updates. This patch updates koha-conf.xml and makes the changes neccessary to include the QueryParser configuration file in the packages. To test: 1) Run Makefile and check generated koha-conf.xml to confirm that the line <queryparser_config>...</queryparser_config> is there with an absolute path. 2) That was it. Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Tested update successfully - new line now shows up and query parser is used. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>	11 years ago
Jared Camins-Esakov	8affddc52d	Bug 8268 follow-up: incorporate QA comments Fixes the following things: 1. Sanitizes log output to prevent an attacker from using a specially crafted POST to add extra lines to the log 2. Simplify a regular expression since "..file" cannot be used to escape the current directory 3. Makes sure directories are consistent 4. Correct logic issues in misc/cronjobs/backup.sh Thanks to Frere Sebastien Marie for catching these issues. Signed-off-by: Robin Sheat <robin@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>	12 years ago
Jared Camins-Esakov	bbcb1d784b	Bug 8268: Add database dump to export tool This patch builds on work by Lars Wirzenius for the Koha packages. To date, the only way for a Koha librarian to obtain a complete backup of their system has been to log into the system via SSH (or FTP) to download the mysqldump file. This patch makes it possible for superlibrarians in properly configured systems to download night backups via the staff client's Export tool. Recognizing that this is functionality with potentially very grave security implications, system administrators must manually enable these features in the koha-conf.xml configuration file. The following configuration settings have been added to the koha-conf.xml file: * backupdir => directory where backups should be stored. * backup_db_via_tools => whether to allow superlibrarians to download database backups via the Export tool. The default is disabled, and there is no way -- by design -- to enable this option without manually editing koha-conf.xml. * backup_conf_via_tools => whether to allow superlibrarians to download configuration backups via the Export tool (this may be applicable to packages only). The default is disabled, and there is no way -- by design -- to enable this option without manually editing koha-conf.xml. This commit modifies the following scripts to make use of the new backupdir configuration option: * koha-dump and koha-run-backups in the Debian packages * The sample backup script misc/cronjobs/backup.sh Note that for security reasons, superlibrarians will not be allowed to download files that are not owned by the web server's effective user. This imposes a de facto dependency on ITK (for Apache) or running the web server as the Koha user (as is done with Plack). To test: 1. Apply patch. 2. Go to export page as a superlibrarian. Notice that no additional export options appear because they have not been enabled. 3. Add <backupdir>$KOHADEV/var/spool</backup> to the <config> section of your koha-conf.xml (note that you will need to adjust that so that it is pointing at a logical directory). 4. Create the aforementioned directory. 5. Go to export page as a superlibrarian. Notice that no additional export options appear because they have not been enabled. 6. Add <backup_db_via_tools>1</backup_db_via_tools> to the <config> section of your koha-conf.xml 7. Go to the export page as a superlibrarian. Notice the new tab. 8. Go to the export page as a non-superlibrarian. Notice there is no new tab. 9. Run: mysqldump -u koha -p koha \| gzip > $BACKUPDIR/backup.sql.gz (substituting appropriate user, password, and database name) 10. Go to the export page as a superlibrarian, and look at the "Export database" tab. If you are running the web server as your Koha user, and ran the above command as your Koha user, you should now see the file listed as an option for download. 11. If you did see the file listed, change the ownership to something else: sudo chown root:root $BACKUPDIR/backup.sql.gz 11a. Confirm that you no longer see the file listed when you look at the "Export database" tab. 12. Change the ownership on the file to your web server (or Koha) user: sudo chown www-data:www-data backup.sql.gz 13. Go to the export page as a superlibrarian, and look at the "Export database" tab. You should now see backup.sql.gz listed. 14. Choose to download backup.sql.gz 15. Confirm that the downloaded file is what you were expecting. If you are interested, you can repeat the above steps but replace <backup_db_via_tools> with <backup_conf_via_tools>, and instead of creating an sql file, create a tar file. To test packaging: run koha-dump, confirm that it still creates a usable backup. ------ This signoff contains two changes: 10-1. If no backup/conf files were present, then the message telling you so doesn't appear and the download button does. Made them behave correctly. 10-2. The test for a file existing required it to be owned by the webserver UID. This change makes it so it only has to be readable. Signed-off-by: Robin Sheat <robin@catalyst.net.nz>	12 years ago
Robin Sheat	038a2cf5d6	Bug 7028 - updated the koha-conf.xml template Now it more closely matches the one that's distributed in /etc Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> (not tested. I confirm the code is clean, and tests are not broken)	13 years ago
Lars Wirzenius	f12ff9e0c6	Add support for a remote mysql server. Signed-off-by: Galen Charlton <gmcharlt@gmail.com>	14 years ago
Lars Wirzenius	2f4d57168d	Split off koha-common. koha-common will be suitable for hosts with multiple Koha instances, or those that otherwise need to do thing differently from the main koha package. Signed-off-by: Galen Charlton <gmcharlt@gmail.com>	14 years ago
Lars Wirzenius	df6767467b	Add support for a remote mysql server. Signed-off-by: Galen Charlton <gmcharlt@gmail.com>	14 years ago
Lars Wirzenius	27c6ab764c	Split off koha-common. koha-common will be suitable for hosts with multiple Koha instances, or those that otherwise need to do thing differently from the main koha package. Signed-off-by: Galen Charlton <gmcharlt@gmail.com>	14 years ago

43 Commits (bee097b39b4f87d7708cbc7bebc46902705f2f64)