Skip to content

Commit

Permalink
Merge pull request #22 from palantirnet/drupalbox/solr
Browse files Browse the repository at this point in the history
Solr
  • Loading branch information
mathewpeterson authored Aug 9, 2016
2 parents 89e95dd + f100245 commit c9910cd
Show file tree
Hide file tree
Showing 17 changed files with 413 additions and 2 deletions.
2 changes: 2 additions & 0 deletions drupalbox/CHANGELOG-0.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ This project adheres to [Semantic Versioning](http://semver.org/).

- Memcached role
- Mailhog role
- Jetty role
- Solr role
6 changes: 6 additions & 0 deletions drupalbox/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,9 @@
### Mailhog

Mailhog's smtp service listens on port 1025 and http service listens on port 8025

### Solr

Solr is installed but disabled by default. It's installed to `/usr/share/solr/current`.

In order to use it, you must install a Solr "core" to `/usr/share/solr/current/core/` and update the `/usr/share/solr/current/solr.xml` file with the new core. You must enable/start Jetty.
2 changes: 1 addition & 1 deletion drupalbox/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Vagrant.configure("2") do |config|
vb.customize ["modifyvm", :id, "--memory", 1024]
end

# config.vm.provision :ansible do |ansible|
# config.vm.provision "ansible", type: :ansible do |ansible|
# ansible.playbook = "drupalbox.yml"
# ansible.groups = {
# "drupalbox" => "default",
Expand Down
6 changes: 5 additions & 1 deletion drupalbox/drupalbox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
hostname: drupalbox
rvm1_user: vagrant
rvm1_install_path: /home/vagrant/.rvm
vars:
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: []
vars_files:
- vars/default/common.yml
- vars/dev/mysql.yml
Expand All @@ -19,6 +21,8 @@
- { role: rvm_io.rvm1-ruby, tags: ruby, sudo: true }
- { role: memcached }
- { role: mailhog }
- { role: jetty }
- { role: solr }
- { role: apache }
- { role: mysql-client }
- { role: mysql-server }
Expand Down
18 changes: 18 additions & 0 deletions drupalbox/tests/jetty_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
require_relative 'spec_helper'

describe user('jetty') do
it { should exist }
it { should belong_to_primary_group 'jetty' }
end

describe package('jetty') do
it { should be_installed }
end

describe package('libjetty-extra') do
it { should be_installed }
end

describe service('jetty') do
it { should_not be_enabled }
end
13 changes: 13 additions & 0 deletions drupalbox/tests/solr_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
require_relative 'spec_helper.rb'

describe file("/usr/share/solr") do
it { should be_directory }
end

describe file("/usr/share/solr/current") do
it { should be_symlink }
end

describe file("/var/lib/jetty/webapps/solr") do
it { should be_symlink }
end
24 changes: 24 additions & 0 deletions provisioning/roles/jetty/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
jetty_packages:
- jetty
- libjetty-extra

jetty_server_enabled: true

jetty_server_host: 0.0.0.0
jetty_server_port: 8983
jetty_server_no_start: 0
jetty_server_args: ""
jetty_server_java_options: "-Xmx256m -Djava.awt.headless=true"

jetty_app_user: jetty
jetty_app_group: jetty
jetty_app_home: /usr/share/jetty
jetty_app_config_dir: /etc/jetty
jetty_app_default_dir: /etc/default
jetty_app_log_dir: /var/log/jetty
jetty_app_tmp_dir: /var/cache/jetty/data
jetty_app_context_dir: /etc/jetty/contexts
jetty_app_webapp_dir: /var/lib/jetty/webapps

java_home_dir: /usr/lib/jvm/default-java
7 changes: 7 additions & 0 deletions provisioning/roles/jetty/handlers/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
- name: Jetty | Restart jetty
become: yes
service:
name: jetty
state: restarted
tags: jetty
62 changes: 62 additions & 0 deletions provisioning/roles/jetty/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
---
- name: Jetty | Add jetty group
become: yes
group:
name: "{{ jetty_app_group }}"
state: present
tags: jetty

- name: Jetty | Add jetty user
become: yes
user:
name: "{{ jetty_app_user }}"
group: "{{ jetty_app_group }}"
home: "{{ jetty_app_home }}"
tags: jetty

- name: Jetty | Install Jetty
become: yes
apt:
pkg: "{{ item }}"
state: installed
update_cache: yes
with_items: "{{ jetty_packages }}"
tags: jetty

- name: Jetty | Generate Jetty default config
become: yes
template:
src: default_jetty.j2
dest: "{{ jetty_app_default_dir }}/jetty"
owner: "{{ jetty_app_user }}"
group: "{{ jetty_app_group }}"
mode: 0644
tags: jetty

- name: Jetty | Generate jetty.xml
become: yes
template:
src: jetty.xml.j2
dest: "{{ jetty_app_config_dir }}/jetty.xml"
owner: "{{ jetty_app_user }}"
group: "{{ jetty_app_group }}"
mode: 0644
tags: jetty

- name: Jetty | Enable Jetty Service
become: yes
service:
name: jetty
state: restarted
enabled: yes
when: jetty_server_enabled == True
tags: jetty

- name: Jetty | Disable Jetty Service
become: yes
service:
name: jetty
state: stopped
enabled: no
when: jetty_server_enabled != True
tags: jetty
14 changes: 14 additions & 0 deletions provisioning/roles/jetty/templates/default_jetty.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Defaults for jetty see /etc/init.d/jetty for more
#
# {{ ansible_managed }}

NO_START={{ jetty_server_no_start }}
VERBOSE=yes
JETTY_USER={{ jetty_app_user }}
JETTY_HOST={{ jetty_server_host }}
JETTY_PORT={{ jetty_server_port }}
JETTY_LOGS={{ jetty_app_log_dir }}
JETTY_ARGS={{ jetty_server_args }}
JAVA_OPTIONS="{{ jetty_server_java_options }}"
JAVA_HOME={{ java_home_dir }}
JETTY_TMP={{ jetty_app_tmp_dir }}
108 changes: 108 additions & 0 deletions provisioning/roles/jetty/templates/jetty.xml.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
<?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
<Configure id="Server" class="org.mortbay.jetty.Server">
<Set name="ThreadPool">

<New class="org.mortbay.thread.QueuedThreadPool">
<Set name="minThreads">10</Set>
<Set name="maxThreads">200</Set>
<Set name="lowThreads">20</Set>
<Set name="SpawnOrShrinkAt">2</Set>
</New>

<!-- Optional Java 5 bounded threadpool with job queue
<New class="org.mortbay.thread.concurrent.ThreadPool">
<Set name="corePoolSize">50</Set>
<Set name="maximumPoolSize">50</Set>
</New>
-->
</Set>

<Call name="addConnector">
<Arg>
<New class="org.mortbay.jetty.nio.SelectChannelConnector">
<Set name="host"><SystemProperty name="jetty.host" /></Set>
<Set name="port"><SystemProperty name="jetty.port" default="{{ jetty_server_port }}"/></Set>
<Set name="maxIdleTime">60000</Set>
<Set name="Acceptors">2</Set>
<Set name="statsOn">false</Set>
<Set name="confidentialPort">8443</Set>
<Set name="lowResourcesConnections">5000</Set>
<Set name="lowResourcesMaxIdleTime">5000</Set>
</New>
</Arg>
</Call>

<Set name="handler">
<New id="Handlers" class="org.mortbay.jetty.handler.HandlerCollection">
<Set name="handlers">
<Array type="org.mortbay.jetty.Handler">
<Item>
<New id="Contexts" class="org.mortbay.jetty.handler.ContextHandlerCollection"/>
</Item>
<Item>
<New id="DefaultHandler" class="org.mortbay.jetty.handler.DefaultHandler"/>
</Item>
<Item>
<New id="RequestLog" class="org.mortbay.jetty.handler.RequestLogHandler"/>
</Item>
</Array>
</Set>
</New>
</Set>

<Call name="addLifeCycle">
<Arg>
<New class="org.mortbay.jetty.deployer.ContextDeployer">
<Set name="contexts"><Ref id="Contexts"/></Set>
<Set name="configurationDir"><SystemProperty name="jetty.home" default="."/>/contexts</Set>
<Set name="scanInterval">5</Set>
</New>
</Arg>
</Call>

<Call name="addLifeCycle">
<Arg>
<New class="org.mortbay.jetty.deployer.WebAppDeployer">
<Set name="contexts"><Ref id="Contexts"/></Set>
<Set name="webAppDir"><SystemProperty name="jetty.home" default="."/>/webapps</Set>
<Set name="parentLoaderPriority">false</Set>
<Set name="extract">true</Set>
<Set name="allowDuplicates">false</Set>
<Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Set>
</New>
</Arg>
</Call>

<Set name="UserRealms">
<Array type="org.mortbay.jetty.security.UserRealm">
<Item>
<New class="org.mortbay.jetty.security.HashUserRealm">
<Set name="name">Test Realm</Set>
<Set name="config"><SystemProperty name="jetty.home" default="."/>/etc/realm.properties</Set>
<Set name="refreshInterval">0</Set>
</New>
</Item>
</Array>
</Set>

<Ref id="RequestLog">
<Set name="requestLog">
<New id="RequestLogImpl" class="org.mortbay.jetty.NCSARequestLog">
<Set name="filename"><SystemProperty name="jetty.logs" default="./logs"/>/yyyy_mm_dd.request.log</Set>
<Set name="filenameDateFormat">yyyy_MM_dd</Set>
<Set name="retainDays">90</Set>
<Set name="append">true</Set>
<Set name="extended">false</Set>
<Set name="logCookies">false</Set>
<Set name="LogTimeZone">GMT</Set>
</New>
</Set>
</Ref>

<Set name="stopAtShutdown">true</Set>
<Set name="sendServerVersion">true</Set>
<Set name="sendDateHeader">true</Set>
<Set name="gracefulShutdown">1000</Set>

</Configure>
24 changes: 24 additions & 0 deletions provisioning/roles/solr/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
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"

solr_app_name: solr

solr_root_src_dir: /usr/local/src/solr
solr_root_dir: /usr/share/solr
solr_home_dir: "{{ solr_root_dir }}/{{ solr_version }}"
solr_data_dir: /var/lib/solr

solr_version_dir: solr-{{ solr_version }}
solr_version_war: solr-{{ solr_version }}
solr_version_file: "{{ solr_version_dir }}.tgz"
solr_version_src_dir: "{{ solr_root_src_dir }}/{{ solr_version_dir }}"

solr_app_user: jetty
solr_app_group: jetty

solr_cores: []
31 changes: 31 additions & 0 deletions provisioning/roles/solr/tasks/cores.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
---

- name: Solr | Copy cores
become: yes
copy:
src: "cores/{{ item }}"
dest: "{{ solr_home_dir }}/cores"
owner: "{{ solr_app_user }}"
group: "{{ solr_app_group }}"
with_items: "{{ solr_cores }}"
tags: solr

- name: Solr | Create Data Directories
become: yes
file:
path: "{{ solr_data_dir }}/{{ item }}/data"
owner: "{{ solr_app_user }}"
group: "{{ solr_app_group }}"
recurse: true
state: directory
with_items: "{{ solr_cores }}"
tags: solr

- name: Solr | Generate solr.xml
become: yes
template:
src: solr.xml.j2
dest: "{{ solr_home_dir }}/solr.xml"
owner: "{{ solr_app_user }}"
group: "{{ solr_app_group }}"
tags: solr
22 changes: 22 additions & 0 deletions provisioning/roles/solr/tasks/init.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---

- name: Solr | Create Solr Directories
become: yes
file:
path: "{{ item }}"
state: directory
owner: "{{ solr_app_user }}"
group: "{{ solr_app_group }}"
with_items:
- "{{ solr_root_src_dir }}"
- "{{ solr_home_dir }}"
- "{{ solr_data_dir }}"
- "{{ solr_home_dir }}/cores"
tags: solr

- name: Solr | Check download exists
become: yes
stat:
path: "{{ solr_root_src_dir }}/{{ solr_version_file }}"
register: solr_src_file_exists
tags: solr
Loading

0 comments on commit c9910cd

Please sign in to comment.