From: Wayne Schneider Date: Fri, 29 Jul 2016 16:47:57 +0000 (-0500) Subject: Reorganize configuration directory. X-Git-Tag: v0.11~4 X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=1b8744e13ed96e39e1e6b1d98bab6ad15ccfb1ab;p=lui-solr.git Reorganize configuration directory. --- diff --git a/Changes b/Changes index 3564d0d..a1986e7 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,8 @@ +0.11 [In Progess] + - Remove legacy scripts.conf file from configuration + - Reorganize configuration file layout to accomodate future HA configuration files + + 0.10 Tue Jul 26 16:25:09 UTC 2016 - Documentation updates - Clean up unused files diff --git a/conf/log4j.properties b/conf/log4j.properties deleted file mode 100644 index 17b5462..0000000 --- a/conf/log4j.properties +++ /dev/null @@ -1,24 +0,0 @@ -# Logging level -solr.log=/var/log/masterkey/lui -log4j.rootLogger=INFO, file, CONSOLE - -log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender - -log4j.appender.CONSOLE.layout=org.apache.log4j.EnhancedPatternLayout -log4j.appender.CONSOLE.layout.ConversionPattern=%-4r %-5p (%t) [%X{collection} %X{shard} %X{replica} %X{core}] %c{1.} %m%n - -#- size rotation with log cleanup. -log4j.appender.file=org.apache.log4j.RollingFileAppender -log4j.appender.file.MaxFileSize=4MB -log4j.appender.file.MaxBackupIndex=9 - -#- File to log to and log format -log4j.appender.file.File=${solr.log}/solr.log -log4j.appender.file.layout=org.apache.log4j.EnhancedPatternLayout -log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%X{collection} %X{shard} %X{replica} %X{core}] %c{1.} %m\n - -log4j.logger.org.apache.zookeeper=WARN -log4j.logger.org.apache.hadoop=WARN - -# set to INFO to enable infostream log messages -log4j.logger.org.apache.solr.update.LoggingInfoStream=OFF diff --git a/conf/lui-solr.in.sh b/conf/lui-solr.in.sh deleted file mode 100755 index f2fdf75..0000000 --- a/conf/lui-solr.in.sh +++ /dev/null @@ -1,121 +0,0 @@ -# This file will be linked to /etc/default/lui-solr.in.sh -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# By default the script will use JAVA_HOME to determine which java -# to use, but you can set a specific path for Solr to use without -# affecting other Java applications on your server/workstation. -#SOLR_JAVA_HOME="" - -# Increase Java Heap as needed to support your indexing / query needs -SOLR_HEAP="512m" - -# Expert: If you want finer control over memory options, specify them directly -# Comment out SOLR_HEAP if you are using this though, that takes precedence -#SOLR_JAVA_MEM="-Xms512m -Xmx512m" - -# Enable verbose GC logging -# GC_LOG_OPTS="-verbose:gc -XX:+PrintHeapAtGC -XX:+PrintGCDetails \ -# -XX:+PrintGCDateStamps -XX:+PrintGCTimeStamps -XX:+PrintTenuringDistribution -XX:+PrintGCApplicationStoppedTime" - -# These GC settings have shown to work well for a number of common Solr workloads -GC_TUNE="-XX:NewRatio=3 \ --XX:SurvivorRatio=4 \ --XX:TargetSurvivorRatio=90 \ --XX:MaxTenuringThreshold=8 \ --XX:+UseConcMarkSweepGC \ --XX:+UseParNewGC \ --XX:ConcGCThreads=4 -XX:ParallelGCThreads=4 \ --XX:+CMSScavengeBeforeRemark \ --XX:PretenureSizeThreshold=64m \ --XX:+UseCMSInitiatingOccupancyOnly \ --XX:CMSInitiatingOccupancyFraction=50 \ --XX:CMSMaxAbortablePrecleanTime=6000 \ --XX:+CMSParallelRemarkEnabled \ --XX:+ParallelRefProcEnabled" - -# Set the ZooKeeper connection string if using an external ZooKeeper ensemble -# e.g. host1:2181,host2:2181/chroot -# Leave empty if not using SolrCloud -#ZK_HOST="" - -# Set the ZooKeeper client timeout (for SolrCloud mode) -#ZK_CLIENT_TIMEOUT="15000" - -# By default the start script uses "localhost"; override the hostname here -# for production SolrCloud environments to control the hostname exposed to cluster state -#SOLR_HOST="192.168.1.1" - -# By default the start script uses UTC; override the timezone if needed -#SOLR_TIMEZONE="UTC" - -# Set to true to activate the JMX RMI connector to allow remote JMX client applications -# to monitor the JVM hosting Solr; set to "false" to disable that behavior -# (false is recommended in production environments) -ENABLE_REMOTE_JMX_OPTS="false" - -# The script will use SOLR_PORT+10000 for the RMI_PORT or you can set it here -# RMI_PORT=18983 - -# Set the thread stack size -SOLR_OPTS="$SOLR_OPTS -Xss256k" - -# Anything you add to the SOLR_OPTS variable will be included in the java -# start command line as-is, in ADDITION to other options. If you specify the -# -a option on start script, those options will be appended as well. Examples: -#SOLR_OPTS="$SOLR_OPTS -Dsolr.autoSoftCommit.maxTime=3000" -#SOLR_OPTS="$SOLR_OPTS -Dsolr.autoCommit.maxTime=60000" -#SOLR_OPTS="$SOLR_OPTS -Dsolr.clustering.enabled=true" - -# Location where the bin/solr script will save PID files for running instances -# If not set, the script will create PID files in $SOLR_TIP/bin -SOLR_PID_DIR=/var/lib/masterkey/lui - -# Path to a directory for Solr to store cores and their data. By default, Solr will use server/solr -# If solr.xml is not stored in ZooKeeper, this directory needs to contain solr.xml -SOLR_HOME=/etc/masterkey/lui/solr-home - -# Solr provides a default Log4J configuration properties file in server/resources -# however, you may want to customize the log settings and file appender location -# so you can point the script to use a different log4j.properties file -LOG4J_PROPS=/etc/masterkey/lui/log4j.properties - -# Location where Solr should write logs to; should agree with the file appender -# settings in server/resources/log4j.properties -SOLR_LOGS_DIR=/var/log/masterkey/lui - -# Sets the port Solr binds to, default is 8983 -#SOLR_PORT=8983 - -# Uncomment to set SSL-related system properties -# Be sure to update the paths to the correct keystore for your environment -#SOLR_SSL_KEY_STORE=etc/solr-ssl.keystore.jks -#SOLR_SSL_KEY_STORE_PASSWORD=secret -#SOLR_SSL_TRUST_STORE=etc/solr-ssl.keystore.jks -#SOLR_SSL_TRUST_STORE_PASSWORD=secret -#SOLR_SSL_NEED_CLIENT_AUTH=false -#SOLR_SSL_WANT_CLIENT_AUTH=false - -# Uncomment if you want to override previously defined SSL values for HTTP client -# otherwise keep them commented and the above values will automatically be set for HTTP clients -#SOLR_SSL_CLIENT_KEY_STORE= -#SOLR_SSL_CLIENT_KEY_STORE_PASSWORD= -#SOLR_SSL_CLIENT_TRUST_STORE= -#SOLR_SSL_CLIENT_TRUST_STORE_PASSWORD= - -# Settings for authentication -#SOLR_AUTHENTICATION_CLIENT_CONFIGURER= -#SOLR_AUTHENTICATION_OPTS= - diff --git a/conf/solr-home/lui/conf/admin-extra.html b/conf/solr-home/lui/conf/admin-extra.html deleted file mode 100644 index fecab20..0000000 --- a/conf/solr-home/lui/conf/admin-extra.html +++ /dev/null @@ -1,24 +0,0 @@ - - - diff --git a/conf/solr-home/lui/conf/admin-extra.menu-bottom.html b/conf/solr-home/lui/conf/admin-extra.menu-bottom.html deleted file mode 100644 index 3359a46..0000000 --- a/conf/solr-home/lui/conf/admin-extra.menu-bottom.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - diff --git a/conf/solr-home/lui/conf/admin-extra.menu-top.html b/conf/solr-home/lui/conf/admin-extra.menu-top.html deleted file mode 100644 index 0886cee..0000000 --- a/conf/solr-home/lui/conf/admin-extra.menu-top.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - diff --git a/conf/solr-home/lui/conf/protwords.txt b/conf/solr-home/lui/conf/protwords.txt deleted file mode 100644 index 1dfc0ab..0000000 --- a/conf/solr-home/lui/conf/protwords.txt +++ /dev/null @@ -1,21 +0,0 @@ -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#----------------------------------------------------------------------- -# Use a protected word file to protect against the stemmer reducing two -# unrelated words to the same base word. - -# Some non-words that normally won't be encountered, -# just to test that they won't be stemmed. -dontstems -zwhacky - diff --git a/conf/solr-home/lui/conf/schema.xml b/conf/solr-home/lui/conf/schema.xml deleted file mode 100644 index 9253610..0000000 --- a/conf/solr-home/lui/conf/schema.xml +++ /dev/null @@ -1,271 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id - - - - - - - - diff --git a/conf/solr-home/lui/conf/scripts.conf b/conf/solr-home/lui/conf/scripts.conf deleted file mode 100644 index 8360488..0000000 --- a/conf/solr-home/lui/conf/scripts.conf +++ /dev/null @@ -1,24 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -user= -solr_hostname=localhost -solr_port=8984 -rsyncd_port=18984 -data_dir= -webapp_name=solr -master_host= -master_data_dir= -master_status_dir= diff --git a/conf/solr-home/lui/conf/solrconfig.xml b/conf/solr-home/lui/conf/solrconfig.xml deleted file mode 100644 index b2cd893..0000000 --- a/conf/solr-home/lui/conf/solrconfig.xml +++ /dev/null @@ -1,268 +0,0 @@ - - - - - 5.5.1 - ${solr.data.dir:/var/lib/masterkey/lui/data/lui} - - - - - - - - ${solr.lock.type:native} - - true - - - - - - - - - - - ${solr.ulog.dir:} - - - - ${solr.autoCommit.maxTime:15000} - false - - - - ${solr.autoSoftCommit.maxTime:-1} - - - - - - - - 1024 - - - - - - - - true - 20 - 200 - - - - - - database:* - true - 1 - author_exact - subject_exact - medium_exact - date - database - - - - - - - - database:* - true - 1 - author_exact - subject_exact - medium_exact - date - database - - - - - false - 2 - - - - - - - - - - - - - - - - explicit - 10 - text - *,score - AND - - - - - - explicit - json - true - text - *,score - AND - - - - - - true - json - true - - - - - - {!xport} - xsort - false - - - - query - - - - - - - - clone-fields - - - - - - - - true - ignored_ - - - true - links - ignored_ - - - - - - - - - - - - - solrpingquery - - - all - - - - - - - explicit - true - - - - - - - commit - startup - schema.xml,stopwords.txt - - - - - - - - - - .* - - .*_binary$ - - - text - - - - - - - - - - text/plain; charset=UTF-8 - - - - - *:* - - - diff --git a/conf/solr-home/lui/conf/stopwords.txt b/conf/solr-home/lui/conf/stopwords.txt deleted file mode 100644 index b5824da..0000000 --- a/conf/solr-home/lui/conf/stopwords.txt +++ /dev/null @@ -1,58 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#----------------------------------------------------------------------- -# a couple of test stopwords to test that the words are really being -# configured from this file: -stopworda -stopwordb - -#Standard english stop words taken from Lucene's StopAnalyzer -a -an -and -are -as -at -be -but -by -for -if -in -into -is -it -no -not -of -on -or -s -such -t -that -the -their -then -there -these -they -this -to -was -will -with - diff --git a/conf/solr-home/lui/conf/synonyms.txt b/conf/solr-home/lui/conf/synonyms.txt deleted file mode 100644 index b0e31cb..0000000 --- a/conf/solr-home/lui/conf/synonyms.txt +++ /dev/null @@ -1,31 +0,0 @@ -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#----------------------------------------------------------------------- -#some test synonym mappings unlikely to appear in real input text -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/conf/solr-home/lui/core.properties b/conf/solr-home/lui/core.properties deleted file mode 100644 index e69de29..0000000 diff --git a/conf/solr-home/solr.xml b/conf/solr-home/solr.xml deleted file mode 100644 index e247452..0000000 --- a/conf/solr-home/solr.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - ${host:} - ${jetty.port:8983} - ${hostContext:solr} - - ${genericCoreNodeNames:true} - - ${zkClientTimeout:30000} - ${distribUpdateSoTimeout:600000} - ${distribUpdateConnTimeout:60000} - - - - - ${socketTimeout:600000} - ${connTimeout:60000} - - - diff --git a/conf/solr/log4j.properties b/conf/solr/log4j.properties new file mode 100644 index 0000000..17b5462 --- /dev/null +++ b/conf/solr/log4j.properties @@ -0,0 +1,24 @@ +# Logging level +solr.log=/var/log/masterkey/lui +log4j.rootLogger=INFO, file, CONSOLE + +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender + +log4j.appender.CONSOLE.layout=org.apache.log4j.EnhancedPatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern=%-4r %-5p (%t) [%X{collection} %X{shard} %X{replica} %X{core}] %c{1.} %m%n + +#- size rotation with log cleanup. +log4j.appender.file=org.apache.log4j.RollingFileAppender +log4j.appender.file.MaxFileSize=4MB +log4j.appender.file.MaxBackupIndex=9 + +#- File to log to and log format +log4j.appender.file.File=${solr.log}/solr.log +log4j.appender.file.layout=org.apache.log4j.EnhancedPatternLayout +log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%X{collection} %X{shard} %X{replica} %X{core}] %c{1.} %m\n + +log4j.logger.org.apache.zookeeper=WARN +log4j.logger.org.apache.hadoop=WARN + +# set to INFO to enable infostream log messages +log4j.logger.org.apache.solr.update.LoggingInfoStream=OFF diff --git a/conf/solr/lui-solr.in.sh b/conf/solr/lui-solr.in.sh new file mode 100644 index 0000000..d2f5ae0 --- /dev/null +++ b/conf/solr/lui-solr.in.sh @@ -0,0 +1,121 @@ +# This file will be linked to /etc/default/lui-solr.in.sh +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# By default the script will use JAVA_HOME to determine which java +# to use, but you can set a specific path for Solr to use without +# affecting other Java applications on your server/workstation. +#SOLR_JAVA_HOME="" + +# Increase Java Heap as needed to support your indexing / query needs +SOLR_HEAP="512m" + +# Expert: If you want finer control over memory options, specify them directly +# Comment out SOLR_HEAP if you are using this though, that takes precedence +#SOLR_JAVA_MEM="-Xms512m -Xmx512m" + +# Enable verbose GC logging +# GC_LOG_OPTS="-verbose:gc -XX:+PrintHeapAtGC -XX:+PrintGCDetails \ +# -XX:+PrintGCDateStamps -XX:+PrintGCTimeStamps -XX:+PrintTenuringDistribution -XX:+PrintGCApplicationStoppedTime" + +# These GC settings have shown to work well for a number of common Solr workloads +GC_TUNE="-XX:NewRatio=3 \ +-XX:SurvivorRatio=4 \ +-XX:TargetSurvivorRatio=90 \ +-XX:MaxTenuringThreshold=8 \ +-XX:+UseConcMarkSweepGC \ +-XX:+UseParNewGC \ +-XX:ConcGCThreads=4 -XX:ParallelGCThreads=4 \ +-XX:+CMSScavengeBeforeRemark \ +-XX:PretenureSizeThreshold=64m \ +-XX:+UseCMSInitiatingOccupancyOnly \ +-XX:CMSInitiatingOccupancyFraction=50 \ +-XX:CMSMaxAbortablePrecleanTime=6000 \ +-XX:+CMSParallelRemarkEnabled \ +-XX:+ParallelRefProcEnabled" + +# Set the ZooKeeper connection string if using an external ZooKeeper ensemble +# e.g. host1:2181,host2:2181/chroot +# Leave empty if not using SolrCloud +#ZK_HOST="" + +# Set the ZooKeeper client timeout (for SolrCloud mode) +#ZK_CLIENT_TIMEOUT="15000" + +# By default the start script uses "localhost"; override the hostname here +# for production SolrCloud environments to control the hostname exposed to cluster state +#SOLR_HOST="192.168.1.1" + +# By default the start script uses UTC; override the timezone if needed +#SOLR_TIMEZONE="UTC" + +# Set to true to activate the JMX RMI connector to allow remote JMX client applications +# to monitor the JVM hosting Solr; set to "false" to disable that behavior +# (false is recommended in production environments) +ENABLE_REMOTE_JMX_OPTS="false" + +# The script will use SOLR_PORT+10000 for the RMI_PORT or you can set it here +# RMI_PORT=18983 + +# Set the thread stack size +SOLR_OPTS="$SOLR_OPTS -Xss256k" + +# Anything you add to the SOLR_OPTS variable will be included in the java +# start command line as-is, in ADDITION to other options. If you specify the +# -a option on start script, those options will be appended as well. Examples: +#SOLR_OPTS="$SOLR_OPTS -Dsolr.autoSoftCommit.maxTime=3000" +#SOLR_OPTS="$SOLR_OPTS -Dsolr.autoCommit.maxTime=60000" +#SOLR_OPTS="$SOLR_OPTS -Dsolr.clustering.enabled=true" + +# Location where the bin/solr script will save PID files for running instances +# If not set, the script will create PID files in $SOLR_TIP/bin +SOLR_PID_DIR=/var/lib/masterkey/lui + +# Path to a directory for Solr to store cores and their data. By default, Solr will use server/solr +# If solr.xml is not stored in ZooKeeper, this directory needs to contain solr.xml +SOLR_HOME=/etc/masterkey/lui/solr/solr-home + +# Solr provides a default Log4J configuration properties file in server/resources +# however, you may want to customize the log settings and file appender location +# so you can point the script to use a different log4j.properties file +LOG4J_PROPS=/etc/masterkey/lui/solr/log4j.properties + +# Location where Solr should write logs to; should agree with the file appender +# settings in server/resources/log4j.properties +SOLR_LOGS_DIR=/var/log/masterkey/lui + +# Sets the port Solr binds to, default is 8983 +#SOLR_PORT=8983 + +# Uncomment to set SSL-related system properties +# Be sure to update the paths to the correct keystore for your environment +#SOLR_SSL_KEY_STORE=etc/solr-ssl.keystore.jks +#SOLR_SSL_KEY_STORE_PASSWORD=secret +#SOLR_SSL_TRUST_STORE=etc/solr-ssl.keystore.jks +#SOLR_SSL_TRUST_STORE_PASSWORD=secret +#SOLR_SSL_NEED_CLIENT_AUTH=false +#SOLR_SSL_WANT_CLIENT_AUTH=false + +# Uncomment if you want to override previously defined SSL values for HTTP client +# otherwise keep them commented and the above values will automatically be set for HTTP clients +#SOLR_SSL_CLIENT_KEY_STORE= +#SOLR_SSL_CLIENT_KEY_STORE_PASSWORD= +#SOLR_SSL_CLIENT_TRUST_STORE= +#SOLR_SSL_CLIENT_TRUST_STORE_PASSWORD= + +# Settings for authentication +#SOLR_AUTHENTICATION_CLIENT_CONFIGURER= +#SOLR_AUTHENTICATION_OPTS= + diff --git a/conf/solr/solr-home/lui/conf/admin-extra.html b/conf/solr/solr-home/lui/conf/admin-extra.html new file mode 100644 index 0000000..fecab20 --- /dev/null +++ b/conf/solr/solr-home/lui/conf/admin-extra.html @@ -0,0 +1,24 @@ + + + diff --git a/conf/solr/solr-home/lui/conf/admin-extra.menu-bottom.html b/conf/solr/solr-home/lui/conf/admin-extra.menu-bottom.html new file mode 100644 index 0000000..3359a46 --- /dev/null +++ b/conf/solr/solr-home/lui/conf/admin-extra.menu-bottom.html @@ -0,0 +1,25 @@ + + + + diff --git a/conf/solr/solr-home/lui/conf/admin-extra.menu-top.html b/conf/solr/solr-home/lui/conf/admin-extra.menu-top.html new file mode 100644 index 0000000..0886cee --- /dev/null +++ b/conf/solr/solr-home/lui/conf/admin-extra.menu-top.html @@ -0,0 +1,25 @@ + + + + diff --git a/conf/solr/solr-home/lui/conf/protwords.txt b/conf/solr/solr-home/lui/conf/protwords.txt new file mode 100644 index 0000000..1dfc0ab --- /dev/null +++ b/conf/solr/solr-home/lui/conf/protwords.txt @@ -0,0 +1,21 @@ +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#----------------------------------------------------------------------- +# Use a protected word file to protect against the stemmer reducing two +# unrelated words to the same base word. + +# Some non-words that normally won't be encountered, +# just to test that they won't be stemmed. +dontstems +zwhacky + diff --git a/conf/solr/solr-home/lui/conf/schema.xml b/conf/solr/solr-home/lui/conf/schema.xml new file mode 100644 index 0000000..9253610 --- /dev/null +++ b/conf/solr/solr-home/lui/conf/schema.xml @@ -0,0 +1,271 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id + + + + + + + + diff --git a/conf/solr/solr-home/lui/conf/solrconfig.xml b/conf/solr/solr-home/lui/conf/solrconfig.xml new file mode 100644 index 0000000..98aa267 --- /dev/null +++ b/conf/solr/solr-home/lui/conf/solrconfig.xml @@ -0,0 +1,268 @@ + + + + + 5.5.1 + ${solr.data.dir:/var/lib/masterkey/lui/solr/lui} + + + + + + + + ${solr.lock.type:native} + + true + + + + + + + + + + + ${solr.ulog.dir:} + + + + ${solr.autoCommit.maxTime:15000} + false + + + + ${solr.autoSoftCommit.maxTime:-1} + + + + + + + + 1024 + + + + + + + + true + 20 + 200 + + + + + + database:* + true + 1 + author_exact + subject_exact + medium_exact + date + database + + + + + + + + database:* + true + 1 + author_exact + subject_exact + medium_exact + date + database + + + + + false + 2 + + + + + + + + + + + + + + + + explicit + 10 + text + *,score + AND + + + + + + explicit + json + true + text + *,score + AND + + + + + + true + json + true + + + + + + {!xport} + xsort + false + + + + query + + + + + + + + clone-fields + + + + + + + + true + ignored_ + + + true + links + ignored_ + + + + + + + + + + + + + solrpingquery + + + all + + + + + + + explicit + true + + + + + + + commit + startup + schema.xml,stopwords.txt + + + + + + + + + + .* + + .*_binary$ + + + text + + + + + + + + + + text/plain; charset=UTF-8 + + + + + *:* + + + diff --git a/conf/solr/solr-home/lui/conf/stopwords.txt b/conf/solr/solr-home/lui/conf/stopwords.txt new file mode 100644 index 0000000..b5824da --- /dev/null +++ b/conf/solr/solr-home/lui/conf/stopwords.txt @@ -0,0 +1,58 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#----------------------------------------------------------------------- +# a couple of test stopwords to test that the words are really being +# configured from this file: +stopworda +stopwordb + +#Standard english stop words taken from Lucene's StopAnalyzer +a +an +and +are +as +at +be +but +by +for +if +in +into +is +it +no +not +of +on +or +s +such +t +that +the +their +then +there +these +they +this +to +was +will +with + diff --git a/conf/solr/solr-home/lui/conf/synonyms.txt b/conf/solr/solr-home/lui/conf/synonyms.txt new file mode 100644 index 0000000..b0e31cb --- /dev/null +++ b/conf/solr/solr-home/lui/conf/synonyms.txt @@ -0,0 +1,31 @@ +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#----------------------------------------------------------------------- +#some test synonym mappings unlikely to appear in real input text +aaa => aaaa +bbb => bbbb1 bbbb2 +ccc => cccc1,cccc2 +a\=>a => b\=>b +a\,a => b\,b +fooaaa,baraaa,bazaaa + +# Some synonym groups specific to this example +GB,gib,gigabyte,gigabytes +MB,mib,megabyte,megabytes +Television, Televisions, TV, TVs +#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming +#after us won't split it into two words. + +# Synonym mappings can be used for spelling correction too +pixima => pixma + diff --git a/conf/solr/solr-home/lui/core.properties b/conf/solr/solr-home/lui/core.properties new file mode 100644 index 0000000..e69de29 diff --git a/conf/solr/solr-home/solr.xml b/conf/solr/solr-home/solr.xml new file mode 100644 index 0000000..e247452 --- /dev/null +++ b/conf/solr/solr-home/solr.xml @@ -0,0 +1,51 @@ + + + + + + + + + + ${host:} + ${jetty.port:8983} + ${hostContext:solr} + + ${genericCoreNodeNames:true} + + ${zkClientTimeout:30000} + ${distribUpdateSoTimeout:600000} + ${distribUpdateConnTimeout:60000} + + + + + ${socketTimeout:600000} + ${connTimeout:60000} + + + diff --git a/debian/dirs b/debian/dirs index a585803..fae317f 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,6 +1,6 @@ etc/default usr/share/masterkey/lui usr/share/doc/masterkey-lui-solr5 -etc/masterkey/lui +etc/masterkey/lui/solr var/log/masterkey/lui -var/lib/masterkey/lui/data/lui +var/lib/masterkey/lui/solr/lui diff --git a/debian/install b/debian/install index 2723a16..21ad2d9 100644 --- a/debian/install +++ b/debian/install @@ -1,3 +1,3 @@ dist usr/share/masterkey/lui -conf/* etc/masterkey/lui +conf/solr/* etc/masterkey/lui/solr doc/* usr/share/doc/masterkey-lui-solr5 diff --git a/debian/links b/debian/links index 5315de1..1d33fc4 100644 --- a/debian/links +++ b/debian/links @@ -1 +1 @@ -etc/masterkey/lui/lui-solr.in.sh etc/default/lui-solr.in.sh \ No newline at end of file +etc/masterkey/lui/solr/lui-solr.in.sh etc/default/lui-solr.in.sh \ No newline at end of file diff --git a/debian/postinst b/debian/postinst index c16cda6..ee4dd44 100755 --- a/debian/postinst +++ b/debian/postinst @@ -7,13 +7,13 @@ case "$1" in # Set directory permissions chown -R lui-solr /var/lib/masterkey/lui chown -R lui-solr /var/log/masterkey/lui - chown -R lui-solr /etc/masterkey/lui/solr-home + chown -R lui-solr /etc/masterkey/lui/solr/solr-home # Run Solr installation script /usr/share/masterkey/lui/dist/install_solr_service.sh /usr/share/masterkey/lui/dist/solr-5.5.1.tgz -d /var/lib/masterkey/lui -i /usr/share/masterkey/lui -s lui-solr -u lui-solr -f # Remove extra files created by Solr installation rm -f /usr/lib/masterkey/lui/log4j.properties rm -rf /usr/lib/masterkey/lui/logs - rm -f /usr/lib/masterkey/lui/data/solr.xml + rm -f /usr/lib/masterkey/lui/data ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/dev-deploy.yml b/dev-deploy.yml index 7c07ddd..a3908e3 100644 --- a/dev-deploy.yml +++ b/dev-deploy.yml @@ -19,9 +19,9 @@ file: path={{ item }} state=directory with_items: - /usr/share/masterkey/lui - - /var/lib/masterkey/lui/data/lui + - /var/lib/masterkey/lui/solr/lui - /var/log/masterkey/lui - - /etc/masterkey + - /etc/masterkey/lui - name: Create lui-solr account become: yes @@ -36,11 +36,11 @@ - name: Link Solr configuration become: yes - file: src=/vagrant/conf path=/etc/masterkey/lui state=link + file: src=/vagrant/conf/solr path=/etc/masterkey/lui/solr state=link - name: Link Solr defaults become: yes - file: src=/etc/masterkey/lui/lui-solr.in.sh path=/etc/default/lui-solr.in.sh state=link + file: src=/etc/masterkey/lui/solr/lui-solr.in.sh path=/etc/default/lui-solr.in.sh state=link - name: Install Solr binary become: yes @@ -52,4 +52,4 @@ with_items: - /var/lib/masterkey/lui/log4j.properties - /var/lib/masterkey/lui/logs - - /var/lib/masterkey/lui/data/solr.xml + - /var/lib/masterkey/lui/data diff --git a/dev-install.sh b/dev-install.sh index fa92c62..f546a0d 100755 --- a/dev-install.sh +++ b/dev-install.sh @@ -38,8 +38,8 @@ EOF echo "Linking in lui-solr configuration..." mkdir $SOLR_DIR/server/solr/lui cd $SOLR_DIR/server/solr/lui -ln -s ../../../../conf/solr-home/lui/conf conf -ln -s ../../../../conf/solr-home/lui/core.properties core.properties +ln -s ../../../../conf/solr/solr-home/lui/conf conf +ln -s ../../../../conf/solr/solr-home/lui/core.properties core.properties echo "You can launch solr with the command \"$SOLR_DIR/bin/solr start\""