]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
remove duplicates apache mpm
authorPhilipp Dallig <philipp.dallig@pixelpark.com>
Fri, 21 Oct 2016 12:34:19 +0000 (14:34 +0200)
committerPhilipp Dallig <philipp.dallig@pixelpark.com>
Fri, 21 Oct 2016 12:34:19 +0000 (14:34 +0200)
50 files changed:
customer/bkk-vbu/common.yaml
customer/bmas-sgb2/dev-sgb2-info.pixelpark.net.yaml
customer/bmas-sgb2/test-web01-sgb2-info.pixelpark.net.yaml
customer/bmas-sgb2/web01-sgb2-info.pixelpark.net.yaml
customer/bmas-typo3/common.yaml
customer/bmbf/common.yaml
customer/bmf-datacenter/common.yaml
customer/bmw/common.yaml
customer/bmwi-gruenderwoche/common.yaml
customer/buschjaeger/test-web-buschjaeger-de.pixelpark.net.yaml
customer/buschjaeger/web01-buschjaeger-de.pixelpark.net.yaml
customer/buschjaeger/web02-buschjaeger-de.pixelpark.net.yaml
customer/dbad/common.yaml
customer/dpdhl/development.yaml
customer/emperra/www-tmp-emperra-com.pixelpark.net.yaml
customer/joml/common.yaml
customer/kaufland/stundenplan-kaufland-de.pixelpark.net.yaml
customer/kutchenhaus/common.yaml
customer/lbs/dev-red02-lbs-de.pixelpark.net.yaml
customer/lekkerland/dev-lekker-01-hy01.pixelpark.net.yaml
customer/lekkerland/dev-lekker-02-hy01.pixelpark.net.yaml
customer/linde/production.yaml
customer/linde/test.yaml
customer/mbvd-fashionweek/common.yaml
customer/mbvd-ngcc/common.yaml
customer/mbvd-service-and-smile/common.yaml
customer/mbvd-transporter-training/common.yaml
customer/mbvd/int-odt-daimler-com.pixelpark.net.yaml
customer/mbvd/odt02-daimler-com.pixelpark.net.yaml
customer/mbvd/web01-prototyp-mbvd-de.pixelpark.net.yaml
customer/pfizer-schlaganfall/web-schlaganfall-verhindern-de.pixelpark.net.yaml
customer/pfizer/common.yaml [deleted file]
customer/pixelpark/foreman01.pixelpark.com.yaml
customer/pixelpark/foreman02.pixelpark.com.yaml
customer/pixelpark/pass.pixelpark.com.yaml
customer/pixelpark/puppetmaster01.pixelpark.com.yaml
customer/pixelpark/repo.pixelpark.com.yaml
customer/pixelpark/review.pixelpark.com.yaml
customer/pixelpark/rpm-repo.pixelpark.com.yaml
customer/pixelpark/vm04-olli.pixelpark.com.yaml
customer/pixelpark/web-inhalte.pixelpark.net.yaml
customer/q_perior/test-www-q-perior.pixelpark.net.yaml
customer/sirona-aem/common.yaml
customer/spd/common.yaml
customer/spk-blog/dev-sparkasseblog01.sparkasse.local.yaml
customer/spk-blog/sparkasseblog01.sparkasse.local.yaml
customer/spk-microsites/dev-microsites01-sparkasse-de.pixelpark.net.yaml
customer/spk-microsites/microsites01-sparkasse-de.pixelpark.net.yaml
customer/webstats/common.yaml
customer/zf/common.yaml

index d2641ca01c2360579bcebe2622f088904ac8536f..e5c16473e5d956e3a28cda40b2c7c6681f877696 100644 (file)
@@ -39,7 +39,6 @@ site::additional_classes:
   - site::profile::symfony
 
 apache::default_vhost: false
-apache::mpm_module: worker
 
 repo::remi_php56: true
 
index 1b9754bb504268822b93c5525a0d068ef5bbeea9..1d465b239431b2df279f3ec36d1f9fb9ec767c0b 100644 (file)
@@ -24,7 +24,6 @@ site::additional_classes:
   - site::profile::mysql_server
 
 repo::remi_php56: true
