From: sascha.strassheim Date: Thu, 31 May 2018 12:08:02 +0000 (+0200) Subject: changed deuwo hiera structure X-Git-Tag: v0.1.0~871 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=5ceef57c907aeb08b543ffbc80d0c63ed9107f5e;p=pixelpark%2Fhiera.git changed deuwo hiera structure --- diff --git a/customer/deuwo/common.yaml b/customer/deuwo/common.yaml index c44c1c8f..ab19b9c6 100644 --- a/customer/deuwo/common.yaml +++ b/customer/deuwo/common.yaml @@ -10,6 +10,17 @@ php::settings: Date/date.timezone: Europe/Berlin PHP/expose_php: 'Off' +php::extensions: + gd: {} + opcache: {} + mysqlnd: {} + soap: {} + mbstring: {} + zip: {} + xml: {} + +mysql::server::backup::backupdir: /var/lib/backup/mysql + mysql::server::backup::time: - '3' - '30' diff --git a/customer/deuwo/dev-web01-deutsche-wohnen-com.pixelpark.net.yaml b/customer/deuwo/dev-web01-deutsche-wohnen-com.pixelpark.net.yaml index a220d846..47d402f8 100644 --- a/customer/deuwo/dev-web01-deutsche-wohnen-com.pixelpark.net.yaml +++ b/customer/deuwo/dev-web01-deutsche-wohnen-com.pixelpark.net.yaml @@ -6,89 +6,10 @@ infra::additional_classes: - infra::profile::postfix - logstash - solr -# - zabbix::agent - -#zabbix::agent::include_dir_purge: false -#zabbix::agent::server: '217.66.51.48' -#zabbix::agent::serveractive: 217.66.51.48 - -#infra::additional_files: -# zabbix_repo: -# path: '/etc/yum.repos.d/zabbix_3_4.repo' -# owner: 'root' -# group: 'root' -# mode: '0644' -# content: | -# [zabbix_3_4] -# name=Zabbix Yum Repo -# baseurl=http://repo.pixelpark.com/Linux/yum/zabbix/7/zabbix_3_4/ -# enabled=1 -# gpgcheck=0 - # gpgkey=http://repo.pixelpark.com/Linux/yum/RPM-GPG-KEY-ZABBIX - -#zabbix::agent::manage_repo: false -#zabbix::repo::version: '3.4' solr::version: 7.2.1 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 - - -apache::mod::ssl::ssl_cipher: 'EECDH+AES:EDH+AES:!SHA1:!aNULL@STRENGTH' - -accounts::users: - jenkins: - apply: true - stephan.vits: - apply: true - sudo: true - thomas.bussmeyer: - apply: true - sudo: true - markus.baumann: - apply: true - sudo: true - christian.schoenherr: - apply: true - sudo: true - willi.martens: - apply: true - sudo: true - dirk.goetz: - apply: true - sudo: true -sudo::configs: - jenkins_deploy: - priority: "06" - content: | - jenkins ALL=(apache) NOPASSWD: ALL - solr_deploy: - priority: "06" - content: | - jenkins ALL=(solr) NOPASSWD: ALL - -php::extensions: - gd: {} - opcache: {} - mysqlnd: {} - soap: {} - mbstring: {} - zip: {} - xml: {} - -mysql::server::backup::backupdir: /var/lib/backup/mysql # mysql mysql::server::package_name: MariaDB-server @@ -114,6 +35,10 @@ infra::profile::apache::htdigest: server: www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAkGVrLBqpX2W1VtWyCwq4OqUsAuG9q6GFiEAm3Gl4ConRU3/mXJc+bJ3X90FgppTTR5h+7JfOMIVH5eBTx4fHQs6iMPHQ+5ZfqXdedDzkvXIBCwShcr7Xrjv5bZtW3ZiJW3umUg5f+GSOXxlu/legOeG6eGjm71s5/AjiVb1AMEROtZPX8wAQevi/AT4nLmwwlKXVBTufD1pXEE/DXdEoF7KdJwdw430DoJ6mFmksBH1zuz3Mpx483DxuJVaYRPExSAKBvL8UyIQnBe1XxWj2wubiHaaK24/gw6B/5IFX3QuQadLqmfq10zWD5esxRyavwRJhu3kscCxH3GFRr/ZYrTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDDb+bXxt53ON/2h+LzX1yygCBgAjJ0nJuq7e4z10f4QqiLlesWiPMBW/aizVAdwa5tIA==] +# apache ssl_cipher + +apache::mod::ssl::ssl_cipher: 'EECDH+AES:EDH+AES:!SHA1:!aNULL@STRENGTH' + # deuwo typo3 cms infra::profile::typo3::projects_composer_monolith: diff --git a/customer/deuwo/development.yaml b/customer/deuwo/development.yaml new file mode 100644 index 00000000..b30c7dc9 --- /dev/null +++ b/customer/deuwo/development.yaml @@ -0,0 +1,39 @@ +--- +repo::remi_php71: true + +infra::profile::apache_php::fpm_pool: + symfony: + listen_owner: apache + listen_group: apache + pm_max_children: 20 + +accounts::users: + jenkins: + apply: true + stephan.vits: + apply: true + sudo: true + thomas.bussmeyer: + apply: true + sudo: true + markus.baumann: + apply: true + sudo: true + christian.schoenherr: + apply: true + sudo: true + willi.martens: + apply: true + sudo: true + dirk.goetz: + apply: true + sudo: true +sudo::configs: + jenkins_deploy: + priority: "06" + content: | + jenkins ALL=(apache) NOPASSWD: ALL + solr_deploy: + priority: "06" + content: | + jenkins ALL=(solr) NOPASSWD: ALL diff --git a/customer/deuwo/production.yaml b/customer/deuwo/production.yaml new file mode 100644 index 00000000..b2c63515 --- /dev/null +++ b/customer/deuwo/production.yaml @@ -0,0 +1,16 @@ +--- +repo::remi_php71: true + +accounts::users: + jenkins: + apply: true + +sudo::configs: + jenkins_deploy: + priority: "06" + content: | + jenkins ALL=(apache) NOPASSWD: ALL + solr_deploy: + priority: "06" + content: | + jenkins ALL=(solr) NOPASSWD: ALL diff --git a/customer/deuwo/test-web01-deutsche-wohnen-com.pixelpark.net.yaml b/customer/deuwo/test-web01-deutsche-wohnen-com.pixelpark.net.yaml index 744e24e5..d1a22b11 100644 --- a/customer/deuwo/test-web01-deutsche-wohnen-com.pixelpark.net.yaml +++ b/customer/deuwo/test-web01-deutsche-wohnen-com.pixelpark.net.yaml @@ -7,48 +7,10 @@ infra::additional_classes: - infra::profile::postfix - logstash - solr -# - zabbix::agent -#zabbix::agent::include_dir_purge: false -#zabbix::agent::server: '217.66.51.48' -#zabbix::agent::serveractive: 217.66.51.48 - -#infra::additional_files: -# zabbix_repo: -# path: '/etc/yum.repos.d/zabbix_3_4.repo' -# owner: 'root' -# group: 'root' -# mode: '0644' -# content: | -# [zabbix_3_4] -# name=Zabbix Yum Repo -# baseurl=http://repo.pixelpark.com/Linux/yum/zabbix/7/zabbix_3_4/ -# enabled=1 -# gpgcheck=0 - # gpgkey=http://repo.pixelpark.com/Linux/yum/RPM-GPG-KEY-ZABBIX - -#zabbix::agent::manage_repo: false -#zabbix::repo::version: '3.4' solr::version: 7.2.1 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 - - -apache::mod::ssl::ssl_cipher: 'EECDH+AES:EDH+AES:!SHA1:!aNULL@STRENGTH' - -mysql::server::backup::backupdir: /var/lib/backup/mysql # mysql mysql::server::package_name: MariaDB-server @@ -67,47 +29,6 @@ infra::additional_files: gpgcheck=1 gpgkey=http://repo.pixelpark.com/Linux/yum/mariadb/RPM-GPG-KEY-MariaDB -accounts::users: - jenkins: - apply: true - stephan.vits: - apply: true - sudo: true - thomas.bussmeyer: - apply: true - sudo: true - markus.baumann: - apply: true - sudo: true - christian.schoenherr: - apply: true - sudo: true - willi.martens: - apply: true - sudo: true - dirk.goetz: - apply: true - sudo: true - -sudo::configs: - jenkins_deploy: - priority: "06" - content: | - jenkins ALL=(apache) NOPASSWD: ALL - solr_deploy: - priority: "06" - content: | - jenkins ALL=(solr) NOPASSWD: ALL - -php::extensions: - gd: {} - opcache: {} - mysqlnd: {} - soap: {} - mbstring: {} - zip: {} - xml: {} - infra::profile::apache_php::fpm_pool: symfony: listen_owner: apache @@ -121,6 +42,9 @@ infra::profile::apache::htdigest: server: www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAVFtyuxOu6REIhFq4W/Z1I65zQmErpySVv5hCey0AmrVGyCXSgF/r8V3r7yghmXH/Rafuqv5KQWnUTNPZCLbuxRFgu0ZVmL7pgDj7x3UKl+7vSNNr3+c171zLmxjTZ9ASEqM0uFwgAEud3BnLh/BiUjFB7DMi7JmYXmHUpFSqwL9LQu4kJT5+2QNGr37zFrOqZSjDsqRMwYJj8j/zpIJr0gU4+rBdxy5YBraulcFCV/M0NpjoMfoKQpbnhDGV7hWVUtSCQcD2Wz7Ah46NJPrEjefmRDIPROa1cmhSsNDWLskF88IRkwaxNjIetU6tuS4WTiLhtZFEJRgcH/65Bw2auTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBerOysq5GpS4Q7D2JfJoiMgCAj2NUzX8HzAatX5AEhKuGAL1tMZVlHzlGw90OlikHRuA==] +# apache ssl_cipher +apache::mod::ssl::ssl_cipher: 'EECDH+AES:EDH+AES:!SHA1:!aNULL@STRENGTH' + infra::profile::typo3::projects_composer_monolith: deuwo: db_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQlgDpYYN/Drr2+zX/VoIx76Xa3C3Q9OgcA1gR6ZuXz/Y/eZyd6p+wBeM35b5UnT3ZxpB9DmYNn9KbdoLkmVyIdTSu8wZgdpB98d58eUikfO1vzftjBV5NavFWBXxQLpEgQwuyDCekew67mZEZBQd+rl1k2x7o9BXRkEFmT016kwu8IXLDzXH5CTJhxOx4cLAvL4zH3pGdnNAA2JV1FaiVDJv5sI12LT25JWk7A8zKtX3uK+u+un6qvibPor4bijP9FWzDRTCzgV6vjnWchGrwtuJImL35NCFgawyZGAx41T/0pqkCveBX0LB6HV+WBLoGeDSES0r/YkMr6Eulb3hajBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCOJYNJbFocJXRN6sl0zc4EgCBVnq2NKXMaTdlgP2c6AAX5mKm34p3ugMUGr8OCU4AcYQ==] diff --git a/customer/deuwo/test.yaml b/customer/deuwo/test.yaml new file mode 100644 index 00000000..17172f8b --- /dev/null +++ b/customer/deuwo/test.yaml @@ -0,0 +1,40 @@ +--- +repo::remi_php71: true + +infra::profile::apache_php::fpm_pool: + symfony: + listen_owner: apache + listen_group: apache + pm_max_children: 20 + +accounts::users: + jenkins: + apply: true + stephan.vits: + apply: true + sudo: true + thomas.bussmeyer: + apply: true + sudo: true + markus.baumann: + apply: true + sudo: true + christian.schoenherr: + apply: true + sudo: true + willi.martens: + apply: true + sudo: true + dirk.goetz: + apply: true + sudo: true + +sudo::configs: + jenkins_deploy: + priority: "06" + content: | + jenkins ALL=(apache) NOPASSWD: ALL + solr_deploy: + priority: "06" + content: | + jenkins ALL=(solr) NOPASSWD: ALL diff --git a/customer/deuwo/web01-deutsche-wohnen-com.pixelpark.net.yaml b/customer/deuwo/web01-deutsche-wohnen-com.pixelpark.net.yaml index 48423e92..650f0b29 100644 --- a/customer/deuwo/web01-deutsche-wohnen-com.pixelpark.net.yaml +++ b/customer/deuwo/web01-deutsche-wohnen-com.pixelpark.net.yaml @@ -34,32 +34,6 @@ infra::profile::postfix::relayhost: 213.61.61.162 solr::version: 7.2.1 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 - -accounts::users: - jenkins: - apply: true - -sudo::configs: - jenkins_deploy: - priority: "06" - content: | - jenkins ALL=(apache) NOPASSWD: ALL - solr_deploy: - priority: "06" - content: | - jenkins ALL=(solr) NOPASSWD: ALL infra::profile::apache_php::fpm_pool: symfony: @@ -67,17 +41,6 @@ infra::profile::apache_php::fpm_pool: listen_group: apache pm_max_children: 20 -php::extensions: - gd: {} - opcache: {} - mysqlnd: {} - soap: {} - mbstring: {} - zip: {} - xml: {} - -mysql::server::backup::backupdir: /var/lib/backup/mysql - # mysql mysql::server::package_name: MariaDB-server mysql::client::package_name: MariaDB-client @@ -102,6 +65,10 @@ infra::profile::apache::htdigest: server: www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAasW9y0F8HDaBiwALaXtBhZR9ZmMyEliSoiEVxu+MWBRubCmDdccHXHODEX2QBtjCF8jWs6MHL5E6sWY5Yos4R+ka6Y8mkyepZ5Ef7WtJXbetkIk8v3/giyxkrQ34wLcxFr/FC74nUEaTLuyl75hWPTajIBDm9/WXdv9RMwZhVh4JeTdLF9CMVd9OyEjl8AxHgjJ3hXzthdq9EBtZEEL6TNfNsjnplcg/by407w4n9oPWUEFbJciKLxzShYsjJTQH9uxErOM6ssBcit9xojsGmZ+B8z+pshpHHmjpYgCdyOYhm2wYedvqJYFT07+ysDC7UAPmIhY3uWqa3nND4VR7PDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBvEH7TyS7+etoEhChmHzFigCDlGKH9QDhrnU+6dsusq+LZTvJ+/7Bu6wB8+2UfvTt8xQ==] +# ssl ssl_cipher + +apache::mod::ssl::ssl_cipher: 'EECDH+AES:EDH+AES:!SHA1:!aNULL@STRENGTH' + infra::profile::typo3::projects_composer_monolith: deuwo: db_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAYzA1I2aYByST5c5kiWSV6gaGHh28ez7Mq/kGr/Hlxz5ynso3OoWW/Kk8wNvXKOPZmDf3LBV3WXSe+ckG3x1iXFpM9LSjila5zhsMlSfrAcTSuZb+TwFQbUyzB89s1Tpc4X0ocTqPn+FEvkqQnrMgxZV25hEFb1FSFiBMCjAiYW4xCNvz3hSkq2KOI1Jch7J6bJYhnJBWazaKjp4pQfqvA64OAI0Yh7DoYM5IEyjfmFLAVoZgI0ZCTzGKeX268Hh7JGVZBM7CqtEqub4/24iaNILooaDgdETDLCaenzVE0TnIOvYrlHh9cGb6KAfXOCB9YNRK/DJ4A9/2jLx5jPQTlTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBj/H3oAv1nfYpO4RzXExa5gCAS5o5F1YX4mRrvv0uUmO/A6wV6NSPHRRcToS24Lh6dWg==]