Merge pull request #50 from ckan/Maintenance-March-2023
General Maintenance (March 2023)
This commit is contained in:
Brett Jones
GitHub
commit
403d5dc174
4
.env
4
.env
|
|
@ -28,9 +28,9 @@ TEST_CKAN_DATASTORE_WRITE_URL=postgresql://ckan:ckan@db/datastore_test
|
|||
TEST_CKAN_DATASTORE_READ_URL=postgresql://datastore_ro:datastore@db/datastore_test
|
||||
|
||||
# CKAN core
|
||||
CKAN_VERSION=2.9.7
|
||||
CKAN_VERSION=2.10.0
|
||||
CKAN_SITE_ID=default
|
||||
CKAN_SITE_URL=http://ckan:5000
|
||||
CKAN_SITE_URL=https://localhost:8443
|
||||
CKAN_PORT=5000
|
||||
CKAN_PORT_HOST=5000
|
||||
CKAN___BEAKER__SESSION__SECRET=CHANGE_ME
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ TEST_CKAN_DATASTORE_WRITE_URL=postgresql://ckan:ckan@db/datastore_test
|
|||
TEST_CKAN_DATASTORE_READ_URL=postgresql://datastore_ro:datastore@db/datastore_test
|
||||
|
||||
# CKAN core
|
||||
CKAN_VERSION=2.9.7
|
||||
CKAN_VERSION=2.10.0
|
||||
CKAN_SITE_ID=default
|
||||
CKAN_SITE_URL=http://ckan:5000
|
||||
CKAN_PORT=5000
|
||||
|
|
|
|||
|
|
@ -38,14 +38,6 @@ jobs:
|
|||
push: false
|
||||
tags: kowhai/ckan-docker-postgresql:test-build-only
|
||||
|
||||
- name: Solr build
|
||||
uses: docker/build-push-action@v2
|
||||
with:
|
||||
context: ./solr
|
||||
file: ./solr/Dockerfile
|
||||
push: false
|
||||
tags: kowhai/ckan-docker-solr:test-build-only
|
||||
|
||||
- name: CKAN build
|
||||
uses: docker/build-push-action@v2
|
||||
with:
|
||||
|
|
|
|||
|
|
@ -1,30 +1,30 @@
|
|||
-----BEGIN CERTIFICATE-----
|
||||
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
|
||||
+1Chs6ri897nG4sMQBeHT2jyPwo=
|
||||
BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEApej5FEF4lCOAmmUaAr67w6Go2XZO
|
||||
crV2UoWbJQq+aC688XpSX5MaxBVK7r4MQGvwC0u/5aN50fyGQBWGeiY6/27MbGHA
|
||||
fimLtGAmHf5ys4FYtD71YYV0ekUMvlTV1flV3gdM3JItlkXR8ukqIb6WlAGv4vS3
|
||||
31QdoUyd7bGbCMmtDJ2ecnSlO5U0l9Udoqz4+cDPUMWMc1rXw9DfK/mzm+KR3iW+
|
||||
QdWwbWj+Crd/aBKiofKIscq2svRfcVisxSbPr4ib1iMEAxes3nt2cBYNQe8H2OVh
|
||||
SHbskKtaVgG5d+X+f/Mo+P6/1wrqY1JBgkegWkpcaz5mlT4tjsiudfmKsRRnKqHP
|
||||
m5qohWBZxH2MDWX1ggJsziI546a5Y0lkvazql8QUd44X/vrWnx37sCn50Dj8DRAf
|
||||
xtzNAC4doO+nIS+NC964yr6Ps4NrZE++WP5Ry6VUKhl46JSRkg6vtc27ZRrGn6LS
|
||||
AmWU/Ob6/9UaPQkWZ3A/iDnkrkBflM6wdaD/EQmb5LLou84dhZCivqEJ6/5TdB3c
|
||||
8w5muTQY2SLY9JmvECNQpfviD1IdXq7zqeH23L/hgE9i3GrYGWqGc9E3cjNht8Qt
|
||||
hF7WbRaomzbjH6ChZTtiSEw3wtf6bTLKuJjWCBDbp+GypyfDWrvJI2UFVwtH5QMv
|
||||
HYvxG4t+u+E6F2MCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAQcFH6iKXcErUuPJv
|
||||
N+EdDfJh8CTvbqnp7SXOBQ2Q66NhsTZXPrpyOzT3APoeineWhwt7YZF59m02O1Ek
|
||||
yS2qVEdAI9vDgmRvR6ryRsaEkLvnbhfTsBkN56c2oLTxqHBHooAyBKVIl0rSplW9
|
||||
EYhZ9t+08QNd/2unEipgTMFUM+JIMMzseKDwrug97tGsCftIPeWddkPchT309Lwr
|
||||
ECl2JsXX4t67oNR54hqRRvxyriSx/E8BF7rupsnaGNdNPPASoBbGVGEWumUutWMh
|
||||
PzlkyOgpl5fZ44WqYOBvBeLGGPTkM3uoaySv6GNOAxFsXJfHXCq59TL93LRn4RKs
|
||||
rik07ZabYa95JFAPUUSzMpplU4RCpE6r+MFceb1WMrDpK/4zoLLeIwmlwiHsrg/6
|
||||
L0tN1/RLVQwvpxiVqlmETlyDmqFC+McURNU1ZJU2V8efQTWhDVnB7rNVefQsbTLN
|
||||
5jaWiKMKQxva2Skf1jgVT9JOfYYCRlHpryOp9yIrqQqVxlaaDJz/Jm91Pt4QhCDj
|
||||
VhSMDYVMFtE/ylMbB1qR3MJBw0xCCG4zdZpUzvFfR6/wQ5FZ4DvXsbYnsxX/JhgV
|
||||
sTqxkdnhhR0UsxuHyxGWVPPxS+5IZdxVETcjrMVeaK9PAHyBBSI4DQHYIJWoyZ3m
|
||||
y9oQx2IvfVXpGptadU5EKWM6210=
|
||||
-----END CERTIFICATE-----
|
||||
|
|
|
|||
|
|
@ -1,52 +1,52 @@
|
|||
-----BEGIN PRIVATE KEY-----
|
||||
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
|
||||
ZgICLAExQ4Rg4x94uY5DIe43vnaWZA==
|
||||
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
|
||||
E0CmRHNQumr+KBM8UT4YtWA+recgbtA=
|
||||
-----END PRIVATE KEY-----
|
||||
|
|
|
|||
|
|
@ -1,34 +0,0 @@
|
|||
FROM solr:6.6.6
|
||||
|
||||
# Enviroment variables
|
||||
ENV SOLR_CORE ckan
|
||||
ENV SOLR_VERSION 6.6.6
|
||||
ENV CKAN_VERSION 2.9.4
|
||||
###TODO!!! CKAN_VERSION to be passed in as an ARG
|
||||
|
||||
# root user for initial config
|
||||
USER root
|
||||
|
||||
# Create directories
|
||||
RUN mkdir -p /opt/solr/server/solr/${SOLR_CORE}/conf && \
|
||||
mkdir -p /opt/solr/server/solr/${SOLR_CORE}/data && \
|
||||
mkdir -p /opt/solr/server/solr/${SOLR_CORE}/data/index
|
||||
|
||||
# Add files
|
||||
COPY solrconfig-${CKAN_VERSION}.xml /opt/solr/server/solr/${SOLR_CORE}/conf/solrconfig.xml
|
||||
ADD https://raw.githubusercontent.com/ckan/ckan/ckan-${CKAN_VERSION}/ckan/config/solr/schema.xml \
|
||||
https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/${SOLR_VERSION}/solr/server/solr/configsets/basic_configs/conf/currency.xml \
|
||||
https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/${SOLR_VERSION}/solr/server/solr/configsets/basic_configs/conf/synonyms.txt \
|
||||
https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/${SOLR_VERSION}/solr/server/solr/configsets/basic_configs/conf/stopwords.txt \
|
||||
https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/${SOLR_VERSION}/solr/server/solr/configsets/basic_configs/conf/protwords.txt \
|
||||
https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/${SOLR_VERSION}/solr/server/solr/configsets/data_driven_schema_configs/conf/elevate.xml \
|
||||
/opt/solr/server/solr/${SOLR_CORE}/conf/
|
||||
|
||||
# Create core.properties
|
||||
RUN echo name=${SOLR_CORE} > /opt/solr/server/solr/${SOLR_CORE}/core.properties
|
||||
|
||||
# Giving ownership to Solr
|
||||
RUN chown -R ${SOLR_USER}:${SOLR_USER} /opt/solr/server/solr/${SOLR_CORE}
|
||||
|
||||
# non-root user for runtime
|
||||
USER ${SOLR_USER}:${SOLR_USER}
|
||||
|
|
@ -1,345 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<!--solrconfig.xml documentation [https://wiki.apache.org/solr/SolrConfigXml]-->
|
||||
<config>
|
||||
|
||||
<luceneMatchVersion>6.0.0</luceneMatchVersion>
|
||||
|
||||
<lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />
|
||||
<lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" />
|
||||
<lib dir="${solr.install.dir:../../../..}/contrib/clustering/lib/" regex=".*\.jar" />
|
||||
<lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-clustering-\d.*\.jar" />
|
||||
<lib dir="${solr.install.dir:../../../..}/contrib/langid/lib/" regex=".*\.jar" />
|
||||
<lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-langid-\d.*\.jar" />
|
||||
<lib dir="${solr.install.dir:../../../..}/contrib/velocity/lib" regex=".*\.jar" />
|
||||
<lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-velocity-\d.*\.jar" />
|
||||
|
||||
<dataDir>${solr.data.dir:}</dataDir>
|
||||
|
||||
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}" />
|
||||
|
||||
<codecFactory class="solr.SchemaCodecFactory" />
|
||||
|
||||
<indexConfig>
|
||||
<lockType>${solr.lock.type:native}</lockType>
|
||||
</indexConfig>
|
||||
|
||||
<jmx />
|
||||
|
||||
<updateHandler class="solr.DirectUpdateHandler2">
|
||||
|
||||
<updateLog>
|
||||
<str name="dir">${solr.ulog.dir:}</str>
|
||||
<int name="numVersionBuckets">${solr.ulog.numVersionBuckets:65536}</int>
|
||||
</updateLog>
|
||||
|
||||
<autoCommit>
|
||||
<maxTime>${solr.autoCommit.maxTime:15000}</maxTime>
|
||||
<openSearcher>false</openSearcher>
|
||||
</autoCommit>
|
||||
|
||||
<autoSoftCommit>
|
||||
<maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime>
|
||||
</autoSoftCommit>
|
||||
|
||||
</updateHandler>
|
||||
|
||||
<query>
|
||||
|
||||
<maxBooleanClauses>1024</maxBooleanClauses>
|
||||
<filterCache class="solr.FastLRUCache" size="512" initialSize="512" autowarmCount="0" />
|
||||
<queryResultCache class="solr.LRUCache" size="512" initialSize="512" autowarmCount="0" />
|
||||
<documentCache class="solr.LRUCache" size="512" initialSize="512" autowarmCount="0" />
|
||||
<cache name="perSegFilter" class="solr.search.LRUCache" size="10" initialSize="0" autowarmCount="10" regenerator="solr.NoOpRegenerator" />
|
||||
<enableLazyFieldLoading>true</enableLazyFieldLoading>
|
||||
<queryResultWindowSize>20</queryResultWindowSize>
|
||||
<queryResultMaxDocsCached>200</queryResultMaxDocsCached>
|
||||
|
||||
<listener event="newSearcher" class="solr.QuerySenderListener">
|
||||
<arr name="queries" />
|
||||
</listener>
|
||||
|
||||
<listener event="firstSearcher" class="solr.QuerySenderListener">
|
||||
<arr name="queries" />
|
||||
</listener>
|
||||
|
||||
<useColdSearcher>false</useColdSearcher>
|
||||
<maxWarmingSearchers>2</maxWarmingSearchers>
|
||||
|
||||
</query>
|
||||
|
||||
<requestDispatcher handleSelect="false">
|
||||
|
||||
<requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048000" formdataUploadLimitInKB="2048" addHttpRequestToContext="false" />
|
||||
<httpCaching never304="true" />
|
||||
|
||||
</requestDispatcher>
|
||||
|
||||
<requestHandler name="/select" class="solr.SearchHandler">
|
||||
|
||||
<lst name="defaults">
|
||||
<str name="echoParams">explicit</str>
|
||||
<int name="rows">10</int>
|
||||
</lst>
|
||||
|
||||
</requestHandler>
|
||||
|
||||
<requestHandler name="/query" class="solr.SearchHandler">
|
||||
|
||||
<lst name="defaults">
|
||||
<str name="echoParams">explicit</str>
|
||||
<str name="wt">json</str>
|
||||
<str name="indent">true</str>
|
||||
</lst>
|
||||
|
||||
</requestHandler>
|
||||
|
||||
<requestHandler name="/browse" class="solr.SearchHandler" useParams="query,facets,velocity,browse">
|
||||
|
||||
<lst name="defaults">
|
||||
<str name="echoParams">explicit</str>
|
||||
</lst>
|
||||
|
||||
</requestHandler>
|
||||
|
||||
<initParams path="/update/**,/query,/select,/tvrh,/elevate,/spell,/browse">
|
||||
|
||||
<lst name="defaults">
|
||||
<str name="df">_text_</str>
|
||||
</lst>
|
||||
|
||||
</initParams>
|
||||
|
||||
<initParams path="/update/**">
|
||||
|
||||
<lst name="defaults">
|
||||
<str name="update.chain">add-unknown-fields-to-the-schema</str>
|
||||
</lst>
|
||||
|
||||
</initParams>
|
||||
|
||||
<requestHandler name="/update/extract" startup="lazy" class="solr.extraction.ExtractingRequestHandler">
|
||||
|
||||
<lst name="defaults">
|
||||
<str name="lowernames">true</str>
|
||||
<str name="fmap.meta">ignored_</str>
|
||||
<str name="fmap.content">_text_</str>
|
||||
</lst>
|
||||
|
||||
</requestHandler>
|
||||
|
||||
<requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
|
||||
<requestHandler name="/analysis/document" class="solr.DocumentAnalysisRequestHandler" startup="lazy" />
|
||||
|
||||
<requestHandler name="/debug/dump" class="solr.DumpRequestHandler">
|
||||
|
||||
<lst name="defaults">
|
||||
<str name="echoParams">explicit</str>
|
||||
<str name="echoHandler">true</str>
|
||||
</lst>
|
||||
|
||||
</requestHandler>
|
||||
|
||||
<searchComponent name="spellcheck" class="solr.SpellCheckComponent">
|
||||
|
||||
<str name="queryAnalyzerFieldType">text_general</str>
|
||||
|
||||
<lst name="spellchecker">
|
||||
<str name="name">default</str>
|
||||
<str name="field">_text_</str>
|
||||
<str name="classname">solr.DirectSolrSpellChecker</str>
|
||||
<str name="distanceMeasure">internal</str>
|
||||
<float name="accuracy">0.5</float>
|
||||
<int name="maxEdits">2</int>
|
||||
<int name="minPrefix">1</int>
|
||||
<int name="maxInspections">5</int>
|
||||
<int name="minQueryLength">4</int>
|
||||
<float name="maxQueryFrequency">0.01</float>
|
||||
</lst>
|
||||
|
||||
</searchComponent>
|
||||
|
||||
<requestHandler name="/spell" class="solr.SearchHandler" startup="lazy">
|
||||
|
||||
<lst name="defaults">
|
||||
<str name="spellcheck.dictionary">default</str>
|
||||
<str name="spellcheck">on</str>
|
||||
<str name="spellcheck.extendedResults">true</str>
|
||||
<str name="spellcheck.count">10</str>
|
||||
<str name="spellcheck.alternativeTermCount">5</str>
|
||||
<str name="spellcheck.maxResultsForSuggest">5</str>
|
||||
<str name="spellcheck.collate">true</str>
|
||||
<str name="spellcheck.collateExtendedResults">true</str>
|
||||
<str name="spellcheck.maxCollationTries">10</str>
|
||||
<str name="spellcheck.maxCollations">5</str>
|
||||
</lst>
|
||||
|
||||
<arr name="last-components">
|
||||
<str>spellcheck</str>
|
||||
</arr>
|
||||
|
||||
</requestHandler>
|
||||
|
||||
<searchComponent name="tvComponent" class="solr.TermVectorComponent" />
|
||||
|
||||
<requestHandler name="/tvrh" class="solr.SearchHandler" startup="lazy">
|
||||
|
||||
<lst name="defaults">
|
||||
<bool name="tv">true</bool>
|
||||
</lst>
|
||||
<arr name="last-components">
|
||||
<str>tvComponent</str>
|
||||
</arr>
|
||||
|
||||
</requestHandler>
|
||||
|
||||
<searchComponent name="terms" class="solr.TermsComponent" />
|
||||
|
||||
<requestHandler name="/terms" class="solr.SearchHandler" startup="lazy">
|
||||
|
||||
<lst name="defaults">
|
||||
<bool name="terms">true</bool>
|
||||
<bool name="distrib">false</bool>
|
||||
</lst>
|
||||
|
||||
<arr name="components">
|
||||
<str>terms</str>
|
||||
</arr>
|
||||
|
||||
</requestHandler>
|
||||
|
||||
<searchComponent name="elevator" class="solr.QueryElevationComponent">
|
||||
|
||||
<str name="queryFieldType">string</str>
|
||||
<str name="config-file">elevate.xml</str>
|
||||
|
||||
</searchComponent>
|
||||
|
||||
<requestHandler name="/elevate" class="solr.SearchHandler" startup="lazy">
|
||||
|
||||
<lst name="defaults">
|
||||
<str name="echoParams">explicit</str>
|
||||
</lst>
|
||||
<arr name="last-components">
|
||||
<str>elevator</str>
|
||||
</arr>
|
||||
|
||||
</requestHandler>
|
||||
|
||||
<searchComponent class="solr.HighlightComponent" name="highlight">
|
||||
|
||||
<highlighting>
|
||||
|
||||
<fragmenter name="gap" default="true" class="solr.highlight.GapFragmenter">
|
||||
<lst name="defaults">
|
||||
<int name="hl.fragsize">100</int>
|
||||
</lst>
|
||||
</fragmenter>
|
||||
|
||||
<fragmenter name="regex" class="solr.highlight.RegexFragmenter">
|
||||
<lst name="defaults">
|
||||
<int name="hl.fragsize">70</int>
|
||||
<float name="hl.regex.slop">0.5</float>
|
||||
<str name="hl.regex.pattern">[-\w ,/\n\"']{20,200}</str>
|
||||
</lst>
|
||||
</fragmenter>
|
||||
|
||||
<formatter name="html" default="true" class="solr.highlight.HtmlFormatter">
|
||||
<lst name="defaults">
|
||||
<str name="hl.simple.pre"><![CDATA[<em>]]></str>
|
||||
<str name="hl.simple.post"><![CDATA[</em>]]></str>
|
||||
</lst>
|
||||
</formatter>
|
||||
|
||||
<encoder name="html" class="solr.highlight.HtmlEncoder" />
|
||||
<fragListBuilder name="simple" class="solr.highlight.SimpleFragListBuilder" />
|
||||
<fragListBuilder name="single" class="solr.highlight.SingleFragListBuilder" />
|
||||
<fragListBuilder name="weighted" default="true" class="solr.highlight.WeightedFragListBuilder" />
|
||||
<fragmentsBuilder name="default" default="true" class="solr.highlight.ScoreOrderFragmentsBuilder" />
|
||||
<fragmentsBuilder name="colored" class="solr.highlight.ScoreOrderFragmentsBuilder">
|
||||
|
||||
<lst name="defaults">
|
||||
<str name="hl.tag.pre"><![CDATA[<b style="background:yellow">,<b style="background:lawgreen">,
|
||||
<b style="background:aquamarine">,<b style="background:magenta">,
|
||||
<b style="background:palegreen">,<b style="background:coral">,
|
||||
<b style="background:wheat">,<b style="background:khaki">,
|
||||
<b style="background:lime">,<b style="background:deepskyblue">]]></str>
|
||||
<str name="hl.tag.post"><![CDATA[</b>]]></str>
|
||||
</lst>
|
||||
|
||||
</fragmentsBuilder>
|
||||
|
||||
<boundaryScanner name="default" default="true" class="solr.highlight.SimpleBoundaryScanner">
|
||||
<lst name="defaults">
|
||||
<str name="hl.bs.maxScan">10</str>
|
||||
<str name="hl.bs.chars">.,!?</str>
|
||||
</lst>
|
||||
</boundaryScanner>
|
||||
|
||||
<boundaryScanner name="breakIterator" class="solr.highlight.BreakIteratorBoundaryScanner">
|
||||
<lst name="defaults">
|
||||
<str name="hl.bs.type">WORD</str>
|
||||
<str name="hl.bs.language">en</str>
|
||||
<str name="hl.bs.country">US</str>
|
||||
</lst>
|
||||
</boundaryScanner>
|
||||
|
||||
</highlighting>
|
||||
|
||||
</searchComponent>
|
||||
|
||||
<schemaFactory class="ManagedIndexSchemaFactory">
|
||||
<bool name="mutable">true</bool>
|
||||
</schemaFactory>
|
||||
|
||||
<updateRequestProcessorChain name="add-unknown-fields-to-the-schema">
|
||||
<processor class="solr.UUIDUpdateProcessorFactory" />
|
||||
<processor class="solr.LogUpdateProcessorFactory" />
|
||||
<processor class="solr.DistributedUpdateProcessorFactory" />
|
||||
<processor class="solr.RemoveBlankFieldUpdateProcessorFactory" />
|
||||
<processor class="solr.FieldNameMutatingUpdateProcessorFactory">
|
||||
<str name="pattern">[^\w-\.]</str>
|
||||
<str name="replacement">_</str>
|
||||
</processor>
|
||||
<processor class="solr.ParseBooleanFieldUpdateProcessorFactory" />
|
||||
<processor class="solr.ParseLongFieldUpdateProcessorFactory" />
|
||||
<processor class="solr.ParseDoubleFieldUpdateProcessorFactory" />
|
||||
<processor class="solr.ParseDateFieldUpdateProcessorFactory">
|
||||
<arr name="format">
|
||||
<str>yyyy-MM-dd'T'HH:mm:ss.SSSZ</str>
|
||||
<str>yyyy-MM-dd'T'HH:mm:ss,SSSZ</str>
|
||||
<str>yyyy-MM-dd'T'HH:mm:ss.SSS</str>
|
||||
<str>yyyy-MM-dd'T'HH:mm:ss,SSS</str>
|
||||
<str>yyyy-MM-dd'T'HH:mm:ssZ</str>
|
||||
<str>yyyy-MM-dd'T'HH:mm:ss</str>
|
||||
<str>yyyy-MM-dd'T'HH:mmZ</str>
|
||||
<str>yyyy-MM-dd'T'HH:mm</str>
|
||||
<str>yyyy-MM-dd HH:mm:ss.SSSZ</str>
|
||||
<str>yyyy-MM-dd HH:mm:ss,SSSZ</str>
|
||||
<str>yyyy-MM-dd HH:mm:ss.SSS</str>
|
||||
<str>yyyy-MM-dd HH:mm:ss,SSS</str>
|
||||
<str>yyyy-MM-dd HH:mm:ssZ</str>
|
||||
<str>yyyy-MM-dd HH:mm:ss</str>
|
||||
<str>yyyy-MM-dd HH:mmZ</str>
|
||||
<str>yyyy-MM-dd HH:mm</str>
|
||||
<str>yyyy-MM-dd</str>
|
||||
</arr>
|
||||
</processor>
|
||||
<processor class="solr.RunUpdateProcessorFactory" />
|
||||
</updateRequestProcessorChain>
|
||||
|
||||
<queryResponseWriter name="json" class="solr.JSONResponseWriter">
|
||||
<str name="content-type">text/plain; charset=UTF-8</str>
|
||||
</queryResponseWriter>
|
||||
|
||||
<queryResponseWriter name="velocity" class="solr.VelocityResponseWriter" startup="lazy">
|
||||
<str name="template.base.dir">${velocity.template.base.dir:}</str>
|
||||
<str name="solr.resource.loader.enabled">${velocity.solr.resource.loader.enabled:true}</str>
|
||||
<str name="params.resource.loader.enabled">${velocity.params.resource.loader.enabled:false}</str>
|
||||
</queryResponseWriter>
|
||||
|
||||
<queryResponseWriter name="xslt" class="solr.XSLTResponseWriter">
|
||||
<int name="xsltCacheLifetimeSeconds">5</int>
|
||||
</queryResponseWriter>
|
||||
|
||||
</config>
|
||||
Loading…
Reference in New Issue