-apache::mpm_module: worker
 
 site::profile::apache::htdigest:
   server:
index d943c2b922926e410f25d694b598fa843c973314..8beb2e7dad4dacb5847845059788c57448a6b856 100644 (file)
@@ -38,7 +38,7 @@ mysql::server::override_options:
     bind-address: 0.0.0.0
 
 repo::remi_php56: true
-apache::mpm_module: worker
+
 
 php::extensions:
   gd: {}
index 6f728c36e29321a90184f10a5f68df8afb1bb7b5..19413bf9e9db77e699d17c8f55ec15dd483129fc 100644 (file)
@@ -25,7 +25,7 @@ mysql::server::override_options:
   mysqld:
     bind-address: 0.0.0.0
 repo::remi_php56: true
-apache::mpm_module: worker
+
 
 php::settings:
   Date/date.timezone: Europe/Berlin
index 7869de10017989a4f0290923a5ae67fdc0676d3c..137c9f5d1f3aa96bba390677bc137dd625a40c33 100644 (file)
@@ -4,7 +4,7 @@ accounts::users:
     apply: true
     group: apache
 
-apache::mpm_module: worker
+
 
 repo::remi_php56: true
 
index 90726edebe1d06657ca0c4aa1544d021aa9352cd..97506e760c742d2b528f50c8dd8e67e41e330468 100644 (file)
@@ -17,7 +17,7 @@ sudo::configs:
     content: |
       service.typo3 ALL=(apache) NOPASSWD: ALL
 
-apache::mpm_module: worker
+
 nodejs::manage_package_repo: false
 
 php::fpm::pools:
index a531e645c6e330bbb68563bc6ffd12939b319560..b4ff2d79356581bf13f050f2170c18a51c1d5907 100644 (file)
@@ -23,7 +23,7 @@ site::additional_classes:
 
 repo::remi_php56: true
 apache::default_vhost: false
-apache::mpm_module: worker
+
 
 php::fpm::pools:
   www:
index 042769449fca40c395b2f4b3eda5753fde956902..69555b779c5fae8b48912c33f9a8e2e1fdefb966 100644 (file)
@@ -8,7 +8,7 @@ site::additional_classes:
 java::package: java-1.8.0-oraclejdk
 puppetconf::server: puppetmaster01.pixelpark.com
 
-apache::mpm_module: worker
+
 apache::mod::mime::mime_types_additional:
   'AddHandler':
     'type-map': 'var'
index 7af40c063558ed127ca26b4359985d0c266c5441..0ff25eeba1346ae9fae99de07f05346cb4b14d9a 100644 (file)
@@ -27,7 +27,7 @@ site::additional_classes:
   - apache::mod::headers
 
 apache::default_vhost: false
-apache::mpm_module: worker
+
 
 repo::remi_php70: true
 
index 6bde8ef55b364c8fe5cee4a2cb3e92279307f452..a15a4a30135c5d31065007e78e19da22d527bf31 100644 (file)
@@ -16,7 +16,7 @@ accounts::users:
     apply: true
 
 apache::default_vhost: false
-apache::mpm_module: worker
+
 
 php::dev: true
 php::pear: true
index b17cd1f9f181990ab2d7973b4bc018496ed6de88..f10d0b27e34c6e758b967828de704d859a63a31a 100644 (file)
@@ -15,7 +15,7 @@ accounts::users:
     apply: true
 
 apache::default_vhost: false
-apache::mpm_module: worker
+
 
 repo::remi_php70: true
 
index a3e3415c7ef111d109c6c9a9e715c0354d99aa05..09e33e4e0369ef57279371f46e2672891002683c 100644 (file)
@@ -15,7 +15,7 @@ accounts::users:
     apply: true
 
 apache::default_vhost: false
-apache::mpm_module: worker
+
 
 repo::remi_php70: true
 
index b210a28a22dae5327486965e8b3c1b7011034800..9a43db290d94b3d4299505ccddf2d00a5f7f0b53 100644 (file)
@@ -1,4 +1,3 @@
 ---
 site::profile::apache::enable_logstash: false
 site::profile::logstash::apache::enable: false
