[Koha-bugs] [Bug 13571] koha-conf.xml.in has fallen out of sync with koha-conf.xml
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Thu Jan 15 05:26:24 CET 2015
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13571
M. Tompsett <mtompset at hotmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |mtompset at hotmail.com
--- Comment #6 from M. Tompsett <mtompset at hotmail.com> ---
When did Koha lose the ability to be installed in a home directory?
This hard coded path and __KOHASITE__ instead of __ZEBRA{WHATEVER}__ seems like
a step backwards. When did that come in?
$ cd ~/kohaclone
$ diff etc/koha-conf.xml debian/templates/koha-conf-site.xml.in > ~/file.txt
$ cat ~/file.txt
1d0
<
3,13c2,4
< <!-- [scheme:]host[:port][/databaseName] -->
< <!-- scheme: tcp, ssl, unix, http, sru -->
< <!-- can run all servers on tcp, but the unix socket is faster -->
<
< <listen id="biblioserver" >unix:__ZEBRA_RUN_DIR__/bibliosocket</listen>
< <listen id="authorityserver" >unix:__ZEBRA_RUN_DIR__/authoritysocket</listen>
< <!-- uncomment these lines and comment out the above if running on MSWin32
-->
< <!--
< <listen id="biblioserver" >tcp:localhost:9998/bibliosocket</listen>
< <listen id="authorityserver" >tcp:localhost:9999/authoritysocket</listen>
< -->
---
>
> <listen id="biblioserver" >unix:/var/run/koha/__KOHASITE__/bibliosocket</listen>
> <listen id="authorityserver" >unix:/var/run/koha/__KOHASITE__/authoritysocket</listen>
16c7
< Also uncomment the <server> and <serverinfo> sections for id
'publicserver'
---
> Also uncomment the <server> and <serverinfo> sections for id 'publicserver'
18,20c9,11
< <!--
< <listen id="publicserver" >tcp:@:__ZEBRA_SRU_BIBLIOS_PORT__</listen>
< -->
---
> __START_SRU_PUBLICSERVER__
> <listen id="publicserver" >tcp:@:__SRU_BIBLIOS_PORT__</listen>
> __END_SRU_PUBLICSERVER__
26c17
< __PAZPAR2_TOGGLE_XML_PRE__
---
> <!--
28,31c19,22
< <server id="mergeserver" listenref="mergeserver">
< <directory>__ZEBRA_DATA_DIR__/biblios</directory>
< <config>__ZEBRA_CONF_DIR__/__ZEBRA_BIB_CFG__</config>
< <cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn>
---
> <server id="mergeserver" listenref="mergeserver">
> <directory>/var/lib/koha/__KOHASITE__/biblios</directory>
> <config>/etc/koha/sites/__KOHASITE__/__ZEBRA_BIBLIOS_CFG__</config>
> <cql2rpn>/var/lib/koha/__KOHASITE__/pqf.properties</cql2rpn>
33c24
< __PAZPAR2_TOGGLE_XML_POST__
---
> -->
36,41c27,96
< <server id="biblioserver" listenref="biblioserver">
< <directory>__ZEBRA_DATA_DIR__/biblios</directory>
< <config>__ZEBRA_CONF_DIR__/__ZEBRA_BIB_CFG__</config>
< <cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn>
< <xi:include href="__KOHA_CONF_DIR__/zebradb/__BIB_RETRIEVAL_CFG__"
xmlns:xi="http://www.w3.org/2001/XInclude"/>
< <xi:include href="__KOHA_CONF_DIR__/zebradb/explain-biblios.xml"
xmlns:xi="http://www.w3.org/2001/XInclude"/>
---
> <server id="biblioserver" listenref="biblioserver">
> <directory>/var/lib/koha/__KOHASITE__/biblios</directory>
> <config>/etc/koha/sites/__KOHASITE__/__ZEBRA_BIBLIOS_CFG__</config>
> <cql2rpn>/etc/koha/zebradb/pqf.properties</cql2rpn>
>
> __START_BIBLIOS_RETRIEVAL_INFO__
> <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
> <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
> <retrieval syntax="xml" name="F"/>
> <retrieval syntax="xml" name="B"/>
> <retrieval syntax="xml" name="marcxml"
> identifier="info:srw/schema/1/marcxml-v1.1">
> <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
> <marc inputformat="marc" outputformat="marcxml"
> inputcharset="utf-8"/>
> </backend>
> </retrieval>
> <retrieval syntax="xml" name="dc">
> <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
> <marc inputformat="marc" outputformat="marcxml"
> inputcharset="utf-8"/>
> <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slim2DC.xsl"/>
> </backend>
> </retrieval>
> <retrieval syntax="xml" name="mods">
> <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
> <marc inputformat="marc" outputformat="marcxml"
> inputcharset="utf-8"/>
> <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl"/>
> </backend>
> </retrieval>
> <retrieval syntax="xml" name="rdfdc">
> <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
> <marc inputformat="marc" outputformat="marcxml"
> inputcharset="utf-8"/>
> <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
> </backend>
> </retrieval>
> <retrieval syntax="xml" name="rss2">
> <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
> <marc inputformat="marc" outputformat="marcxml"
> inputcharset="utf-8"/>
> <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slim2RSS2.xsl"/>
> </backend>
> </retrieval>
> <retrieval syntax="xml" name="utils">
> <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
> <marc inputformat="marc" outputformat="marcxml"
> inputcharset="utf-8"/>
> <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
> </backend>
> </retrieval>
> __END_BIBLIOS_RETRIEVAL_INFO__
>
> <!-- The stuff below is used to enable SRU. It's currently disabled
> until we come up with a good way to make it get magically set up by
> the packaging system. If you need it, uncomment and set it up
> manually.
> <xi:include href="__KOHA_CONF_DIR__/zebradb/explain-biblios.xml"
> xmlns:xi="http://www.w3.org/2001/XInclude">
> <xi:fallback>
> <explain xmlns="http://explain.z3950.org/dtd/2.0/">
> <serverInfo>
> <host>__ZEBRA_SRU_HOST__</host>
> <port>__ZEBRA_SRU_BIBLIOS_PORT__</port>
> <database>biblios</database>
> </serverInfo>
> </explain>
> </xi:fallback>
> </xi:include> -->
44,45c99,100
< <ccl2rpn>__ZEBRA_CONF_DIR__/ccl.properties</ccl2rpn>
< <user>__ZEBRA_USER__</user>
---
> <ccl2rpn>/etc/koha/zebradb/ccl.properties</ccl2rpn>
> <user>kohauser</user>
51,55c106,165
< <directory>__ZEBRA_DATA_DIR__/authorities</directory>
< <config>__ZEBRA_CONF_DIR__/__ZEBRA_AUTH_CFG__</config>
< <cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn>
< <xi:include href="__KOHA_CONF_DIR__/zebradb/__AUTH_RETRIEVAL_CFG__"
xmlns:xi="http://www.w3.org/2001/XInclude"/>
< <xi:include href="__KOHA_CONF_DIR__/zebradb/explain-authorities.xml"
xmlns:xi="http://www.w3.org/2001/XInclude"/>
---
> <directory>/var/lib/koha/__KOHASITE__/authorities</directory>
> <config>/etc/koha/sites/__KOHASITE__/__ZEBRA_AUTHORITIES_CFG__</config>
> <cql2rpn>/etc/koha/zebradb/pqf.properties</cql2rpn>
>
> __START_AUTHORITIES_RETRIEVAL_INFO__
> <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
> <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
> <retrieval syntax="xml" name="marcxml"
> identifier="info:srw/schema/1/marcxml-v1.1">
> <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
> <marc inputformat="marc" outputformat="marcxml"
> inputcharset="utf-8"/>
> </backend>
> </retrieval>
> <retrieval syntax="xml" name="dc">
> <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
> <marc inputformat="marc" outputformat="marcxml"
> inputcharset="utf-8"/>
> <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slim2DC.xsl"/>
> </backend>
> </retrieval>
> <retrieval syntax="xml" name="mods">
> <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
> <marc inputformat="marc" outputformat="marcxml"
> inputcharset="utf-8"/>
> <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl"/>
> </backend>
> </retrieval>
> <retrieval syntax="xml" name="rdfdc">
> <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
> <marc inputformat="marc" outputformat="marcxml"
> inputcharset="utf-8"/>
> <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
> </backend>
> </retrieval>
> <retrieval syntax="xml" name="utils">
> <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
> <marc inputformat="marc" outputformat="marcxml"
> inputcharset="utf-8"/>
> <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
> </backend>
> </retrieval>
> __END_AUTHORITIES_RETRIEVAL_INFO__
>
> <!-- The stuff below is used to enable SRU. It's currently disabled
> until we come up with a good way to make it get magically set up by
> the packaging system. If you need it, uncomment and set it up
> manually.
> <xi:include href="__KOHA_CONF_DIR__/zebradb/explain-authorities.xml"
> xmlns:xi="http://www.w3.org/2001/XInclude">
> <xi:fallback>
> <explain xmlns="http://explain.z3950.org/dtd/2.0/">
> <serverInfo>
> <host>__ZEBRA_SRU_HOST__</host>
> <port>__ZEBRA_SRU_AUTHORITIES_PORT__</port>
> <database>authorities</database>
> </serverInfo>
> </explain>
> </xi:fallback>
> </xi:include> -->
58,59c168,169
< <ccl2rpn>__ZEBRA_CONF_DIR__/ccl.properties</ccl2rpn>
< <user>__ZEBRA_USER__</user>
---
> <ccl2rpn>/etc/koha/zebradb/ccl.properties</ccl2rpn>
> <user>kohauser</user>
64,70c174,241
< <!--
< <server id="publicserver" listenref="publicserver">
< <directory>__ZEBRA_DATA_DIR__/biblios</directory>
< <config>__ZEBRA_CONF_DIR__/__ZEBRA_BIB_CFG__</config>
< <cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn>
< <xi:include href="__KOHA_CONF_DIR__/zebradb/__BIB_RETRIEVAL_CFG__"
xmlns:xi="http://www.w3.org/2001/XInclude"/>
< <xi:include href="__KOHA_CONF_DIR__/zebradb/explain-biblios.xml"
xmlns:xi="http://www.w3.org/2001/XInclude"/>
---
> <!-- This can be used to set up a public Z39.50/SRU server. -->
> __START_SRU_PUBLICSERVER__
> <server id="publicserver" listenref="publicserver">
> <directory>/var/lib/koha/__KOHASITE__/biblios</directory>
> <config>/etc/koha/sites/__KOHASITE__/__ZEBRA_BIBLIOS_CFG__</config>
> <cql2rpn>/etc/koha/zebradb/pqf.properties</cql2rpn>
>
> __START_BIBLIOS_RETRIEVAL_INFO__
> <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
> <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
> <retrieval syntax="xml" name="F"/>
> <retrieval syntax="xml" name="B"/>
> <retrieval syntax="xml" name="marcxml"
> identifier="info:srw/schema/1/marcxml-v1.1">
> <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
> <marc inputformat="marc" outputformat="marcxml"
> inputcharset="utf-8"/>
> </backend>
> </retrieval>
> <retrieval syntax="xml" name="dc">
> <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
> <marc inputformat="marc" outputformat="marcxml"
> inputcharset="utf-8"/>
> <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slim2DC.xsl"/>
> </backend>
> </retrieval>
> <retrieval syntax="xml" name="mods">
> <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
> <marc inputformat="marc" outputformat="marcxml"
> inputcharset="utf-8"/>
> <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl"/>
> </backend>
> </retrieval>
> <retrieval syntax="xml" name="rdfdc">
> <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
> <marc inputformat="marc" outputformat="marcxml"
> inputcharset="utf-8"/>
> <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
> </backend>
> </retrieval>
> <retrieval syntax="xml" name="rss2">
> <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
> <marc inputformat="marc" outputformat="marcxml"
> inputcharset="utf-8"/>
> <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slim2RSS2.xsl"/>
> </backend>
> </retrieval>
> <retrieval syntax="xml" name="utils">
> <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
> <marc inputformat="marc" outputformat="marcxml"
> inputcharset="utf-8"/>
> <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
> </backend>
> </retrieval>
> __END_BIBLIOS_RETRIEVAL_INFO__
>
> <xi:include href="__KOHA_CONF_DIR__/zebradb/explain-biblios.xml"
> xmlns:xi="http://www.w3.org/2001/XInclude">
> <xi:fallback>
> <explain xmlns="http://explain.z3950.org/dtd/2.0/">
> <serverInfo>
> <host>__ZEBRA_SRU_HOST__</host>
> <port>__ZEBRA_SRU_BIBLIOS_PORT__</port>
> <database>biblios</database>
> </serverInfo>
> </explain>
> </xi:fallback>
> </xi:include>
73,74c244,245
< <ccl2rpn>__ZEBRA_CONF_DIR__/ccl.properties</ccl2rpn>
< <user>__ZEBRA_USER__</user>
---
> <ccl2rpn>/etc/koha/zebradb/ccl.properties</ccl2rpn>
> <user>kohauser</user>
77c248
< -->
---
> __END_SRU_PUBLICSERVER__
79,82d249
< <!-- ADDITIONAL KOHA CONFIGURATION DIRECTIVE -->
< <!-- db_scheme should follow the DBD driver name -->
< <!-- the DBD drivers supported by Koha are mysql and Pg -->
< <!-- port info: mysql:3306 Pg:5432 (5433 on Debian) -->
84c251
< <db_scheme>__DB_TYPE__</db_scheme>
---
> <db_scheme>mysql</db_scheme>
87c254
< <port>__DB_PORT__</port>
---
> <port>3306</port>
96,103c263,270
< <intranetdir>__INTRANET_CGI_DIR__</intranetdir>
< <opacdir>__OPAC_CGI_DIR__/opac</opacdir>
< <opachtdocs>__OPAC_TMPL_DIR__</opachtdocs>
< <intrahtdocs>__INTRANET_TMPL_DIR__</intrahtdocs>
< <includes>__INTRANET_TMPL_DIR__/prog/en/includes/</includes>
< <logdir>__LOG_DIR__</logdir>
< <docdir>__DOC_DIR__</docdir>
< <backupdir>__BACKUP_DIR__</backupdir>
---
> <intranetdir>/usr/share/koha/intranet/cgi-bin</intranetdir>
> <opacdir>/usr/share/koha/opac/cgi-bin/opac</opacdir>
> <opachtdocs>/usr/share/koha/opac/htdocs/opac-tmpl</opachtdocs>
> <intrahtdocs>/usr/share/koha/intranet/htdocs/intranet-tmpl</intrahtdocs>
> <includes>/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/includes/</includes>
> <logdir>/var/log/koha/__KOHASITE__</logdir>
> <docdir>/usr/share/doc/koha-common</docdir>
> <backupdir>/var/spool/koha/__KOHASITE__</backupdir>
109,114c276,277
< <!-- Uncomment the following line if you are not using packages and need to
schedule reports through the web interface. supportdir should contain
cronjobs/runreport.pl -->
< <!--
< <supportdir>__SCRIPT_NONDEV_DIR__</supportdir>
< -->
< <pazpar2url>http://__PAZPAR2_HOST__:__PAZPAR2_PORT__/search.pz2</pazpar2url>
< <install_log>__MISC_DIR__/koha-install-log</install_log>
---
> <!-- <pazpar2url>http://__PAZPAR2_HOST__:__PAZPAR2_PORT__/search.pz2</pazpar2url> -->
> <install_log>/usr/share/koha/misc/koha-install-log</install_log>
116,119c279,283
< <useshibboleth>0</useshibboleth><!-- see C4::Auth_with_shibboleth for extra
configs you must do to turn this on -->
< <zebra_bib_index_mode>__BIB_INDEX_MODE__</zebra_bib_index_mode>
< <zebra_auth_index_mode>__AUTH_INDEX_MODE__</zebra_auth_index_mode>
< <zebra_lockdir>__ZEBRA_LOCK_DIR__</zebra_lockdir>
---
> <memcached_servers>__MEMCACHED_SERVERS__</memcached_servers>
> <memcached_namespace>__MEMCACHED_NAMESPACE__</memcached_namespace>
> <zebra_bib_index_mode>__BIBLIOS_INDEXING_MODE__</zebra_bib_index_mode>
> <zebra_auth_index_mode>__AUTHORITIES_INDEXING_MODE__</zebra_auth_index_mode>
> <zebra_lockdir>/var/lock/koha/__KOHASITE__</zebra_lockdir>
121,138c285
<
<queryparser_config>__KOHA_CONF_DIR__/searchengine/queryparser.yaml</queryparser_config>
<
< <!-- true type font mapping accoding to type from $font_types in
C4/Creators/Lib.pm -->
< <ttf>
< <font type="TR"
>/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf</font>
< <font type="TB"
>/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf</font>
< <font type="TI"
>/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Italic.ttf</font>
< <font
type="TBI">/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldItalic.ttf</font>
< <font type="C"
>/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf</font>
< <font type="CB"
>/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf</font>
< <font type="CO"
>/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf</font>
< <font
type="CBO">/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf</font>
< <font type="H"
>/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf</font>
< <font type="HO"
>/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf</font>
< <font type="HB"
>/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf</font>
< <font
type="HBO">/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf</font>
< </ttf>
<
---
> <queryparser_config>/etc/koha/searchengine/queryparser.yaml</queryparser_config>
139a287
>
--
You are receiving this mail because:
You are watching all bug changes.
You are the assignee for the bug.
More information about the Koha-bugs
mailing list