bmf-datacenter - Add Solr with Puppet

diff --git a/customer/bmf-datacenter/common.yaml b/customer/bmf-datacenter/common.yaml
index 7f5d74eb4d4d21b7016d8ad82212af7c1a63b079..535214411915d3614f37f9c3689d6074364cbe5e 100644 (file)
--- a/customer/bmf-datacenter/common.yaml
+++ b/customer/bmf-datacenter/common.yaml
@@ -34,9 +34,7 @@ infra::role: base
 infra::additional_classes:
   - infra::profile::typo3
   - infra::profile::mysql_server
-# - infra::profile::wordpress
-  - apache::mod::headers
-  - logstash
+  - solr
 
 repo::remi_php56: true
 apache::default_vhost: false

diff --git a/customer/bmf-datacenter/production.yaml b/customer/bmf-datacenter/production.yaml
index 57f09f593757e6e3908b55ac6d9b49d5e44fc3b8..3ee4f76db2e6e7c5f4ae78c596f58f0170c52cd8 100644 (file)
--- a/customer/bmf-datacenter/production.yaml
+++ b/customer/bmf-datacenter/production.yaml
@@ -115,37 +115,18 @@ infra::profile::typo3::projects:
       memory_limit: 256M
       always_populate_raw_post_data: -1
 
-#infra::profile::wordpress::manage_php: false
-#infra::profile::wordpress::projects:
-#  so-klingt-europa-de:
-#    docroot: '/var/www/so-klingt-europa-de'
-#    servername: www-so-klingt-europa-de.pixelpark.net
-#    serveraliases:
-#      - so-klingt-europa.de
-#      - www.so-klingt-europa.de
-#      - sound-of-europe.de
-#      - www.sound-of-europe.de
-#      - sound-of-europe.net
-#      - www.sound-of-europe.net
-#      - sound-of-europe.org
-#      - www.sound-of-europe.org
-#    rewrites:
-#      - alias:
-#        comment: 'Weiterleitung so-klingt-europa international'
-#        rewrite_cond:
-#          - '%%{ich-trickse}{HTTP_HOST} ^(www\.)?sound-of-europe\.(de|net|org)$ [NC]'
-#        rewrite_rule:
-#          - '^(.*)$ http://www.so-klingt-europa.de/en$1 [L,R=301]'
-#      - alias:
-#        comment: 'Weiterleitung /anmeldung'
-#       rewrite_rule:
-#          - '^/anmeldung$ https://registration.bundesfinanzministerium.de/eventview/?p=zbb011b8fee0f0ebfc84485d584922b66$1 [NC,L,R=301]'
-# JIRA (BMFSUP-881)
-#        rewrite_rule:
-#          - '^/anmeldung$ / [NC,L,R=302]'
-#    ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
-#    ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
-#    ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
-#    access_log_format: urchinpp_xf4
-#    php_admin_value:
-#      memory_limit: 256M
+solr::version: 6.3.0
+solr::port: 8983
+solr::cores:
+  german:
+    currency_src_file: /var/solr-typo3/typo3cores/german/conf/currency.xml
+    protwords_src_file: /var/solr-typo3/typo3cores/german/conf/protwords.txt
+    schema_src_file: /var/solr-typo3/typo3cores/german/conf/schema.xml
+    solrconfig_src_file: /var/solr-typo3/typo3cores/german/conf/solrconfig.xml
+    synonyms_src_file: /var/solr-typo3/typo3cores/german/conf/synonyms.txt
+    other_files:
+      - /var/solr-typo3/typo3cores/german/conf/elevate.xml
+      - /var/solr-typo3/typo3cores/german/conf/general_schema_fields.xml
+      - /var/solr-typo3/typo3cores/german/conf/general_schema_types.xml
+      - /var/solr-typo3/typo3cores/german/conf/german-common-nouns.txt
+      - /var/solr-typo3/typo3cores/german/conf/_schema_analysis_stopwords_german.json