-apache::mpm_module: worker
\ No newline at end of file
index 84266cf3796803b741c2788faf2cf003ec60f8e1..2c4c8aa93ec726133cdd4c8ed040a4d78324e9d6 100644 (file)
@@ -16,7 +16,7 @@ site::profile::mysql_server::databases:
     user: dpdhl
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAIl+3liXiECefOfZt4ad6Khqw8iyYTnXBi7rUbkCHvL+orLFG9moDU++qfmZdjDL2clGLuFRZy9itrlTqOe5yl0PHPbzkcncBvpUopVjABjtRa6HGoDdmpEoucoHiaUvmmWt/YrNzSAsBWgIBB6piGLuKhUc70O/rvIUajb9Ml6/eSIL1I6Hva+ez5UDj7ooFk13AW48qiA+M4aKltqbBeOxmuAI2PT7EMdrTsr4K006p8J3VbJ/mWPMyH5d22FSrwlPBmDZVHNazJ8UE+ySmJVhlXTNfvXBrDa6D6KFKudvQuB+xbjQo9HSOj4vdskGPoCeXVecWmX0LrLVUiH9rbDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD+1KWZZ0bbxlol/jegoL3FgCDijv4sqonEfVWHwEHwA0OGNr6S/tRY2EQgb7DQAjenEA==]
 
-apache::mpm_module: worker
+
 apache::default_vhost: false
 
 site::profile::wordpress::projects:
index 9ddb810bae4dd6a28f17d5407049dc7f5045ff4a..da32d52f7571be83786fa1d241f9e865d2cc90b9 100644 (file)
@@ -15,7 +15,7 @@ site::profile::mysql_server::databases:
 
 mysql::server::remove_default_accounts: true
 
-apache::mpm_module: worker
+
 apache::default_vhost: false
 
 repo::remi_php56: true
index 866dfe9e538402bd58eab2bd8e0ed7e5ebafa0e3..3ba029817ada5ead25d2917f92e7f345a01bdb89 100644 (file)
@@ -1,7 +1,7 @@
 ---
 
 apache::default_vhost: false
-apache::mpm_module: worker
+
 
 accounts::users:
   service.typo3:
index 47a533a2665f01fdb8aa9a1fc60929a58821929d..b8029174f92d16f237073fbffba2e8519ebcc240 100644 (file)
@@ -31,7 +31,7 @@ php::fpm::pools:
     ensure: absent
 
 apache::default_vhost: false
-apache::mpm_module: worker
+
 
 site::profile::apache::htdigest:
   stundenplan:
index dbc1711fdc1710424f42b8e6c148ca8b526bf942..f6bea5dc192656d5e0caceb3a5f46ae507203ac7 100644 (file)
@@ -6,7 +6,7 @@ accounts::users:
     group: apache
 
 apache::default_vhost: false
-apache::mpm_module: worker
+
 
 repo::remi_php56: true
 
index bf8c747916f0cedbcbe264cb02251f42dbd1adac..e531cffcfd10ada3438b64e9ac2b783ba43704e4 100644 (file)
@@ -39,7 +39,7 @@ accounts::users:
     group: "fs5"
 
 apache::default_vhost: false
-apache::mpm_module: worker
+
 
 site::profile::apache::vhosts:
   dev-red02-lbs-de:
index 701090d3374f2914294629275c48defd11fe1945..7de21ad0b6a95fd863f853ca6fecc7354175e267 100644 (file)
@@ -18,7 +18,7 @@ accounts::users:
     group: apache
 
 apache::default_vhost: false
-apache::mpm_module: worker
+
 
 site::profile::apache::htdigest:
   lekkerland:
index d07d5dfe35da5b4b89d74a65ea9c0236f60e624b..a96b0e17b4d81661460149a1ce85d8572e268610 100644 (file)
@@ -18,7 +18,7 @@ accounts::users:
     group: apache
 
 apache::default_vhost: false
-apache::mpm_module: worker
+
 
 site::profile::apache::htdigest:
   lekkerland:
