From 732d4953a8ed2cf58af8f2cf53467a23f75087d5 Mon Sep 17 00:00:00 2001 From: Mathew Peterson Date: Wed, 10 Aug 2016 16:52:30 -0500 Subject: [PATCH 1/9] Updates changelog --- drupalbox/CHANGELOG-0.0.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drupalbox/CHANGELOG-0.0.md b/drupalbox/CHANGELOG-0.0.md index 28a1867..ec5d9a6 100644 --- a/drupalbox/CHANGELOG-0.0.md +++ b/drupalbox/CHANGELOG-0.0.md @@ -2,6 +2,12 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [0.1.1] - 2016-08-10 + +### Added + +- Added PHP Memcached extension + ## [0.1.0] - 2016-08-09 ### Added From 1bed76c39249f1efb3f5e1a15517475c127516c3 Mon Sep 17 00:00:00 2001 From: Mathew Peterson Date: Wed, 10 Aug 2016 16:52:50 -0500 Subject: [PATCH 2/9] Bumps version --- drupalbox/ubuntu1404.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drupalbox/ubuntu1404.json b/drupalbox/ubuntu1404.json index 16ad32b..f9900d9 100644 --- a/drupalbox/ubuntu1404.json +++ b/drupalbox/ubuntu1404.json @@ -4,5 +4,5 @@ "iso_name": "ubuntu-14.04.4-server-amd64.iso", "iso_path": "iso", "iso_url": "http://releases.ubuntu.com/14.04/ubuntu-14.04.4-server-amd64.iso", - "version": "0.1.0" + "version": "0.1.1" } From e146c7ca36e216332812540e3d1f165e630636ec Mon Sep 17 00:00:00 2001 From: Mathew Peterson Date: Wed, 10 Aug 2016 17:29:07 -0500 Subject: [PATCH 3/9] Updates changelog --- drupalbox/CHANGELOG-0.0.md | 1 + 1 file changed, 1 insertion(+) diff --git a/drupalbox/CHANGELOG-0.0.md b/drupalbox/CHANGELOG-0.0.md index ec5d9a6..84da967 100644 --- a/drupalbox/CHANGELOG-0.0.md +++ b/drupalbox/CHANGELOG-0.0.md @@ -7,6 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Added - Added PHP Memcached extension +- Allowed remote Mysql connections for 'drupal' user ## [0.1.0] - 2016-08-09 From 9add233d2fad8f90f1d2ddfe306516ff402371b4 Mon Sep 17 00:00:00 2001 From: Mathew Peterson Date: Thu, 11 Aug 2016 10:37:07 -0500 Subject: [PATCH 4/9] Fixes solr logging issues --- provisioning/roles/solr/defaults/main.yml | 4 +--- provisioning/roles/solr/tasks/install.yml | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/provisioning/roles/solr/defaults/main.yml b/provisioning/roles/solr/defaults/main.yml index d448966..7b55d4a 100644 --- a/provisioning/roles/solr/defaults/main.yml +++ b/provisioning/roles/solr/defaults/main.yml @@ -2,9 +2,7 @@ solr_mirror: https://archive.apache.org/dist/lucene/solr/ solr_version: 4.9.1 -slf4j_api_version: 1.7.6 -slf4j_api_path: "{{ solr_version_src_dir }}/dist/solrj-lib" -slf4j_api_file: "slf4j-api-{{ slf4j_api_version }}.jar" +slf4j_lib_path: "{{ solr_version_src_dir }}/example/lib/ext" solr_app_name: solr diff --git a/provisioning/roles/solr/tasks/install.yml b/provisioning/roles/solr/tasks/install.yml index e8008f0..0f8aca6 100644 --- a/provisioning/roles/solr/tasks/install.yml +++ b/provisioning/roles/solr/tasks/install.yml @@ -43,9 +43,9 @@ force: yes tags: solr -- name: Solr | Copy slf4f-api jar +- name: Solr | Copy logging libraries become: yes - shell: "cp {{ slf4j_api_path }}/{{ slf4j_api_file }} {{ solr_home_dir }}/WEB-INF/lib" + shell: "cp {{ slf4j_lib_path }}/* {{ solr_home_dir }}/WEB-INF/lib" tags: solr - name: Solr | Link to Jetty From 339e30ca475b1991e36e7855d2680cc5c15be2f6 Mon Sep 17 00:00:00 2001 From: Mathew Peterson Date: Thu, 11 Aug 2016 10:38:08 -0500 Subject: [PATCH 5/9] Allows core aliases for better ux --- provisioning/roles/solr/tasks/cores.yml | 4 ++-- provisioning/roles/solr/templates/solr.xml.j2 | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/provisioning/roles/solr/tasks/cores.yml b/provisioning/roles/solr/tasks/cores.yml index d709d66..4224e28 100644 --- a/provisioning/roles/solr/tasks/cores.yml +++ b/provisioning/roles/solr/tasks/cores.yml @@ -3,7 +3,7 @@ - name: Solr | Copy cores become: yes copy: - src: "cores/{{ item }}" + src: "cores/{{ item.folder }}" dest: "{{ solr_home_dir }}/cores" owner: "{{ solr_app_user }}" group: "{{ solr_app_group }}" @@ -13,7 +13,7 @@ - name: Solr | Create Data Directories become: yes file: - path: "{{ solr_data_dir }}/{{ item }}/data" + path: "{{ solr_data_dir }}/{{ item.folder }}/data" owner: "{{ solr_app_user }}" group: "{{ solr_app_group }}" recurse: true diff --git a/provisioning/roles/solr/templates/solr.xml.j2 b/provisioning/roles/solr/templates/solr.xml.j2 index 8736fb2..08154d9 100644 --- a/provisioning/roles/solr/templates/solr.xml.j2 +++ b/provisioning/roles/solr/templates/solr.xml.j2 @@ -1,7 +1,9 @@ - {% for core in solr_cores %} - - {% endfor %} + {% for core in solr_cores -%} + + + {%- endfor %} + - \ No newline at end of file + From 1510dd0d652c72e97458386b0936e00669b49454 Mon Sep 17 00:00:00 2001 From: Mathew Peterson Date: Thu, 11 Aug 2016 11:15:34 -0500 Subject: [PATCH 6/9] Adds Drupal search_api_solr cores --- drupalbox/drupalbox.yml | 6 +- .../conf/elevate.xml | 31 + .../conf/mapping-ISOLatin1Accent.txt | 14 + .../conf/protwords.txt | 7 + .../conf/schema.xml | 594 ++++++ .../conf/schema_extra_fields.xml | 23 + .../conf/schema_extra_types.xml | 30 + .../conf/solrconfig.xml | 1641 +++++++++++++++++ .../conf/solrconfig_extra.xml | 80 + .../conf/solrcore.properties | 20 + .../conf/stopwords.txt | 4 + .../conf/synonyms.txt | 3 + .../conf/elevate.xml | 31 + .../conf/mapping-ISOLatin1Accent.txt | 14 + .../conf/protwords.txt | 7 + .../conf/schema.xml | 552 ++++++ .../conf/schema_extra_fields.xml | 23 + .../conf/schema_extra_types.xml | 30 + .../conf/solrconfig.xml | 1633 ++++++++++++++++ .../conf/solrconfig_extra.xml | 80 + .../conf/solrcore.properties | 20 + .../conf/stopwords.txt | 4 + .../conf/synonyms.txt | 3 + 23 files changed, 4849 insertions(+), 1 deletion(-) create mode 100644 provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/elevate.xml create mode 100644 provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/mapping-ISOLatin1Accent.txt create mode 100644 provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/protwords.txt create mode 100644 provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/schema.xml create mode 100644 provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/schema_extra_fields.xml create mode 100644 provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/schema_extra_types.xml create mode 100644 provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/solrconfig.xml create mode 100644 provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/solrconfig_extra.xml create mode 100644 provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/solrcore.properties create mode 100644 provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/stopwords.txt create mode 100644 provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/synonyms.txt create mode 100644 provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/elevate.xml create mode 100644 provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/mapping-ISOLatin1Accent.txt create mode 100644 provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/protwords.txt create mode 100644 provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/schema.xml create mode 100644 provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/schema_extra_fields.xml create mode 100644 provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/schema_extra_types.xml create mode 100644 provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/solrconfig.xml create mode 100644 provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/solrconfig_extra.xml create mode 100644 provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/solrcore.properties create mode 100644 provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/stopwords.txt create mode 100644 provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/synonyms.txt diff --git a/drupalbox/drupalbox.yml b/drupalbox/drupalbox.yml index 8a362fa..790863d 100644 --- a/drupalbox/drupalbox.yml +++ b/drupalbox/drupalbox.yml @@ -7,7 +7,11 @@ php_ini_sendmail_path: "/usr/local/bin/mhsendmail" jetty_server_enabled: false jetty_server_java_options: "-Xmx256m -Djava.awt.headless=true -Dsolr.solr.home=/usr/share/solr/current" - solr_cores: [] + solr_cores: + - name: drupal7 + folder: search_api_solr-7x-1.11-4.x + - name: drupal8 + folder: search_api_solr-8x-1.0-alpha5-4.x vars_files: - vars/default/common.yml - vars/dev/mysql.yml diff --git a/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/elevate.xml b/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/elevate.xml new file mode 100644 index 0000000..71ea000 --- /dev/null +++ b/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/elevate.xml @@ -0,0 +1,31 @@ + + + + + + + + + + diff --git a/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/mapping-ISOLatin1Accent.txt b/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/mapping-ISOLatin1Accent.txt new file mode 100644 index 0000000..b92d03c --- /dev/null +++ b/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/mapping-ISOLatin1Accent.txt @@ -0,0 +1,14 @@ +# This file contains character mappings for the default fulltext field type. +# The source characters (on the left) will be replaced by the respective target +# characters before any other processing takes place. +# Lines starting with a pound character # are ignored. +# +# For sensible defaults, use the mapping-ISOLatin1Accent.txt file distributed +# with the example application of your Solr version. +# +# Examples: +# "À" => "A" +# "\u00c4" => "A" +# "\u00c4" => "\u0041" +# "æ" => "ae" +# "\n" => " " diff --git a/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/protwords.txt b/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/protwords.txt new file mode 100644 index 0000000..cda8581 --- /dev/null +++ b/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/protwords.txt @@ -0,0 +1,7 @@ +#----------------------------------------------------------------------- +# This file blocks words from being operated on by the stemmer and word delimiter. +& +< +> +' +" diff --git a/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/schema.xml b/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/schema.xml new file mode 100644 index 0000000..6d9011a --- /dev/null +++ b/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/schema.xml @@ -0,0 +1,594 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id + + + content + + + + + diff --git a/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/schema_extra_fields.xml b/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/schema_extra_fields.xml new file mode 100644 index 0000000..9ecd5f4 --- /dev/null +++ b/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/schema_extra_fields.xml @@ -0,0 +1,23 @@ + + + + diff --git a/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/schema_extra_types.xml b/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/schema_extra_types.xml new file mode 100644 index 0000000..e82072e --- /dev/null +++ b/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/schema_extra_types.xml @@ -0,0 +1,30 @@ + + + + diff --git a/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/solrconfig.xml b/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/solrconfig.xml new file mode 100644 index 0000000..151d9a4 --- /dev/null +++ b/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/solrconfig.xml @@ -0,0 +1,1641 @@ + + + + + + + + + ${solr.abortOnConfigurationError:true} + + + ${solr.luceneMatchVersion:LUCENE_40} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + 4 + + 32 + + + + 2147483647 + 100000 + 1000 + + + + + + + + + single + + + + + + false + + + true + + + + + 1 + + 0 + + + + + + false + + + + + + + + + + + + + + + + ${solr.autoCommit.MaxDocs:10000} + ${solr.autoCommit.MaxTime:120000} + + + + + ${solr.autoSoftCommit.MaxDocs:2000} + ${solr.autoSoftCommit.MaxTime:10000} + + + + + + + + + ${solr.data.dir:} + + + + + + + + + + + + + 1024 + + + + + + + + + + + + + + + + + + + + + + true + + + + + + 20 + + + 200 + + + + + + + + + + + + solr rocks010 + + + + + + false + + + 2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + edismax + explicit + true + 0.01 + + ${solr.pinkPony.timeAllowed:-1} + *:* + + + false + + true + false + + 1 + + + spellcheck + elevator + + + + + + + 1 + 1 + 3 + 15 + 20 + false + + ${solr.mlt.timeAllowed:2000} + + + + + + + explicit + true + + + + + + + + + + + + + + + + + + + + + + text + true + ignored_ + + + true + links + ignored_ + + + + + + + + + + + + + + + + + + + + + + + + pinkPony + solrpingquery + false + + + all + + + + + + + + + explicit + true + + + + + + + ${solr.replication.master:false} + commit + startup + ${solr.replication.confFiles:schema.xml,mapping-ISOLatin1Accent.txt,protwords.txt,stopwords.txt,synonyms.txt,elevate.xml} + + + ${solr.replication.slave:false} + ${solr.replication.masterUrl:http://localhost:8983/solr}/replication + ${solr.replication.pollInterval:00:00:60} + + + + + + + true + json + true + + + + + + + + + false + false + 1 + + + spellcheck + + + + + + + + + + true + + + tvComponent + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + terms + + + + + + + + string + elevate.xml + + + + + + explicit + + + elevator + + + + + + + + + + + 100 + + + + + + + + 70 + + 0.5 + + [-\w ,/\n\"']{20,200} + + + + + + + ]]> + ]]> + + + + + + + + + + + + + + + + + + + + + ,, + ,, + ,, + ,, + ,]]> + ]]> + + + + + + 10 + .,!? + + + + + + + WORD + + + en + US + + + + + + + + + + + + + + + + + + + text/plain; charset=UTF-8 + + + + + + + + + + 5 + + + + + + + + + + + + + *:* + + + + + + + + + + + + textSpell + + + + default + spell + spellchecker + true + + + + + + diff --git a/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/solrconfig_extra.xml b/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/solrconfig_extra.xml new file mode 100644 index 0000000..c5bc3ac --- /dev/null +++ b/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/solrconfig_extra.xml @@ -0,0 +1,80 @@ + + + +textSpell + + + + + + default + spell + spellchecker + true + + + + + + + + + + + + + + + diff --git a/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/solrcore.properties b/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/solrcore.properties new file mode 100644 index 0000000..b7f8f6c --- /dev/null +++ b/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/solrcore.properties @@ -0,0 +1,20 @@ +# Defines Solr properties for this specific core. +solr.replication.master=false +solr.replication.slave=false +solr.replication.pollInterval=00:00:60 +solr.replication.masterUrl=http://localhost:8983/solr +solr.replication.confFiles=schema.xml,mapping-ISOLatin1Accent.txt,protwords.txt,stopwords.txt,synonyms.txt,elevate.xml +solr.mlt.timeAllowed=2000 +# You should not set your luceneMatchVersion to anything lower than your Solr +# Version. +solr.luceneMatchVersion=LUCENE_40 +solr.pinkPony.timeAllowed=-1 +# autoCommit after 10000 docs +solr.autoCommit.MaxDocs=10000 +# autoCommit after 2 minutes +solr.autoCommit.MaxTime=120000 +# autoSoftCommit after 2000 docs +solr.autoSoftCommit.MaxDocs=2000 +# autoSoftCommit after 10 seconds +solr.autoSoftCommit.MaxTime=10000 +solr.contrib.dir=../../../contrib diff --git a/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/stopwords.txt b/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/stopwords.txt new file mode 100644 index 0000000..d7f243e --- /dev/null +++ b/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/stopwords.txt @@ -0,0 +1,4 @@ +# Contains words which shouldn't be indexed for fulltext fields, e.g., because +# they're too common. For documentation of the format, see +# http://wiki.apache.org/solr/AnalyzersTokenizersTokenFilters#solr.StopFilterFactory +# (Lines starting with a pound character # are ignored.) diff --git a/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/synonyms.txt b/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/synonyms.txt new file mode 100644 index 0000000..7d22eea --- /dev/null +++ b/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/synonyms.txt @@ -0,0 +1,3 @@ +# Contains synonyms to use for your index. For the format used, see +# http://wiki.apache.org/solr/AnalyzersTokenizersTokenFilters#solr.SynonymFilterFactory +# (Lines starting with a pound character # are ignored.) diff --git a/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/elevate.xml b/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/elevate.xml new file mode 100644 index 0000000..71ea000 --- /dev/null +++ b/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/elevate.xml @@ -0,0 +1,31 @@ + + + + + + + + + + diff --git a/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/mapping-ISOLatin1Accent.txt b/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/mapping-ISOLatin1Accent.txt new file mode 100644 index 0000000..b92d03c --- /dev/null +++ b/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/mapping-ISOLatin1Accent.txt @@ -0,0 +1,14 @@ +# This file contains character mappings for the default fulltext field type. +# The source characters (on the left) will be replaced by the respective target +# characters before any other processing takes place. +# Lines starting with a pound character # are ignored. +# +# For sensible defaults, use the mapping-ISOLatin1Accent.txt file distributed +# with the example application of your Solr version. +# +# Examples: +# "À" => "A" +# "\u00c4" => "A" +# "\u00c4" => "\u0041" +# "æ" => "ae" +# "\n" => " " diff --git a/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/protwords.txt b/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/protwords.txt new file mode 100644 index 0000000..cda8581 --- /dev/null +++ b/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/protwords.txt @@ -0,0 +1,7 @@ +#----------------------------------------------------------------------- +# This file blocks words from being operated on by the stemmer and word delimiter. +& +< +> +' +" diff --git a/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/schema.xml b/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/schema.xml new file mode 100644 index 0000000..b2c566a --- /dev/null +++ b/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/schema.xml @@ -0,0 +1,552 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id + + + content + + + + + diff --git a/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/schema_extra_fields.xml b/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/schema_extra_fields.xml new file mode 100644 index 0000000..9ecd5f4 --- /dev/null +++ b/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/schema_extra_fields.xml @@ -0,0 +1,23 @@ + + + + diff --git a/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/schema_extra_types.xml b/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/schema_extra_types.xml new file mode 100644 index 0000000..e82072e --- /dev/null +++ b/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/schema_extra_types.xml @@ -0,0 +1,30 @@ + + + + diff --git a/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/solrconfig.xml b/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/solrconfig.xml new file mode 100644 index 0000000..f26982f --- /dev/null +++ b/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/solrconfig.xml @@ -0,0 +1,1633 @@ + + + + + + + + + ${solr.abortOnConfigurationError:true} + + + ${solr.luceneMatchVersion:LUCENE_40} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + 4 + + 32 + + + + 2147483647 + 100000 + 1000 + + + + + + + + + single + + + + + + false + + + true + + + + + 1 + + 0 + + + + + + false + + + + + + + + + + + + + + + + ${solr.autoCommit.MaxDocs:10000} + ${solr.autoCommit.MaxTime:120000} + + + + + ${solr.autoSoftCommit.MaxDocs:2000} + ${solr.autoSoftCommit.MaxTime:10000} + + + + + + + + + ${solr.data.dir:} + + + + + + + + + + + + + 1024 + + + + + + + + + + + + + + + + + + + + + + true + + + + + + 20 + + + 200 + + + + + + + + + + + + solr rocks010 + + + + + + false + + + 2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + edismax + explicit + true + 0.01 + + ${solr.pinkPony.timeAllowed:-1} + *:* + + + false + + true + false + + 1 + + + spellcheck + + + + + + + 1 + 1 + 3 + 15 + 20 + false + + ${solr.mlt.timeAllowed:2000} + + + + + + + explicit + true + + + + + + + + + + + + + + + + + + + + + + text + true + ignored_ + + + true + links + ignored_ + + + + + + + + + + + + + + + + + + + + + + + + pinkPony + solrpingquery + + + all + + + + + + + explicit + true + + + + + + + ${solr.replication.master:false} + commit + startup + ${solr.replication.confFiles:schema.xml,mapping-ISOLatin1Accent.txt,protwords.txt,stopwords.txt,synonyms.txt,elevate.xml} + + + ${solr.replication.slave:false} + ${solr.replication.masterUrl:http://localhost:8983/solr}/replication + ${solr.replication.pollInterval:00:00:60} + + + + + + + true + json + true + + + + + + + + + false + false + 1 + + + spellcheck + + + + + + + + + + true + + + tvComponent + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + terms + + + + + + + + string + elevate.xml + + + + + + explicit + + + elevator + + + + + + + + + + + 100 + + + + + + + + 70 + + 0.5 + + [-\w ,/\n\"']{20,200} + + + + + + + ]]> + ]]> + + + + + + + + + + + + + + + + + + + + + ,, + ,, + ,, + ,, + ,]]> + ]]> + + + + + + 10 + .,!? + + + + + + + WORD + + + en + US + + + + + + + + + + + + + + + + + + + text/plain; charset=UTF-8 + + + + + + + + + + 5 + + + + + + + + + + + + + *:* + + + + + + + + + + + + textSpell + + + + default + spell + spellchecker + true + + + + + + diff --git a/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/solrconfig_extra.xml b/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/solrconfig_extra.xml new file mode 100644 index 0000000..c5bc3ac --- /dev/null +++ b/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/solrconfig_extra.xml @@ -0,0 +1,80 @@ + + + +textSpell + + + + + + default + spell + spellchecker + true + + + + + + + + + + + + + + + diff --git a/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/solrcore.properties b/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/solrcore.properties new file mode 100644 index 0000000..b7f8f6c --- /dev/null +++ b/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/solrcore.properties @@ -0,0 +1,20 @@ +# Defines Solr properties for this specific core. +solr.replication.master=false +solr.replication.slave=false +solr.replication.pollInterval=00:00:60 +solr.replication.masterUrl=http://localhost:8983/solr +solr.replication.confFiles=schema.xml,mapping-ISOLatin1Accent.txt,protwords.txt,stopwords.txt,synonyms.txt,elevate.xml +solr.mlt.timeAllowed=2000 +# You should not set your luceneMatchVersion to anything lower than your Solr +# Version. +solr.luceneMatchVersion=LUCENE_40 +solr.pinkPony.timeAllowed=-1 +# autoCommit after 10000 docs +solr.autoCommit.MaxDocs=10000 +# autoCommit after 2 minutes +solr.autoCommit.MaxTime=120000 +# autoSoftCommit after 2000 docs +solr.autoSoftCommit.MaxDocs=2000 +# autoSoftCommit after 10 seconds +solr.autoSoftCommit.MaxTime=10000 +solr.contrib.dir=../../../contrib diff --git a/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/stopwords.txt b/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/stopwords.txt new file mode 100644 index 0000000..d7f243e --- /dev/null +++ b/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/stopwords.txt @@ -0,0 +1,4 @@ +# Contains words which shouldn't be indexed for fulltext fields, e.g., because +# they're too common. For documentation of the format, see +# http://wiki.apache.org/solr/AnalyzersTokenizersTokenFilters#solr.StopFilterFactory +# (Lines starting with a pound character # are ignored.) diff --git a/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/synonyms.txt b/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/synonyms.txt new file mode 100644 index 0000000..7d22eea --- /dev/null +++ b/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/synonyms.txt @@ -0,0 +1,3 @@ +# Contains synonyms to use for your index. For the format used, see +# http://wiki.apache.org/solr/AnalyzersTokenizersTokenFilters#solr.SynonymFilterFactory +# (Lines starting with a pound character # are ignored.) From a89307ca5e882477598dbdaaed6d5cb7d03012db Mon Sep 17 00:00:00 2001 From: Mathew Peterson Date: Thu, 11 Aug 2016 11:44:18 -0500 Subject: [PATCH 7/9] Fixes search_api_solr errors by including Solr contrib files during install --- .../conf/solrcore.properties | 2 +- .../conf/solrcore.properties | 2 +- provisioning/roles/solr/tasks/install.yml | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/solrcore.properties b/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/solrcore.properties index b7f8f6c..d8edfae 100644 --- a/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/solrcore.properties +++ b/provisioning/roles/solr/files/cores/search_api_solr-7x-1.11-4.x/conf/solrcore.properties @@ -17,4 +17,4 @@ solr.autoCommit.MaxTime=120000 solr.autoSoftCommit.MaxDocs=2000 # autoSoftCommit after 10 seconds solr.autoSoftCommit.MaxTime=10000 -solr.contrib.dir=../../../contrib +solr.contrib.dir=../../contrib diff --git a/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/solrcore.properties b/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/solrcore.properties index b7f8f6c..d8edfae 100644 --- a/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/solrcore.properties +++ b/provisioning/roles/solr/files/cores/search_api_solr-8x-1.0-alpha5-4.x/conf/solrcore.properties @@ -17,4 +17,4 @@ solr.autoCommit.MaxTime=120000 solr.autoSoftCommit.MaxDocs=2000 # autoSoftCommit after 10 seconds solr.autoSoftCommit.MaxTime=10000 -solr.contrib.dir=../../../contrib +solr.contrib.dir=../../contrib diff --git a/provisioning/roles/solr/tasks/install.yml b/provisioning/roles/solr/tasks/install.yml index 0f8aca6..66ff196 100644 --- a/provisioning/roles/solr/tasks/install.yml +++ b/provisioning/roles/solr/tasks/install.yml @@ -48,6 +48,21 @@ shell: "cp {{ slf4j_lib_path }}/* {{ solr_home_dir }}/WEB-INF/lib" tags: solr +- name: Solr | Copy contrib libraries + become: yes + shell: "cp -R {{ solr_version_src_dir }}/contrib {{ solr_home_dir }}/" + tags: solr + +- name: Solr | Fix directory ownership + become: yes + file: + path: "{{ solr_home_dir }}" + recurse: yes + state: directory + owner: "{{ solr_app_user }}" + group: "{{ solr_app_group }}" + tags: solr + - name: Solr | Link to Jetty become: yes file: From 3188272a4139371ef56b16bd20da92a78578f874 Mon Sep 17 00:00:00 2001 From: Mathew Peterson Date: Thu, 11 Aug 2016 11:45:21 -0500 Subject: [PATCH 8/9] Fixes the Solr role from starting jetty --- provisioning/roles/solr/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/provisioning/roles/solr/tasks/main.yml b/provisioning/roles/solr/tasks/main.yml index bcc354d..5ab310e 100644 --- a/provisioning/roles/solr/tasks/main.yml +++ b/provisioning/roles/solr/tasks/main.yml @@ -8,4 +8,5 @@ service: name: jetty state: restarted + when: "{{ jetty_server_enabled }} == True" tags: solr From 3a390ec5d23fa6a75610a277e08dd5036e269a28 Mon Sep 17 00:00:00 2001 From: Mathew Peterson Date: Thu, 11 Aug 2016 12:03:18 -0500 Subject: [PATCH 9/9] Updates changelog --- drupalbox/CHANGELOG-0.0.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drupalbox/CHANGELOG-0.0.md b/drupalbox/CHANGELOG-0.0.md index 84da967..e7c4fac 100644 --- a/drupalbox/CHANGELOG-0.0.md +++ b/drupalbox/CHANGELOG-0.0.md @@ -2,13 +2,17 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [0.1.1] - 2016-08-10 +## [0.1.1] - 2016-08-11 ### Added - Added PHP Memcached extension - Allowed remote Mysql connections for 'drupal' user +### Fixes + +- Fixes issue with Solr and search_api_solr cores + ## [0.1.0] - 2016-08-09 ### Added