bmwi - install solr 6.3 on prod

diff --git a/customer/bmwi-gruenderwoche/common.yaml b/customer/bmwi-gruenderwoche/common.yaml
index 7ee48a76cb73367f5238525fad3b2c3a176844c0..734b10057d9a79b76c289ee99c66dabf89e6b1d7 100644 (file)
--- a/customer/bmwi-gruenderwoche/common.yaml
+++ b/customer/bmwi-gruenderwoche/common.yaml
@@ -1,4 +1,11 @@
 ---
+infra::role: base
+infra::additional_classes:
+  - infra::profile::typo3
+  - infra::profile::mysql_server
+  - apache::mod::headers
+  - solr
+
 accounts::users:
   service.typo3:
     apply: true
@@ -30,12 +37,6 @@ sudo::configs:
     content: |
       jenkins ALL=(apache) NOPASSWD: ALL
 
-infra::role: base
-infra::additional_classes:
-  - infra::profile::typo3
-  - infra::profile::mysql_server
-  - apache::mod::headers
-
 apache::default_vhost: false
 
 repo::remi_php70: true
@@ -47,3 +48,19 @@ php::fpm::pools:
 php::extensions:
   xml: {}
   pecl-zip: {}
+
+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
\ No newline at end of file

diff --git a/customer/bmwi-gruenderwoche/development.yaml b/customer/bmwi-gruenderwoche/development.yaml
index 33504f5377a9a5dafbad3beecd8cad35a943b596..3f66a861c8af612371ad5cc7d145688a97f99cc9 100644 (file)
--- a/customer/bmwi-gruenderwoche/development.yaml
+++ b/customer/bmwi-gruenderwoche/development.yaml
@@ -1,6 +1,4 @@
 ---
-infra::additional_classes:
-  - solr
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAjgIlslu9h1hCzV+n9BsoynXr/T9ZPJhAXG/7Bdo3U5ruwLLFpulw9JOYK9LIoo6hnU6QyH3zbiOt/iHuv54eUhZOl5KfRBZ+xtNE/lxE17rFA1LqaC1X7t7zLp/+nH7aomxLo/l1+JZKaQQ2WIFvMlAodrV2r5PKNy8Gv8U5D4r7tkRqOWDFuuVev7LLbOOE4uMIooZUDlhkPHJNmIaB5u/6myAsIJXUXbKsdLiSzqQDRMoQ9zcY79XDJ3LGUSRFaoPZWBPC5SdHjEREjO6TS8kKBHm/VjyR48lvA8LSEWhgjfBXXBJGSYIgIZWIaecyZyFsUHVU2hImkTw/iKUXwjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCWrXNvB/BgelVcWZJ0ZdJ1gCAlUcbqItPp6qDXbqw+kdRYPuq4jkZQ1+EBwTo2oAnLrg==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAObdig3np1YiIvoZpieJn4Flaqde+wl92yKVpbcL9IY9m264t7PVYl/nEpIMgcAd84pwzgw7E09slwLPQW3NwW5k8deViVn8P1x4A29lwLDmsd5+gSzFb+MNNVPtVYKginDvFvZwdEN77qG4bWos0suQX37uoTRxCAPasF9UMQK/mwSgrxJTY+j7bOSL+QcIrvzORY8X1acLBk9MyqKAB1P2v70CP1Z89GANEAvoWlaRzdqGNoQM8mzbMm/+zjo7x1CkN9Oay/JW8Fzfe0KH8DCeWV6+lpIXRzmHlxUufTB9EglU7zbV4+O4VcMwlwH8BafLU5FWRCRnptcAiMp18hjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBCmPPlAsT69iOLKsbzpYXUgCA7LmKNjWfA7Uhj8EQ4BUF0KFiKKgNU4r2WHzuofClMZg==]
@@ -48,19 +46,3 @@ infra::profile::typo3::projects:
     php_admin_value:
       max_input_vars: '1500'
 
-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
-

diff --git a/customer/bmwi-gruenderwoche/test.yaml b/customer/bmwi-gruenderwoche/test.yaml
index c1507ded51d2731f92e6ffb46061cd4b7437b5f4..b56c6b5b5e66003b733dbd3cd34119d7efb4b8aa 100644 (file)
--- a/customer/bmwi-gruenderwoche/test.yaml
+++ b/customer/bmwi-gruenderwoche/test.yaml
@@ -1,6 +1,4 @@
 ---
-infra::additional_classes:
-  - solr
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAVvmiQtCIC3PdhZOWHBHSE/S639igwLABG7VzOn4MrByQSzBvPhilFFNw+aUHyh2MPfsHAGFF/IFWZkDqmySFj6Q5IuTBzabpwHE1DhzR+8DLmKxtOZ+zSpIvfa+h0s8FX1GGqAVY8Et0JbB6GnZ2057T+Kc1IgWZf/mKmvM2EHFfgsqcLmw4oxz/rdW+Q6NOMsmcj8T2bZCMXYopI3a9tTKeOgHkrs31vyb8MWHK68xJIWPGaSHFVKyaPlT+b33iMCC8MVv838vhvLfe9sH5GlakgXs2OrvAW1ILwXpv4jES73gBUEYXTRUvMAfET4NGJXZcWYiYYE3DC4/kbc3RlzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBALGuz2fgEW/gJl1Z6DYl+3gCC7rPlCsmXnXNftgfyBqLhjkDnnCB8m3ZZtdqI+jqPa5A==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAH8aQQF8KILPiVmPySEqwxJrVjWuQcen0taWGCum1dUXC9hPsALJ6x5b85ZcfQxyPbbgu6Bsm0L0Uq3bRC8ev1nxvokX6xtFJfIhcL9i/c5RCAVdmehed5VdqBsc1y+tVJzfh0ZN8SZf+bgJcgm9RfnNdBoxQuiDDGrPdohXjRP9fDjVwfaRSUNg0cibTHjmzOYCR4LNMwSU9BzXz3EmEjF7WKNOtZiPfL8mjVqMzdjeGX9MuvFpTnv2xDx2HaHEBeLc4ENeI204i3racRjHgSQ+gsCi/lw1CFBqu1ITnaFvNz/j7oDk/3QzKYVJMaIGW65Q4AR7dAUwXKJBhbDqEgTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC+iMSKZotegaehCfw7qVf4gCAhociax3RDRYybTqn8GtBqXh9iiXbCf5QIEJYMjEKoYA==]
@@ -66,19 +64,3 @@ infra::profile::apache::vhosts:
           - FollowSymLinks
         allow_override:
           - None
-
-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
\ No newline at end of file