diff --git a/README.md b/README.md index 9990ba1..d052390 100644 --- a/README.md +++ b/README.md @@ -5,14 +5,14 @@ Devkit is a framework to build Vagrant boxes for our projects' development envir Build the current box with: ``` -$> make drupalbox +make drupalbox ``` Test the current box with: ``` -$> cd dev -$> vagrant up +cd dev +vagrant up ``` ## Development Requirements diff --git a/docs/Development-Workflow.md b/docs/Development-Workflow.md index 466ebdb..5fc520f 100644 --- a/docs/Development-Workflow.md +++ b/docs/Development-Workflow.md @@ -15,4 +15,42 @@ vagrant reload --provision-with test # Rebuild the box from scratch vagrant destroy vagrant up -``` \ No newline at end of file +``` + +There are a few things that are different between running the provisioning against a vagrant box and running the provisioning as part of the Packer workflow. The full Packer workflow can be run with Make: + +``` +make drupalbox +``` + +If this is successful, you can dd the resulting box to your local list of Vagrant boxes: + +``` +vagrant box add --name=test-drupalbox drupalbox_virtualbox.box +``` + +To spin up a Vagrant environment using this box: + +1. `cd` to the directory where you want to use the box (either an existing project, or a new, empty directory) +2. If you've run Vagrant here before, destroy the existing environment: + + ``` + vagrant destroy + ``` +2. If there's an existing `Vagrantfile`, update these lines: + + ``` + box.vm.box = "test-drupalbox" + box.vm.box_version = "*" + ``` +3. Otherwise, create a new Vagrantfile: + + ``` + vagrant init test-drupalbox + ``` +4. Spin up the box and ssh in: + + ``` + vagrant up + vagrant ssh + ``` diff --git a/drupalbox/CHANGELOG-0.0.md b/drupalbox/CHANGELOG-0.0.md index e402aa0..ba6f2e6 100644 --- a/drupalbox/CHANGELOG-0.0.md +++ b/drupalbox/CHANGELOG-0.0.md @@ -10,6 +10,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Changed +- Updated from Solr 4.5.1 to Solr 7.7.2 + ## [1.4.0] - 2019-09-25 ### Fixed diff --git a/drupalbox/README.md b/drupalbox/README.md index e5916c5..12e0650 100644 --- a/drupalbox/README.md +++ b/drupalbox/README.md @@ -18,8 +18,8 @@ Mailhog's smtp service listens on port `1025`, and its http service listens on p ### Solr -This box runs Solr v4.5.1, to match one of the versions available on [Acquia](https://docs.acquia.com/article/how-test-custom-solr-schema-file-locally). +This box runs Solr v7.7, to match one of the versions available on [Acquia](https://docs.acquia.com/acquia-search/modules/move-to-solr7/). Note that there is no Solr 7 support for Drupal 7 at this time. -Solr is installed to `/opt/solr` with two default cores, `drupal7` and `drupal8`. Solr runs on port `8983`, and the web UI can be found at `http://yoursite.local:8983/solr`. +Solr is installed to `/opt/solr` with one default core, `drupal8`. Solr runs on port `8983`, and the web UI can be found at `http://yoursite.local:8983/solr`. The Solr service runs by default; when you're using [palantirnet/the-vagrant](https://github.com/palantirnet/the-vagrant), this can be managed in the `Vagrantfile`. diff --git a/drupalbox/drupalbox.yml b/drupalbox/drupalbox.yml index 78352e7..583f808 100644 --- a/drupalbox/drupalbox.yml +++ b/drupalbox/drupalbox.yml @@ -4,13 +4,6 @@ hostname: drupalbox php_xdebug_enabled: true php_ini_sendmail_path: "/usr/local/bin/mhsendmail" - solr_cores: - - name: drupal7 - module: search_api_solr-7.x-1.12 - subdir: solr-conf/4.x - - name: drupal8 - module: search_api_solr-8.x-1.2 - subdir: solr-conf/4.x vars_files: - vars/default/common.yml - vars/dev/mysql.yml @@ -28,7 +21,7 @@ rvm1_user: vagrant rvm1_install_path: /home/vagrant/.rvm rvm1_rubies: - - 'ruby-2.3.1' + - 'ruby-2.5.2' - { role: memcached } - { role: mailhog } - { @@ -37,7 +30,9 @@ } - { role: geerlingguy.solr, - solr_version: "4.5.1", + solr_version: "7.7.2", + solr_cores: ['example'], + solr_user: vagrant, become: yes } - { diff --git a/drupalbox/requirements.yml b/drupalbox/requirements.yml index a6cb691..1e529a9 100644 --- a/drupalbox/requirements.yml +++ b/drupalbox/requirements.yml @@ -1,10 +1,10 @@ --- - src: geerlingguy.java - version: 1.7.7 + version: 1.9.6 - src: geerlingguy.solr - version: 4.0.2 + version: 5.0.0 - src: rvm.ruby version: v2.1.2 diff --git a/drupalbox/tests/solr_spec.rb b/drupalbox/tests/solr_spec.rb index 33d7a92..b3a551c 100644 --- a/drupalbox/tests/solr_spec.rb +++ b/drupalbox/tests/solr_spec.rb @@ -4,10 +4,22 @@ it { should be_directory } end -describe file("/var/log/solr.log") do +describe file("/var/solr/data/example") do + it { should be_directory } +end + +describe file("/var/solr/data/drupal8") do + it { should be_directory } +end + +describe file("/var/solr/data/drupal7") do + it { should be_directory } +end + +describe file("/var/solr/logs/solr.log") do it { should be_file } - it { should be_owned_by 'solr' } - it { should be_grouped_into 'adm' } + it { should be_owned_by 'vagrant' } + it { should be_grouped_into 'vagrant' } end describe service('solr') do @@ -19,6 +31,6 @@ it { should be_listening } end -describe command('curl http://127.0.0.1:8983/solr/admin/info/system?wt=json') do - its(:stdout) { should match /"solr-spec-version":"4\.5\.1"/ } +describe command('curl http://127.0.0.1:8983/solr/admin/info/system') do + its(:stdout) { should match /"solr-spec-version":"7\.7\.2"/ } end diff --git a/provisioning/roles/duplicity/tasks/install.yml b/provisioning/roles/duplicity/tasks/install.yml index e02911f..501fe93 100644 --- a/provisioning/roles/duplicity/tasks/install.yml +++ b/provisioning/roles/duplicity/tasks/install.yml @@ -18,5 +18,5 @@ - duplicity - duply - python-boto - state: installed + state: present tags: duplicity diff --git a/provisioning/roles/mysql-server/tasks/main.yml b/provisioning/roles/mysql-server/tasks/main.yml index c6618e8..9447e03 100644 --- a/provisioning/roles/mysql-server/tasks/main.yml +++ b/provisioning/roles/mysql-server/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: MySQL | Install Server become: yes - apt: pkg=mysql-server state=installed + apt: pkg=mysql-server state=present tags: mysql-server - name: MySQL | Update my.cnf diff --git a/provisioning/roles/phantomjs/tasks/main.yml b/provisioning/roles/phantomjs/tasks/main.yml index b7b3298..665d061 100644 --- a/provisioning/roles/phantomjs/tasks/main.yml +++ b/provisioning/roles/phantomjs/tasks/main.yml @@ -2,14 +2,14 @@ - name: PhantomJS | Install firefox become: yes apt: pkg=iceweasel - state=installed + state=present update-cache=yes tags: phantomjs - name: PhantonJS | Install fontconfig become: yes apt: pkg=fontconfig - state=installed + state=present tags: phantonjs - name: PhantomJS | Create home directory diff --git a/provisioning/roles/solr-configuration/tasks/cores.yml b/provisioning/roles/solr-configuration/tasks/cores.yml deleted file mode 100644 index 8d4ca79..0000000 --- a/provisioning/roles/solr-configuration/tasks/cores.yml +++ /dev/null @@ -1,51 +0,0 @@ ---- - -- name: Solr | Create core directories - file: - path: "/var/solr/{{ item.name }}" - state: directory - owner: solr - group: solr - with_items: "{{ solr_cores }}" - -- name: Solr | Create data directories - file: - path: "/var/solr/{{ item.name }}/data" - state: directory - owner: solr - group: solr - with_items: "{{ solr_cores }}" - -- name: Solr | Create core.properties - template: - src: core.properties.j2 - dest: "/var/solr/{{ item.name }}/core.properties" - owner: solr - group: solr - with_items: "{{ solr_cores }}" - -- name: Solr | Download Drupal Solr configuration - get_url: - url: "https://ftp.drupal.org/files/projects/{{ item.module }}.tar.gz" - dest: "/var/solr/{{ item.name }}/{{ item.module }}.tar.gz" - with_items: "{{ solr_cores }}" - -- name: Solr | Unarchive Drupal Solr configuration - unarchive: - remote_src: yes - src: "/var/solr/{{ item.name }}/{{ item.module }}.tar.gz" - dest: "/var/solr/{{ item.name }}/" - with_items: "{{ solr_cores }}" - -- name: Solr | Copy Drupal Solr conf directory into place - command: "cp -r /var/solr/{{ item.name }}/search_api_solr/{{ item.subdir }} /var/solr/{{ item.name }}/conf" - with_items: "{{ solr_cores }}" - -- name: Solr | Chmod Solr conf directory - file: - path: "/var/solr/{{ item.name }}/conf" - state: directory - owner: solr - group: solr - recurse: yes - with_items: "{{ solr_cores }}" diff --git a/provisioning/roles/solr-configuration/tasks/main.yml b/provisioning/roles/solr-configuration/tasks/main.yml index bffcb93..5c536a8 100644 --- a/provisioning/roles/solr-configuration/tasks/main.yml +++ b/provisioning/roles/solr-configuration/tasks/main.yml @@ -1,30 +1,21 @@ --- -- name: Solr Cleanup | Replace systemd script for Solr 4 - template: - src: solr4.unit.j2 - dest: /etc/systemd/system/solr.service - owner: root - group: root - mode: 0755 -- name: Solr Cleanup | Fix log permissions - file: - path: /var/log/solr.log - owner: solr - group: adm +- name: Solr Configuration | Copy Solr config + copy: + src: templates/ + dest: /tmp/ -- name: Solr Cleanup | Reload daemon - shell: systemctl daemon-reload +- name: Solr Configuration | Install 'drupal8' Solr core + command: + cmd: /opt/solr/bin/solr create_core -c drupal8 -d /tmp/solr_7.x_config-drupal8 + creates: /var/solr/data/drupal8 + become: yes + become_user: vagrant -- name: Solr Cleanup | Restart Solr - service: - name: solr - state: restarted - enabled: no - -- name: Solr Cleanup | Enable Solr start on boot - service: - name: solr - enabled: yes - -- include: cores.yml +# Drupal 7 support requires different Lucene configuration. +- name: Solr Configuration | Install 'drupal7' Solr core + command: + cmd: /opt/solr/bin/solr create_core -c drupal7 -d /tmp/solr_7.x_config-drupal7 + creates: /var/solr/data/drupal7 + become: yes + become_user: vagrant diff --git a/provisioning/roles/solr-configuration/templates/core.properties.j2 b/provisioning/roles/solr-configuration/templates/core.properties.j2 deleted file mode 100644 index 256498e..0000000 --- a/provisioning/roles/solr-configuration/templates/core.properties.j2 +++ /dev/null @@ -1 +0,0 @@ -name={{ item.name }} diff --git a/provisioning/roles/solr-configuration/templates/solr4.unit.j2 b/provisioning/roles/solr-configuration/templates/solr4.unit.j2 deleted file mode 100644 index 0a31279..0000000 --- a/provisioning/roles/solr-configuration/templates/solr4.unit.j2 +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Apache SOLR -After=syslog.target network.target remote-fs.target nss-lookup.target - -[Service] -Type=simple -WorkingDirectory=/opt/solr/example -ExecStart=/usr/bin/java -jar -Dsolr.solr.home=/var/solr -Djetty.host=0.0.0.0 -Djetty.port=8983 -Xms256M -Xmx512M start.jar -Restart=on-failure -User=solr - -[Install] -WantedBy=multi-user.target diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/accents_en.txt b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/accents_en.txt new file mode 100755 index 0000000..bed0514 --- /dev/null +++ b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/accents_en.txt @@ -0,0 +1,164 @@ +# À => A +"\u00C0" => "A" +# Á => A +"\u00C1" => "A" +#  => A +"\u00C2" => "A" +# à => A +"\u00C3" => "A" +# Ä => A +"\u00C4" => "A" +# Å => A +"\u00C5" => "A" +# Ą => A +"\u0104" => "A" +# Æ => AE +"\u00C6" => "AE" +# Ç => C +"\u00C7" => "C" +# Ć => C +"\U0106" => "C" +# È => E +"\u00C8" => "E" +# É => E +"\u00C9" => "E" +# Ê => E +"\u00CA" => "E" +# Ë => E +"\u00CB" => "E" +# Ę => E +"\u0118" => "E" +# Ì => I +"\u00CC" => "I" +# Í => I +"\u00CD" => "I" +# Î => I +"\u00CE" => "I" +# Ï => I +"\u00CF" => "I" +# IJ => IJ +"\u0132" => "IJ" +# Ð => D +"\u00D0" => "D" +# Ł => L +"\u0141" => "L" +# Ñ => N +"\u00D1" => "N" +# Ń => N +"\u0143" => "N" +# Ò => O +"\u00D2" => "O" +# Ó => O +"\u00D3" => "O" +# Ô => O +"\u00D4" => "O" +# Õ => O +"\u00D5" => "O" +# Ö => O +"\u00D6" => "O" +# Ø => O +"\u00D8" => "O" +# Œ => OE +"\u0152" => "OE" +# Þ +"\u00DE" => "TH" +# Ù => U +"\u00D9" => "U" +# Ú => U +"\u00DA" => "U" +# Û => U +"\u00DB" => "U" +# Ü => U +"\u00DC" => "U" +# Ý => Y +"\u00DD" => "Y" +# Ÿ => Y +"\u0178" => "Y" +# à => a +"\u00E0" => "a" +# á => a +"\u00E1" => "a" +# â => a +"\u00E2" => "a" +# ã => a +"\u00E3" => "a" +# ä => a +"\u00E4" => "a" +# å => a +"\u00E5" => "a" +# æ => ae +"\u00E6" => "ae" +# ç => c +"\u00E7" => "c" +# è => e +"\u00E8" => "e" +# é => e +"\u00E9" => "e" +# ê => e +"\u00EA" => "e" +# ë => e +"\u00EB" => "e" +# ì => i +"\u00EC" => "i" +# í => i +"\u00ED" => "i" +# î => i +"\u00EE" => "i" +# ï => i +"\u00EF" => "i" +# ij => ij +"\u0133" => "ij" +# ð => d +"\u00F0" => "d" +# ñ => n +"\u00F1" => "n" +# ò => o +"\u00F2" => "o" +# ó => o +"\u00F3" => "o" +# ô => o +"\u00F4" => "o" +# õ => o +"\u00F5" => "o" +# ö => o +"\u00F6" => "o" +# ø => o +"\u00F8" => "o" +# œ => oe +"\u0153" => "oe" +# ß => ss +"\u00DF" => "ss" +# Ś => S +"\u015a" => "S" +# þ => th +"\u00FE" => "th" +# ù => u +"\u00F9" => "u" +# ú => u +"\u00FA" => "u" +# û => u +"\u00FB" => "u" +# ü => u +"\u00FC" => "u" +# ý => y +"\u00FD" => "y" +# ÿ => y +"\u00FF" => "y" +# Ź => Z +"\u0179" => "Z" +# Ż => Z +"\u017b" => "Z" +# ff => ff +"\uFB00" => "ff" +# fi => fi +"\uFB01" => "fi" +# fl => fl +"\uFB02" => "fl" +# ffi => ffi +"\uFB03" => "ffi" +# ffl => ffl +"\uFB04" => "ffl" +# ſt => st +"\uFB05" => "st" +# st => st +"\uFB06" => "st" diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/accents_und.txt b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/accents_und.txt new file mode 100755 index 0000000..7c883f8 --- /dev/null +++ b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/accents_und.txt @@ -0,0 +1,148 @@ +# À => A +"\u00C0" => "A" +# Á => A +"\u00C1" => "A" +#  => A +"\u00C2" => "A" +# à => A +"\u00C3" => "A" +# Ä => A +"\u00C4" => "A" +# Å => A +"\u00C5" => "A" +# Æ => AE +"\u00C6" => "AE" +# Ç => C +"\u00C7" => "C" +# È => E +"\u00C8" => "E" +# É => E +"\u00C9" => "E" +# Ê => E +"\u00CA" => "E" +# Ë => E +"\u00CB" => "E" +# Ì => I +"\u00CC" => "I" +# Í => I +"\u00CD" => "I" +# Î => I +"\u00CE" => "I" +# Ï => I +"\u00CF" => "I" +# IJ => IJ +"\u0132" => "IJ" +# Ð => D +"\u00D0" => "D" +# Ñ => N +"\u00D1" => "N" +# Ò => O +"\u00D2" => "O" +# Ó => O +"\u00D3" => "O" +# Ô => O +"\u00D4" => "O" +# Õ => O +"\u00D5" => "O" +# Ö => O +"\u00D6" => "O" +# Ø => O +"\u00D8" => "O" +# Œ => OE +"\u0152" => "OE" +# Þ +"\u00DE" => "TH" +# Ù => U +"\u00D9" => "U" +# Ú => U +"\u00DA" => "U" +# Û => U +"\u00DB" => "U" +# Ü => U +"\u00DC" => "U" +# Ý => Y +"\u00DD" => "Y" +# Ÿ => Y +"\u0178" => "Y" +# à => a +"\u00E0" => "a" +# á => a +"\u00E1" => "a" +# â => a +"\u00E2" => "a" +# ã => a +"\u00E3" => "a" +# ä => a +"\u00E4" => "a" +# å => a +"\u00E5" => "a" +# æ => ae +"\u00E6" => "ae" +# ç => c +"\u00E7" => "c" +# è => e +"\u00E8" => "e" +# é => e +"\u00E9" => "e" +# ê => e +"\u00EA" => "e" +# ë => e +"\u00EB" => "e" +# ì => i +"\u00EC" => "i" +# í => i +"\u00ED" => "i" +# î => i +"\u00EE" => "i" +# ï => i +"\u00EF" => "i" +# ij => ij +"\u0133" => "ij" +# ð => d +"\u00F0" => "d" +# ñ => n +"\u00F1" => "n" +# ò => o +"\u00F2" => "o" +# ó => o +"\u00F3" => "o" +# ô => o +"\u00F4" => "o" +# õ => o +"\u00F5" => "o" +# ö => o +"\u00F6" => "o" +# ø => o +"\u00F8" => "o" +# œ => oe +"\u0153" => "oe" +# ß => ss +"\u00DF" => "ss" +# þ => th +"\u00FE" => "th" +# ù => u +"\u00F9" => "u" +# ú => u +"\u00FA" => "u" +# û => u +"\u00FB" => "u" +# ü => u +"\u00FC" => "u" +# ý => y +"\u00FD" => "y" +# ÿ => y +"\u00FF" => "y" +# ff => ff +"\uFB00" => "ff" +# fi => fi +"\uFB01" => "fi" +# fl => fl +"\uFB02" => "fl" +# ffi => ffi +"\uFB03" => "ffi" +# ffl => ffl +"\uFB04" => "ffl" +# ſt => st +"\uFB05" => "st" +# st => st +"\uFB06" => "st" diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/elevate.xml b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/elevate.xml new file mode 100755 index 0000000..193a0e7 --- /dev/null +++ b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/elevate.xml @@ -0,0 +1,27 @@ + + + + + + + + + + diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/protwords_en.txt b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/protwords_en.txt new file mode 100755 index 0000000..e69de29 diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/protwords_und.txt b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/protwords_und.txt new file mode 100755 index 0000000..e69de29 diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/schema.xml b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/schema.xml new file mode 100755 index 0000000..b643a91 --- /dev/null +++ b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/schema.xml @@ -0,0 +1,474 @@ + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + &extrafields; + + + &extratypes; + + + id + + + + + diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/schema_extra_fields.xml b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/schema_extra_fields.xml new file mode 100755 index 0000000..f5d7418 --- /dev/null +++ b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/schema_extra_fields.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/schema_extra_types.xml b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/schema_extra_types.xml new file mode 100755 index 0000000..8b5e82f --- /dev/null +++ b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/schema_extra_types.xml @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/solrconfig.xml b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/solrconfig.xml new file mode 100755 index 0000000..c61c337 --- /dev/null +++ b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/solrconfig.xml @@ -0,0 +1,813 @@ + + + + + + +]> + + + + + + + ${solr.abortOnConfigurationError:true} + + + + + 6.0 + + + + + + + + + + + + + + + + + + + + + ${solr.data.dir:} + + + + + + + + + ${solr.hdfs.home:} + + ${solr.hdfs.confdir:} + + ${solr.hdfs.blockcache.enabled:true} + + ${solr.hdfs.blockcache.global:true} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${solr.lock.type:native} + + + + + + + + + + + + + true + + + &index; + + + + + + + + + ${solr.ulog.dir:} + + + + + ${solr.autoCommit.MaxDocs:-1} + ${solr.autoCommit.MaxTime:15000} + false + + + + + + ${solr.autoSoftCommit.MaxDocs:-1} + ${solr.autoSoftCommit.MaxTime:-1} + + + + + + + + + + + + + + + + &query; + + + + + + + + + + + + static firstSearcher warming in solrconfig.xml + + + + + + false + + + + + + + + + &requestdispatcher; + + + + + + + &extra; + + + + + + + + + 100 + + + + + + + + 70 + + 0.5 + + [-\w ,/\n\"']{20,200} + + + + + + + ]]> + ]]> + + + + + + + + + + + + + + + + + + + + + + + + ,, + ,, + ,, + ,, + ,]]> + ]]> + + + + + + 10 + .,!? + + + + + + + WORD + + + en + US + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + + + + + + + + + + + + + + + diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/solrconfig_extra.xml b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/solrconfig_extra.xml new file mode 100755 index 0000000..1a59c45 --- /dev/null +++ b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/solrconfig_extra.xml @@ -0,0 +1,188 @@ + + + en + spellcheck_en + solr.DirectSolrSpellChecker + internal + 0.5 + 2 + 1 + 5 + 4 + 0.01 + .01 + true + + + + und + spellcheck_und + solr.DirectSolrSpellChecker + internal + 0.5 + 2 + 1 + 5 + 4 + 0.01 + .01 + true + + + + + en + AnalyzingInfixLookupFactory + DocumentDictionaryFactory + twm_suggest + text_en + sm_context_tags + true + false + + + + und + AnalyzingInfixLookupFactory + DocumentDictionaryFactory + twm_suggest + text_und + sm_context_tags + true + false + + + + + + false + false + false + true + false + 1 + false + 10 + + + terms + spellcheck + suggest + + + + + + + true + ignored_ + true + links + ignored_ + + + + + + + 1 + 1 + false + ${solr.mlt.timeAllowed:2000} + + + + + + + lucene + id + explicit + true + ${solr.selectSearchHandler.timeAllowed:-1} + false + + + spellcheck + elevator + + + + + + + id + und + on + false + false + 1 + 5 + 5 + true + true + 10 + 5 + + + spellcheck + + + + + + + true + und + 10 + + + suggest + + + + + + + id + true + + + tvComponent + + + + + + string + elevate.xml + + + diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/solrconfig_index.xml b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/solrconfig_index.xml new file mode 100755 index 0000000..e69de29 diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/solrconfig_query.xml b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/solrconfig_query.xml new file mode 100755 index 0000000..5bdd696 --- /dev/null +++ b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/solrconfig_query.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + true + + false + + 20 + 200 + 1024 diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/solrconfig_requestdispatcher.xml b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/solrconfig_requestdispatcher.xml new file mode 100755 index 0000000..3a3f17d --- /dev/null +++ b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/solrconfig_requestdispatcher.xml @@ -0,0 +1,6 @@ + + + diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/solrcore.properties b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/solrcore.properties new file mode 100755 index 0000000..e7fa32e --- /dev/null +++ b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/solrcore.properties @@ -0,0 +1,14 @@ +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,schema_extra_types.xml,schema_extra_fields.xml,elevate.xml,stopwords_en.txt,synonyms_en.txt,protwords_en.txt,accents_en.txt,stopwords_und.txt,synonyms_und.txt,protwords_und.txt,accents_und.txt +solr.mlt.timeAllowed=2000 +solr.luceneMatchVersion=7.0 +solr.selectSearchHandler.timeAllowed=-1 +solr.autoCommit.MaxDocs=-1 +solr.autoCommit.MaxTime=15000 +solr.autoSoftCommit.MaxDocs=-1 +solr.autoSoftCommit.MaxTime=-1 +# Do not set install.dir. https://www.drupal.org/project/search_api_solr/issues/3015993 +#solr.install.dir=../../.. diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/stopwords_en.txt b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/stopwords_en.txt new file mode 100755 index 0000000..6981050 --- /dev/null +++ b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/stopwords_en.txt @@ -0,0 +1,35 @@ +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/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/stopwords_und.txt b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/stopwords_und.txt new file mode 100755 index 0000000..e69de29 diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/synonyms_en.txt b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/synonyms_en.txt new file mode 100755 index 0000000..91689ff --- /dev/null +++ b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/synonyms_en.txt @@ -0,0 +1 @@ +drupal, durpal diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/synonyms_und.txt b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/synonyms_und.txt new file mode 100755 index 0000000..91689ff --- /dev/null +++ b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal7/synonyms_und.txt @@ -0,0 +1 @@ +drupal, durpal diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/accents_en.txt b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/accents_en.txt new file mode 100755 index 0000000..bed0514 --- /dev/null +++ b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/accents_en.txt @@ -0,0 +1,164 @@ +# À => A +"\u00C0" => "A" +# Á => A +"\u00C1" => "A" +#  => A +"\u00C2" => "A" +# à => A +"\u00C3" => "A" +# Ä => A +"\u00C4" => "A" +# Å => A +"\u00C5" => "A" +# Ą => A +"\u0104" => "A" +# Æ => AE +"\u00C6" => "AE" +# Ç => C +"\u00C7" => "C" +# Ć => C +"\U0106" => "C" +# È => E +"\u00C8" => "E" +# É => E +"\u00C9" => "E" +# Ê => E +"\u00CA" => "E" +# Ë => E +"\u00CB" => "E" +# Ę => E +"\u0118" => "E" +# Ì => I +"\u00CC" => "I" +# Í => I +"\u00CD" => "I" +# Î => I +"\u00CE" => "I" +# Ï => I +"\u00CF" => "I" +# IJ => IJ +"\u0132" => "IJ" +# Ð => D +"\u00D0" => "D" +# Ł => L +"\u0141" => "L" +# Ñ => N +"\u00D1" => "N" +# Ń => N +"\u0143" => "N" +# Ò => O +"\u00D2" => "O" +# Ó => O +"\u00D3" => "O" +# Ô => O +"\u00D4" => "O" +# Õ => O +"\u00D5" => "O" +# Ö => O +"\u00D6" => "O" +# Ø => O +"\u00D8" => "O" +# Œ => OE +"\u0152" => "OE" +# Þ +"\u00DE" => "TH" +# Ù => U +"\u00D9" => "U" +# Ú => U +"\u00DA" => "U" +# Û => U +"\u00DB" => "U" +# Ü => U +"\u00DC" => "U" +# Ý => Y +"\u00DD" => "Y" +# Ÿ => Y +"\u0178" => "Y" +# à => a +"\u00E0" => "a" +# á => a +"\u00E1" => "a" +# â => a +"\u00E2" => "a" +# ã => a +"\u00E3" => "a" +# ä => a +"\u00E4" => "a" +# å => a +"\u00E5" => "a" +# æ => ae +"\u00E6" => "ae" +# ç => c +"\u00E7" => "c" +# è => e +"\u00E8" => "e" +# é => e +"\u00E9" => "e" +# ê => e +"\u00EA" => "e" +# ë => e +"\u00EB" => "e" +# ì => i +"\u00EC" => "i" +# í => i +"\u00ED" => "i" +# î => i +"\u00EE" => "i" +# ï => i +"\u00EF" => "i" +# ij => ij +"\u0133" => "ij" +# ð => d +"\u00F0" => "d" +# ñ => n +"\u00F1" => "n" +# ò => o +"\u00F2" => "o" +# ó => o +"\u00F3" => "o" +# ô => o +"\u00F4" => "o" +# õ => o +"\u00F5" => "o" +# ö => o +"\u00F6" => "o" +# ø => o +"\u00F8" => "o" +# œ => oe +"\u0153" => "oe" +# ß => ss +"\u00DF" => "ss" +# Ś => S +"\u015a" => "S" +# þ => th +"\u00FE" => "th" +# ù => u +"\u00F9" => "u" +# ú => u +"\u00FA" => "u" +# û => u +"\u00FB" => "u" +# ü => u +"\u00FC" => "u" +# ý => y +"\u00FD" => "y" +# ÿ => y +"\u00FF" => "y" +# Ź => Z +"\u0179" => "Z" +# Ż => Z +"\u017b" => "Z" +# ff => ff +"\uFB00" => "ff" +# fi => fi +"\uFB01" => "fi" +# fl => fl +"\uFB02" => "fl" +# ffi => ffi +"\uFB03" => "ffi" +# ffl => ffl +"\uFB04" => "ffl" +# ſt => st +"\uFB05" => "st" +# st => st +"\uFB06" => "st" diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/accents_und.txt b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/accents_und.txt new file mode 100755 index 0000000..7c883f8 --- /dev/null +++ b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/accents_und.txt @@ -0,0 +1,148 @@ +# À => A +"\u00C0" => "A" +# Á => A +"\u00C1" => "A" +#  => A +"\u00C2" => "A" +# à => A +"\u00C3" => "A" +# Ä => A +"\u00C4" => "A" +# Å => A +"\u00C5" => "A" +# Æ => AE +"\u00C6" => "AE" +# Ç => C +"\u00C7" => "C" +# È => E +"\u00C8" => "E" +# É => E +"\u00C9" => "E" +# Ê => E +"\u00CA" => "E" +# Ë => E +"\u00CB" => "E" +# Ì => I +"\u00CC" => "I" +# Í => I +"\u00CD" => "I" +# Î => I +"\u00CE" => "I" +# Ï => I +"\u00CF" => "I" +# IJ => IJ +"\u0132" => "IJ" +# Ð => D +"\u00D0" => "D" +# Ñ => N +"\u00D1" => "N" +# Ò => O +"\u00D2" => "O" +# Ó => O +"\u00D3" => "O" +# Ô => O +"\u00D4" => "O" +# Õ => O +"\u00D5" => "O" +# Ö => O +"\u00D6" => "O" +# Ø => O +"\u00D8" => "O" +# Œ => OE +"\u0152" => "OE" +# Þ +"\u00DE" => "TH" +# Ù => U +"\u00D9" => "U" +# Ú => U +"\u00DA" => "U" +# Û => U +"\u00DB" => "U" +# Ü => U +"\u00DC" => "U" +# Ý => Y +"\u00DD" => "Y" +# Ÿ => Y +"\u0178" => "Y" +# à => a +"\u00E0" => "a" +# á => a +"\u00E1" => "a" +# â => a +"\u00E2" => "a" +# ã => a +"\u00E3" => "a" +# ä => a +"\u00E4" => "a" +# å => a +"\u00E5" => "a" +# æ => ae +"\u00E6" => "ae" +# ç => c +"\u00E7" => "c" +# è => e +"\u00E8" => "e" +# é => e +"\u00E9" => "e" +# ê => e +"\u00EA" => "e" +# ë => e +"\u00EB" => "e" +# ì => i +"\u00EC" => "i" +# í => i +"\u00ED" => "i" +# î => i +"\u00EE" => "i" +# ï => i +"\u00EF" => "i" +# ij => ij +"\u0133" => "ij" +# ð => d +"\u00F0" => "d" +# ñ => n +"\u00F1" => "n" +# ò => o +"\u00F2" => "o" +# ó => o +"\u00F3" => "o" +# ô => o +"\u00F4" => "o" +# õ => o +"\u00F5" => "o" +# ö => o +"\u00F6" => "o" +# ø => o +"\u00F8" => "o" +# œ => oe +"\u0153" => "oe" +# ß => ss +"\u00DF" => "ss" +# þ => th +"\u00FE" => "th" +# ù => u +"\u00F9" => "u" +# ú => u +"\u00FA" => "u" +# û => u +"\u00FB" => "u" +# ü => u +"\u00FC" => "u" +# ý => y +"\u00FD" => "y" +# ÿ => y +"\u00FF" => "y" +# ff => ff +"\uFB00" => "ff" +# fi => fi +"\uFB01" => "fi" +# fl => fl +"\uFB02" => "fl" +# ffi => ffi +"\uFB03" => "ffi" +# ffl => ffl +"\uFB04" => "ffl" +# ſt => st +"\uFB05" => "st" +# st => st +"\uFB06" => "st" diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/elevate.xml b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/elevate.xml new file mode 100755 index 0000000..193a0e7 --- /dev/null +++ b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/elevate.xml @@ -0,0 +1,27 @@ + + + + + + + + + + diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/protwords_en.txt b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/protwords_en.txt new file mode 100755 index 0000000..e69de29 diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/protwords_und.txt b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/protwords_und.txt new file mode 100755 index 0000000..e69de29 diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/schema.xml b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/schema.xml new file mode 100755 index 0000000..b643a91 --- /dev/null +++ b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/schema.xml @@ -0,0 +1,474 @@ + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + &extrafields; + + + &extratypes; + + + id + + + + + diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/schema_extra_fields.xml b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/schema_extra_fields.xml new file mode 100755 index 0000000..f5d7418 --- /dev/null +++ b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/schema_extra_fields.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/schema_extra_types.xml b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/schema_extra_types.xml new file mode 100755 index 0000000..8b5e82f --- /dev/null +++ b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/schema_extra_types.xml @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/solrconfig.xml b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/solrconfig.xml new file mode 100755 index 0000000..1bd91f0 --- /dev/null +++ b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/solrconfig.xml @@ -0,0 +1,811 @@ + + + + + + +]> + + + + + + + ${solr.abortOnConfigurationError:true} + + + ${solr.luceneMatchVersion:LUCENE_70} + + + + + + + + + + + + + + + + + + + + + ${solr.data.dir:} + + + + + + + + + ${solr.hdfs.home:} + + ${solr.hdfs.confdir:} + + ${solr.hdfs.blockcache.enabled:true} + + ${solr.hdfs.blockcache.global:true} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${solr.lock.type:native} + + + + + + + + + + + + + true + + + &index; + + + + + + + + + ${solr.ulog.dir:} + + + + + ${solr.autoCommit.MaxDocs:-1} + ${solr.autoCommit.MaxTime:15000} + false + + + + + + ${solr.autoSoftCommit.MaxDocs:-1} + ${solr.autoSoftCommit.MaxTime:-1} + + + + + + + + + + + + + + + + &query; + + + + + + + + + + + + static firstSearcher warming in solrconfig.xml + + + + + + false + + + + + + + + + &requestdispatcher; + + + + + + + &extra; + + + + + + + + + 100 + + + + + + + + 70 + + 0.5 + + [-\w ,/\n\"']{20,200} + + + + + + + ]]> + ]]> + + + + + + + + + + + + + + + + + + + + + + + + ,, + ,, + ,, + ,, + ,]]> + ]]> + + + + + + 10 + .,!? + + + + + + + WORD + + + en + US + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + + + + + + + + + + + + + + + diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/solrconfig_extra.xml b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/solrconfig_extra.xml new file mode 100755 index 0000000..1a59c45 --- /dev/null +++ b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/solrconfig_extra.xml @@ -0,0 +1,188 @@ + + + en + spellcheck_en + solr.DirectSolrSpellChecker + internal + 0.5 + 2 + 1 + 5 + 4 + 0.01 + .01 + true + + + + und + spellcheck_und + solr.DirectSolrSpellChecker + internal + 0.5 + 2 + 1 + 5 + 4 + 0.01 + .01 + true + + + + + en + AnalyzingInfixLookupFactory + DocumentDictionaryFactory + twm_suggest + text_en + sm_context_tags + true + false + + + + und + AnalyzingInfixLookupFactory + DocumentDictionaryFactory + twm_suggest + text_und + sm_context_tags + true + false + + + + + + false + false + false + true + false + 1 + false + 10 + + + terms + spellcheck + suggest + + + + + + + true + ignored_ + true + links + ignored_ + + + + + + + 1 + 1 + false + ${solr.mlt.timeAllowed:2000} + + + + + + + lucene + id + explicit + true + ${solr.selectSearchHandler.timeAllowed:-1} + false + + + spellcheck + elevator + + + + + + + id + und + on + false + false + 1 + 5 + 5 + true + true + 10 + 5 + + + spellcheck + + + + + + + true + und + 10 + + + suggest + + + + + + + id + true + + + tvComponent + + + + + + string + elevate.xml + + + diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/solrconfig_index.xml b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/solrconfig_index.xml new file mode 100755 index 0000000..e69de29 diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/solrconfig_query.xml b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/solrconfig_query.xml new file mode 100755 index 0000000..5bdd696 --- /dev/null +++ b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/solrconfig_query.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + true + + false + + 20 + 200 + 1024 diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/solrconfig_requestdispatcher.xml b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/solrconfig_requestdispatcher.xml new file mode 100755 index 0000000..3a3f17d --- /dev/null +++ b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/solrconfig_requestdispatcher.xml @@ -0,0 +1,6 @@ + + + diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/solrcore.properties b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/solrcore.properties new file mode 100755 index 0000000..e7fa32e --- /dev/null +++ b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/solrcore.properties @@ -0,0 +1,14 @@ +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,schema_extra_types.xml,schema_extra_fields.xml,elevate.xml,stopwords_en.txt,synonyms_en.txt,protwords_en.txt,accents_en.txt,stopwords_und.txt,synonyms_und.txt,protwords_und.txt,accents_und.txt +solr.mlt.timeAllowed=2000 +solr.luceneMatchVersion=7.0 +solr.selectSearchHandler.timeAllowed=-1 +solr.autoCommit.MaxDocs=-1 +solr.autoCommit.MaxTime=15000 +solr.autoSoftCommit.MaxDocs=-1 +solr.autoSoftCommit.MaxTime=-1 +# Do not set install.dir. https://www.drupal.org/project/search_api_solr/issues/3015993 +#solr.install.dir=../../.. diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/stopwords_en.txt b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/stopwords_en.txt new file mode 100755 index 0000000..6981050 --- /dev/null +++ b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/stopwords_en.txt @@ -0,0 +1,35 @@ +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/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/stopwords_und.txt b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/stopwords_und.txt new file mode 100755 index 0000000..e69de29 diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/synonyms_en.txt b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/synonyms_en.txt new file mode 100755 index 0000000..91689ff --- /dev/null +++ b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/synonyms_en.txt @@ -0,0 +1 @@ +drupal, durpal diff --git a/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/synonyms_und.txt b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/synonyms_und.txt new file mode 100755 index 0000000..91689ff --- /dev/null +++ b/provisioning/roles/solr-configuration/templates/solr_7.x_config-drupal8/synonyms_und.txt @@ -0,0 +1 @@ +drupal, durpal diff --git a/provisioning/vars/default/rvm.yml b/provisioning/vars/default/rvm.yml index d2e0ab6..3d79098 100644 --- a/provisioning/vars/default/rvm.yml +++ b/provisioning/vars/default/rvm.yml @@ -1,2 +1,2 @@ rvm1_rubies: - - 'ruby-2.1.3' + - 'ruby-2.5.2' diff --git a/script/reboot.sh b/script/reboot.sh new file mode 100644 index 0000000..592bfca --- /dev/null +++ b/script/reboot.sh @@ -0,0 +1,7 @@ +#!/bin/bash -eux + +# probably this command is wrong +#sudo systemctl halt networking.service + +echo "Rebooting the machine..." +reboot diff --git a/script/serverspec.sh b/script/serverspec.sh index d8eab3d..65a592f 100644 --- a/script/serverspec.sh +++ b/script/serverspec.sh @@ -1,6 +1,14 @@ #!/bin/bash -export PATH="$PATH:/home/vagrant/.rvm/rubies/ruby-2.3.1/bin" -gem install bundler --no-ri --no-rdoc -cd /tmp/tests +# This script is run during the Packer build process. + +# Wherever the tests are expected to live. +tests_path="/tmp/tests" +specs_path="/tmp/tests/specs/*_spec.rb" + +# Load rvm into this session +[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" + +# Run serverspec +cd "$tests_path" bundle install --path=vendor -bundle exec rake spec +bundle exec rake spec["$specs_path"] diff --git a/tests/Rakefile b/tests/Rakefile index 544dbb1..cdb4aaf 100644 --- a/tests/Rakefile +++ b/tests/Rakefile @@ -1,6 +1,12 @@ require 'rake' require 'rspec/core/rake_task' -RSpec::Core::RakeTask.new(:spec) do |t| - t.pattern = '/tmp/tests/specs/*_spec.rb' +RSpec::Core::RakeTask.new(:spec, :spec_pattern) do |t, task_args| + if task_args[:spec_pattern].nil? || task_args[:spec_pattern].empty? + print " Missing spec file pattern. Run with:\r\n" + print " bundle exec rake spec[/path/to/*_spec.rb]\r\n" + exit + end + + t.pattern = task_args[:spec_pattern] end