index 72df174fd6453a29d0d68adfe530f6ddbe615229..b8a1418a55e57012dcb23720cec11a056a983e1e 100644 (file)
@@ -10,7 +10,7 @@ logstash::generic_resource:
         - "%{customer}"
         - "%{environment}"
 
-apache::mpm_module: worker
+
 apache::default_vhost: false
 apache::purge_configs: false
 
index 723c7582dfc7b329e034a974b216efd5d06d438b..42ed51495e0ab614bad17930564b9e303dd84a00 100644 (file)
@@ -10,7 +10,7 @@ logstash::generic_resource:
         - "%{customer}"
         - "%{environment}"
 
-apache::mpm_module: worker
+
 apache::default_vhost: false
 apache::purge_configs: false
 
index d12bde658cc800ced910454bfd7a33feca3ad694..470a1f8c5791e7b8dc37bd4bd130b336b2d12beb 100644 (file)
@@ -17,7 +17,7 @@ accounts::users:
     group: apache
 
 apache::default_vhost: false
-apache::mpm_module: worker
+
 
 repo::remi_php56: true
 
index 601164f86e07a54c0c62b6df910ea74b7e8980dd..56d43065b53ae1534c667eebe52be4744ea9b089 100644 (file)
@@ -42,4 +42,4 @@ mysql::server::override_options:
     collation-server: utf8_general_ci
 
 apache::default_vhost: false
-apache::mpm_module: worker
+
index 28c45d4fc782424bfb6cdf62f6e46ba628c76274..43ce440b8292583e673414fd8ab1e6f3d1a07585 100644 (file)
@@ -4,7 +4,7 @@ site::additional_classes:
   - site::profile::drupal
   - site::profile::mysql_server
 
-apache::mpm_module: worker
+
 apache::default_vhost: false
 
 repo::remi_php56: true
index f51e74fbb51aba2cba58f022724c886887a97468..842a90f870cb222b2d58c12f6cc179b6f7b4de34 100644 (file)
@@ -4,7 +4,7 @@ site::additional_classes:
   - site::profile::drupal
   - site::profile::mysql_server
 
-apache::mpm_module: worker
+
 apache::default_vhost: false
 
 repo::remi_php70: true
index db3e7623c9f63e03e75d32b38a88a94361571593..b01e040a1e1cd34f4d2e9e7ebf43d2cb138dc272 100644 (file)
@@ -57,7 +57,7 @@ accounts::users:
     sudo: true
 
 apache::default_vhost: false
-apache::mpm_module: worker
+
 
 site::profile::apache::vhosts:
   int-odt-daimler-com:
index 74a0e7eed2adaa6e9179358452d1dc1a8d380b56..277afa21acb54dba69846b782045533ab25e295b 100644 (file)
@@ -29,7 +29,7 @@ accounts::users:
     apply: true
 
 apache::default_vhost: false
-apache::mpm_module: worker
+
 
 site::profile::apache::vhosts:
   odt.daimler.com:
index 6d32e3b04faf91cf853a6fec301aa4f3bb7f532d..e96afde6d69d166a2b180c7ed13ee845dbbbc5b6 100644 (file)
@@ -18,7 +18,7 @@ accounts::users:
     group: apache
 
 apache::default_vhost: false
-apache::mpm_module: worker
+
 
 site::profile::apache::htdigest:
   prototyp:
index 81f9528db42df344148419a25bdd5de4ea273ec2..e4100c7f4a2877ba56b26d31be84b4241eb048ac 100644 (file)
@@ -18,7 +18,7 @@ sudo::configs:
       stephan.vits ALL=(apache) NOPASSWD: ALL # temporary
 
 apache::default_vhost: false
-apache::mpm_module: worker
+
 
 repo::remi_php70: true
 php::fpm::pools:
diff --git a/customer/pfizer/common.yaml b/customer/pfizer/common.yaml
deleted file mode 100644 (file)
index d92f191..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
----
-apache::mpm_module: worker
\ No newline at end of file
index 834a44e61f585682dacba835bae8898c52c183fe..befd578741448a5aee3e0bbf469e4d02368ce4a4 100644 (file)
@@ -4,7 +4,7 @@ site::additional_classes:
   - site::profile::apache
   - apache::mod::passenger 
 
