buschjaeger - add solr to production

diff --git a/customer/buschjaeger/db01-buschjaeger-de.pixelpark.net.yaml b/customer/buschjaeger/db01-buschjaeger-de.pixelpark.net.yaml
index 2219f3ad155e4530896a9380eaad0c5229114005..02dea39c1874b5024d7774ffeee8cfb8aeaa5405 100644 (file)
--- a/customer/buschjaeger/db01-buschjaeger-de.pixelpark.net.yaml
+++ b/customer/buschjaeger/db01-buschjaeger-de.pixelpark.net.yaml
@@ -3,6 +3,9 @@ site::role: base
 site::additional_classes:
   - site::profile::mysql_server
   - logstash
+  - solr
+
+solr::host: search03-buschjaeger-de.pixelpark.net
 
 mysql::server::override_options:
   'mysqld':

diff --git a/customer/buschjaeger/db02-buschjaeger-de.pixelpark.net.yaml b/customer/buschjaeger/db02-buschjaeger-de.pixelpark.net.yaml
index c28c86047715694abd6c0d59f54051cec040b4f7..33331bdd7fd453356a848af7e85b7e9dd298e8f2 100644 (file)
--- a/customer/buschjaeger/db02-buschjaeger-de.pixelpark.net.yaml
+++ b/customer/buschjaeger/db02-buschjaeger-de.pixelpark.net.yaml
@@ -3,6 +3,9 @@ site::role: base
 site::additional_classes:
   - site::profile::mysql_server
   - logstash
+  - solr
+
+solr::host: search04-buschjaeger-de.pixelpark.net
 
 mysql::server::override_options:
   'mysqld':

diff --git a/customer/buschjaeger/production.yaml b/customer/buschjaeger/production.yaml
new file mode 100644 (file)
index 0000000..94d2ad7
--- /dev/null
+++ b/customer/buschjaeger/production.yaml
@@ -0,0 +1,10 @@
+---
+
+solr::version: 4.10.4
+solr::cloud: true
+solr::cloud_port: 9090
+solr::cloudmembers:
+   - search01-buschjaeger-de.pixelpark.net:9090
+   - search02-buschjaeger-de.pixelpark.net:9090
+   - search03-buschjaeger-de.pixelpark.net:9090
+   - search04-buschjaeger-de.pixelpark.net:9090
\ No newline at end of file

diff --git a/customer/buschjaeger/web01-buschjaeger-de.pixelpark.net.yaml b/customer/buschjaeger/web01-buschjaeger-de.pixelpark.net.yaml
index 4011049c17230c6b516c2529a00a96f2b2f42d12..4a571bffdcd60da10b2c305a88d9d9eee50c2c75 100644 (file)
--- a/customer/buschjaeger/web01-buschjaeger-de.pixelpark.net.yaml
+++ b/customer/buschjaeger/web01-buschjaeger-de.pixelpark.net.yaml
@@ -19,16 +19,54 @@ apache::default_vhost: false
 
 repo::remi_php70: true
 
-solr::version: 4.10.4
-solr::cloud: true
-solr::cloud_port: 9983
-solr::cloudmembers:
-   - search01-buschjaeger-de.pixelpark.net:9983
-   - search02-buschjaeger-de.pixelpark.net:9983
-   - search03-buschjaeger-de.pixelpark.net:9983
-   - search04-buschjaeger-de.pixelpark.net:9983
-
+solr::host: search01-buschjaeger-de.pixelpark.net
+# This is my bootstrap host
 solr::cores:
+  austrian:
+    protwords_src_file: /var/solr-typo3/typo3cores/austrian/conf/protwords.txt
+    schema_src_file: /var/solr-typo3/typo3cores/austrian/conf/schema.xml
+    solrconfig_src_file: /var/solr-typo3/typo3cores/austrian/conf/solrconfig.xml
+    synonyms_src_file: /var/solr-typo3/typo3cores/austrian/conf/synonyms.txt
+    other_files:
+      - /var/solr-typo3/typo3cores/austrian/conf/elevate.xml
+      - /var/solr-typo3/typo3cores/austrian/conf/general_schema_fields.xml
+      - /var/solr-typo3/typo3cores/austrian/conf/general_schema_types.xml
+      - /var/solr-typo3/typo3cores/austrian/conf/austrian-common-nouns.txt
+      - /var/solr-typo3/typo3cores/austrian/conf/_schema_analysis_stopwords_austrian.json
+      - /var/solr-typo3/typo3cores/austrian/conf/currency.xml
+  dutch:
+    protwords_src_file: /var/solr-typo3/typo3cores/dutch/conf/protwords.txt
+    schema_src_file: /var/solr-typo3/typo3cores/dutch/conf/schema.xml
+    solrconfig_src_file: /var/solr-typo3/typo3cores/dutch/conf/solrconfig.xml
+    synonyms_src_file: /var/solr-typo3/typo3cores/dutch/conf/synonyms.txt
+    other_files:
+      - /var/solr-typo3/typo3cores/dutch/conf/elevate.xml
+      - /var/solr-typo3/typo3cores/dutch/conf/general_schema_fields.xml
+      - /var/solr-typo3/typo3cores/dutch/conf/general_schema_types.xml
+      - /var/solr-typo3/typo3cores/dutch/conf/_schema_analysis_stopwords_dutch.json
+      - /var/solr-typo3/typo3cores/dutch/conf/currency.xml
+  english:
+    protwords_src_file: /var/solr-typo3/typo3cores/english/conf/protwords.txt
+    schema_src_file: /var/solr-typo3/typo3cores/english/conf/schema.xml
+    solrconfig_src_file: /var/solr-typo3/typo3cores/english/conf/solrconfig.xml
+    synonyms_src_file: /var/solr-typo3/typo3cores/english/conf/synonyms.txt
+    other_files:
+      - /var/solr-typo3/typo3cores/english/conf/elevate.xml
+      - /var/solr-typo3/typo3cores/english/conf/general_schema_fields.xml
+      - /var/solr-typo3/typo3cores/english/conf/general_schema_types.xml
+      - /var/solr-typo3/typo3cores/english/conf/_schema_analysis_stopwords_english.json
+      - /var/solr-typo3/typo3cores/english/conf/currency.xml
+  french:
+    protwords_src_file: /var/solr-typo3/typo3cores/french/conf/protwords.txt
+    schema_src_file: /var/solr-typo3/typo3cores/french/conf/schema.xml
+    solrconfig_src_file: /var/solr-typo3/typo3cores/french/conf/solrconfig.xml
+    synonyms_src_file: /var/solr-typo3/typo3cores/french/conf/synonyms.txt
+    other_files:
+      - /var/solr-typo3/typo3cores/french/conf/elevate.xml
+      - /var/solr-typo3/typo3cores/french/conf/general_schema_fields.xml
+      - /var/solr-typo3/typo3cores/french/conf/general_schema_types.xml
+      - /var/solr-typo3/typo3cores/french/conf/_schema_analysis_stopwords_french.json
+      - /var/solr-typo3/typo3cores/french/conf/currency.xml
   german:
     protwords_src_file: /var/solr-typo3/typo3cores/german/conf/protwords.txt
     schema_src_file: /var/solr-typo3/typo3cores/german/conf/schema.xml