-apache::mpm_module: worker
+
 apache::mod::passenger::passenger_pool_idle_time: 600
 #apache::mod::passenger::passenger_high_performance: 'On'
 apache::mod::passenger::passenger_ruby: /usr/bin/ruby193-ruby
index c55120808b4bd15a14d689c902ef41efbc721a36..17857dc070312d8de2ea30391cc5a89ac3cb0948 100644 (file)
@@ -5,7 +5,7 @@ site::additional_classes:
   - site::profile::apache
   - apache::mod::passenger 
 
-apache::mpm_module: worker
+
 apache::mod::passenger::passenger_pool_idle_time: 600
 #apache::mod::passenger::passenger_high_performance: 'On'
 
index c131a3bbd2f93c6562b3b36cfc00d0980d55df7e..9fe5375cba4e49fa7538580025bcdec31ab7fb01 100644 (file)
@@ -8,7 +8,7 @@ site::additional_packages:
   php-ldap: {}
 
 apache::default_vhost: false
-apache::mpm_module: worker
+
 
 repo::remi_php70: true
 
index 14ab5798c322098fb8f38d5f40eeaa11ce65b552..89080811a24ae236097bb1cc9695ff028525791a 100644 (file)
@@ -17,7 +17,7 @@ pp_mcollective::client: true
 pp_mcollective::server: false
 
 
-apache::mpm_module: worker
+
 #apache::mod::passenger::passenger_max_pool_size: 32
 #apache::mod::passenger::passenger_pool_idle_time: 600
 #apache::mod::passenger::passenger_max_requests: 10000
index da45eb4d2604c7150a91e46a33aa59870c24505c..dfe1ae25320e42a4d1875f574aeddecdf0609ff2 100644 (file)
@@ -3,7 +3,7 @@ site::role: base
 site::additional_classes:
   - site::profile::apache
 
-apache::mpm_module: worker
+
 apache::default_vhost: false
 
 site::profile::apache::pp_vhosts:
index d7b5feaade48de0cefc8662b0d7fc7b29422c152..e3e9a0c17cf8c97746f7c0c547ebe43d03d07c0f 100644 (file)
@@ -5,7 +5,7 @@ site::additional_classes:
   - gerrit
   - logstash
 
-apache::mpm_module: worker
+
 apache::default_vhost: false
 site::profile::apache::vhosts:
   review:
index b58c086f7c4b9cf229dd722e3c8ed75841c6e24c..96eb710f9fb9f600e8386b4b6c68dadb9c5c9df9 100644 (file)
@@ -4,7 +4,7 @@ site::additional_classes:
   - site::profile::mcollective::common
   - site::profile::apache
 
-apache::mpm_module: worker
+
 site::profile::apache::pp_vhosts:
   rpm-repo:
     servername: rpm-repo.pixelpark.com
index 623d627c34373eaf0503939ed1e1460b835b5f03..6a7f0008cd6a1f0160f945647e92123399ac5ff6 100644 (file)
@@ -6,7 +6,7 @@ site::additional_classes:
   - apache::mod::wsgi
 
 apache::default_vhost: false
-apache::mpm_module: worker
+
 
 apache::mod::wsgi::wsgi_python_home: /www/apps/python-venv-portal-esysta-com
 
index 412a3b271674e2a38d68d29e6d1489f4ce6ee909..cc6ce0237cc1e121c878df125e8f2f17d4ff7444 100644 (file)
@@ -5,7 +5,7 @@ site::additional_classes:
   - logstash
 
 # Apache Konfiguration
-apache::mpm_module: worker
+
 apache::mod::worker::maxclients: 1400
 apache::mod::worker::threadsperchild: 60
 apache::mod::worker::maxrequestsperchild: 10000
index 87d23cbaf79ca72a4d6e0d92c7ead3598194c09d..19f41c4dbde272b0deceb47a01c2125bc3b70581 100644 (file)
@@ -20,7 +20,7 @@ site::profile::mysql_server::databases:
     user: qperior
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAoVSmZAyXGTeJsrvl1F4atzCPH5FfcxWY1ClriY6P8QbOCWpsJFAjHLzd79AipdYqALksULov9DbEZa/m3jZrI0yHZh3Lgy8sAw9/4yatHlruhlqlqlrR0S4pe0oHek7WodtdsdLvzlXw8Db2B2VIuyVdX4zuijzjeTv+to9oSxZPe2+1uqRSjPrzgGttOgA0e64oz6WroVszZ4ZC+h+MOlx3EjDn/dGG4qUYKui0iHOb5tgPnVJYPjgsXCNnbEd+7tTuYwxT+nBcF+cVocjUe8lGi6u3ccOUty8adzmIv6jO1ywqUgvmhoxiyFXPwSpfEMBSIZtPqsifzitgNMNwoTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC8l3Tj0bGfmQp3mb47BAb5gBA5eLQ53jViTAs6jdYQ9ayz]
 
-apache::mpm_module: worker
+
 apache::default_vhost: false
 
 repo::remi_php56: true
index 00956a32e701aed76eb883a6f1b8f5308db602bf..cde4637ad2184ddf99ec5148fb7b3679236cc9ff 100644 (file)
@@ -52,7 +52,7 @@ ntp::servers:
   - '1.centos.pool.ntp.org'
   - '2.centos.pool.ntp.org'
 
-apache::mpm_module: worker
+
 
 
 accounts::users:
index c05f26ef25f44f2da99dfcf7cc5fa06ceed61192..ce214999674b00d58bbd66d1a3c5fff57b3300c6 100644 (file)
@@ -44,7 +44,7 @@ site::additional_classes:
   - logstash
 
 apache::default_vhost: false
-apache::mpm_module: worker
+
 
 repo::remi_php56: true
 
index b0ddc3da0386fce70bf154f2026816b4a0719422..fbb083ea1cd28bad61616a36c6fb4805304b428f 100644 (file)
@@ -49,7 +49,7 @@ php::fpm::pools:
     ensure: absent
 
 apache::default_vhost: false
-apache::mpm_module: worker
+
 
 site::profile::apache::htdigest:
   server:
index 0ede1f8e6f5ca4deb34ef29cd01517dc70e1ba6a..494d0fe2fa09989cc7a18b4b2e0c32e6ab7c5bd6 100644 (file)
@@ -41,7 +41,7 @@ php::fpm::pools:
     ensure: absent
 
 apache::default_vhost: false
-apache::mpm_module: worker
+
 
 site::profile::apache::htdigest:
   server:
index 7f9e09b0f13d72583642ababf6bd3b678beeb4e7..e7814b1c07bf0dd3b88b11d117484e879a0bffe1 100644 (file)
@@ -19,7 +19,7 @@ site::profile::mysql_server::databases:
 
 mysql::server::remove_default_accounts: true
 
-apache::mpm_module: worker
+
 apache::default_vhost: false
 
 site::profile::wordpress::projects:
index cef7afd694e581441e0a3cf15f857fbef98ed301..12b5fe5396c20a7f7a49bd62be2a2f33f2bc5d19 100644 (file)
@@ -3,7 +3,7 @@ site::role: base
 site::additional_classes:
   - site::profile::wordpress
 
-apache::mpm_module: worker
+
 apache::default_vhost: false
 
 site::profile::wordpress::projects:
index 46a0b81ae87353da08d9905ff4b1a66d27aedc07..4ace8bca565afa854c02c77c5e8e064a2f978fe6 100644 (file)
@@ -4,7 +4,7 @@ accounts::users:
     apply: true
     groups: 'pixel'
 
-apache::mpm_module: worker
+
 
 repo::remi_php56: true
 
index dbc1711fdc1710424f42b8e6c148ca8b526bf942..f6bea5dc192656d5e0caceb3a5f46ae507203ac7 100644 (file)
@@ -6,7 +6,7 @@ accounts::users:
     group: apache
 
 apache::default_vhost: false
-apache::mpm_module: worker
+
 
 repo::remi_php56: true