@@ -41,18 +79,28 @@ solr::cores:
       - /var/solr-typo3/typo3cores/german/conf/german-common-nouns.txt
       - /var/solr-typo3/typo3cores/german/conf/_schema_analysis_stopwords_german.json
       - /var/solr-typo3/typo3cores/german/conf/currency.xml
-  austrian:
-    protwords_src_file: /var/solr-typo3/typo3cores/austrian/conf/protwords.txt
-    schema_src_file: /var/solr-typo3/typo3cores/austrian/conf/schema.xml
-    solrconfig_src_file: /var/solr-typo3/typo3cores/austrian/conf/solrconfig.xml
-    synonyms_src_file: /var/solr-typo3/typo3cores/austrian/conf/synonyms.txt
+  polish:
+    protwords_src_file: /var/solr-typo3/typo3cores/polish/conf/protwords.txt
+    schema_src_file: /var/solr-typo3/typo3cores/polish/conf/schema.xml
+    solrconfig_src_file: /var/solr-typo3/typo3cores/polish/conf/solrconfig.xml
+    synonyms_src_file: /var/solr-typo3/typo3cores/polish/conf/synonyms.txt
     other_files:
-      - /var/solr-typo3/typo3cores/austrian/conf/elevate.xml
-      - /var/solr-typo3/typo3cores/austrian/conf/general_schema_fields.xml
-      - /var/solr-typo3/typo3cores/austrian/conf/general_schema_types.xml
-      - /var/solr-typo3/typo3cores/austrian/conf/austrian-common-nouns.txt
-      - /var/solr-typo3/typo3cores/austrian/conf/_schema_analysis_stopwords_austrian.json
-      - /var/solr-typo3/typo3cores/austrian/conf/currency.xml
+      - /var/solr-typo3/typo3cores/polish/conf/elevate.xml
+      - /var/solr-typo3/typo3cores/polish/conf/general_schema_fields.xml
+      - /var/solr-typo3/typo3cores/polish/conf/general_schema_types.xml
+      - /var/solr-typo3/typo3cores/polish/conf/_schema_analysis_stopwords_polish.json
+      - /var/solr-typo3/typo3cores/polish/conf/currency.xml
+  russian:
+    protwords_src_file: /var/solr-typo3/typo3cores/russian/conf/protwords.txt
+    schema_src_file: /var/solr-typo3/typo3cores/russian/conf/schema.xml
+    solrconfig_src_file: /var/solr-typo3/typo3cores/russian/conf/solrconfig.xml
+    synonyms_src_file: /var/solr-typo3/typo3cores/russian/conf/synonyms.txt
+    other_files:
+      - /var/solr-typo3/typo3cores/russian/conf/elevate.xml
+      - /var/solr-typo3/typo3cores/russian/conf/general_schema_fields.xml
+      - /var/solr-typo3/typo3cores/russian/conf/general_schema_types.xml
+      - /var/solr-typo3/typo3cores/russian/conf/_schema_analysis_stopwords_russian.json
+      - /var/solr-typo3/typo3cores/russian/conf/currency.xml
 
 site::profile::apache::htdigest:
   server:

diff --git a/customer/buschjaeger/web02-buschjaeger-de.pixelpark.net.yaml b/customer/buschjaeger/web02-buschjaeger-de.pixelpark.net.yaml
index 17c207633c31e9e2aaab2234366af8fbbc2d8cf5..05162182180a0315425ad5411c2520fbe66e1f95 100644 (file)
--- a/customer/buschjaeger/web02-buschjaeger-de.pixelpark.net.yaml
+++ b/customer/buschjaeger/web02-buschjaeger-de.pixelpark.net.yaml
@@ -3,6 +3,7 @@ site::role: base
 site::additional_classes:
   - site::profile::typo3
   - apache::mod::headers
+  - solr
 
 accounts::users:
   jenkins:
@@ -14,6 +15,8 @@ accounts::users:
   heiko.hardt:
     apply: true
 
+solr::host: search02-buschjaeger-de.pixelpark.net
+
 apache::default_vhost: false
 
 repo::remi_php70: true