From: Philipp Dallig Date: Fri, 21 Oct 2016 12:34:19 +0000 (+0200) Subject: remove duplicates apache mpm X-Git-Tag: v0.1.0~3926 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=ae969cd5c3172f143e271b179371798b1e308482;p=pixelpark%2Fhiera.git remove duplicates apache mpm --- diff --git a/customer/bkk-vbu/common.yaml b/customer/bkk-vbu/common.yaml index d2641ca0..e5c16473 100644 --- a/customer/bkk-vbu/common.yaml +++ b/customer/bkk-vbu/common.yaml @@ -39,7 +39,6 @@ site::additional_classes: - site::profile::symfony apache::default_vhost: false -apache::mpm_module: worker repo::remi_php56: true diff --git a/customer/bmas-sgb2/dev-sgb2-info.pixelpark.net.yaml b/customer/bmas-sgb2/dev-sgb2-info.pixelpark.net.yaml index 1b9754bb..1d465b23 100644 --- a/customer/bmas-sgb2/dev-sgb2-info.pixelpark.net.yaml +++ b/customer/bmas-sgb2/dev-sgb2-info.pixelpark.net.yaml @@ -24,7 +24,6 @@ site::additional_classes: - site::profile::mysql_server repo::remi_php56: true -apache::mpm_module: worker site::profile::apache::htdigest: server: diff --git a/customer/bmas-sgb2/test-web01-sgb2-info.pixelpark.net.yaml b/customer/bmas-sgb2/test-web01-sgb2-info.pixelpark.net.yaml index d943c2b9..8beb2e7d 100644 --- a/customer/bmas-sgb2/test-web01-sgb2-info.pixelpark.net.yaml +++ b/customer/bmas-sgb2/test-web01-sgb2-info.pixelpark.net.yaml @@ -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: {} diff --git a/customer/bmas-sgb2/web01-sgb2-info.pixelpark.net.yaml b/customer/bmas-sgb2/web01-sgb2-info.pixelpark.net.yaml index 6f728c36..19413bf9 100644 --- a/customer/bmas-sgb2/web01-sgb2-info.pixelpark.net.yaml +++ b/customer/bmas-sgb2/web01-sgb2-info.pixelpark.net.yaml @@ -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 diff --git a/customer/bmas-typo3/common.yaml b/customer/bmas-typo3/common.yaml index 7869de10..137c9f5d 100644 --- a/customer/bmas-typo3/common.yaml +++ b/customer/bmas-typo3/common.yaml @@ -4,7 +4,7 @@ accounts::users: apply: true group: apache -apache::mpm_module: worker + repo::remi_php56: true diff --git a/customer/bmbf/common.yaml b/customer/bmbf/common.yaml index 90726ede..97506e76 100644 --- a/customer/bmbf/common.yaml +++ b/customer/bmbf/common.yaml @@ -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: diff --git a/customer/bmf-datacenter/common.yaml b/customer/bmf-datacenter/common.yaml index a531e645..b4ff2d79 100644 --- a/customer/bmf-datacenter/common.yaml +++ b/customer/bmf-datacenter/common.yaml @@ -23,7 +23,7 @@ site::additional_classes: repo::remi_php56: true apache::default_vhost: false -apache::mpm_module: worker + php::fpm::pools: www: diff --git a/customer/bmw/common.yaml b/customer/bmw/common.yaml index 04276944..69555b77 100644 --- a/customer/bmw/common.yaml +++ b/customer/bmw/common.yaml @@ -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' diff --git a/customer/bmwi-gruenderwoche/common.yaml b/customer/bmwi-gruenderwoche/common.yaml index 7af40c06..0ff25eeb 100644 --- a/customer/bmwi-gruenderwoche/common.yaml +++ b/customer/bmwi-gruenderwoche/common.yaml @@ -27,7 +27,7 @@ site::additional_classes: - apache::mod::headers apache::default_vhost: false -apache::mpm_module: worker + repo::remi_php70: true diff --git a/customer/buschjaeger/test-web-buschjaeger-de.pixelpark.net.yaml b/customer/buschjaeger/test-web-buschjaeger-de.pixelpark.net.yaml index 6bde8ef5..a15a4a30 100644 --- a/customer/buschjaeger/test-web-buschjaeger-de.pixelpark.net.yaml +++ b/customer/buschjaeger/test-web-buschjaeger-de.pixelpark.net.yaml @@ -16,7 +16,7 @@ accounts::users: apply: true apache::default_vhost: false -apache::mpm_module: worker + php::dev: true php::pear: true diff --git a/customer/buschjaeger/web01-buschjaeger-de.pixelpark.net.yaml b/customer/buschjaeger/web01-buschjaeger-de.pixelpark.net.yaml index b17cd1f9..f10d0b27 100644 --- a/customer/buschjaeger/web01-buschjaeger-de.pixelpark.net.yaml +++ b/customer/buschjaeger/web01-buschjaeger-de.pixelpark.net.yaml @@ -15,7 +15,7 @@ accounts::users: apply: true apache::default_vhost: false -apache::mpm_module: worker + repo::remi_php70: true diff --git a/customer/buschjaeger/web02-buschjaeger-de.pixelpark.net.yaml b/customer/buschjaeger/web02-buschjaeger-de.pixelpark.net.yaml index a3e3415c..09e33e4e 100644 --- a/customer/buschjaeger/web02-buschjaeger-de.pixelpark.net.yaml +++ b/customer/buschjaeger/web02-buschjaeger-de.pixelpark.net.yaml @@ -15,7 +15,7 @@ accounts::users: apply: true apache::default_vhost: false -apache::mpm_module: worker + repo::remi_php70: true diff --git a/customer/dbad/common.yaml b/customer/dbad/common.yaml index b210a28a..9a43db29 100644 --- a/customer/dbad/common.yaml +++ b/customer/dbad/common.yaml @@ -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 diff --git a/customer/dpdhl/development.yaml b/customer/dpdhl/development.yaml index 84266cf3..2c4c8aa9 100644 --- a/customer/dpdhl/development.yaml +++ b/customer/dpdhl/development.yaml @@ -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: diff --git a/customer/emperra/www-tmp-emperra-com.pixelpark.net.yaml b/customer/emperra/www-tmp-emperra-com.pixelpark.net.yaml index 9ddb810b..da32d52f 100644 --- a/customer/emperra/www-tmp-emperra-com.pixelpark.net.yaml +++ b/customer/emperra/www-tmp-emperra-com.pixelpark.net.yaml @@ -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 diff --git a/customer/joml/common.yaml b/customer/joml/common.yaml index 866dfe9e..3ba02981 100644 --- a/customer/joml/common.yaml +++ b/customer/joml/common.yaml @@ -1,7 +1,7 @@ --- apache::default_vhost: false -apache::mpm_module: worker + accounts::users: service.typo3: diff --git a/customer/kaufland/stundenplan-kaufland-de.pixelpark.net.yaml b/customer/kaufland/stundenplan-kaufland-de.pixelpark.net.yaml index 47a533a2..b8029174 100644 --- a/customer/kaufland/stundenplan-kaufland-de.pixelpark.net.yaml +++ b/customer/kaufland/stundenplan-kaufland-de.pixelpark.net.yaml @@ -31,7 +31,7 @@ php::fpm::pools: ensure: absent apache::default_vhost: false -apache::mpm_module: worker + site::profile::apache::htdigest: stundenplan: diff --git a/customer/kutchenhaus/common.yaml b/customer/kutchenhaus/common.yaml index dbc1711f..f6bea5dc 100644 --- a/customer/kutchenhaus/common.yaml +++ b/customer/kutchenhaus/common.yaml @@ -6,7 +6,7 @@ accounts::users: group: apache apache::default_vhost: false -apache::mpm_module: worker + repo::remi_php56: true diff --git a/customer/lbs/dev-red02-lbs-de.pixelpark.net.yaml b/customer/lbs/dev-red02-lbs-de.pixelpark.net.yaml index bf8c7479..e531cffc 100644 --- a/customer/lbs/dev-red02-lbs-de.pixelpark.net.yaml +++ b/customer/lbs/dev-red02-lbs-de.pixelpark.net.yaml @@ -39,7 +39,7 @@ accounts::users: group: "fs5" apache::default_vhost: false -apache::mpm_module: worker + site::profile::apache::vhosts: dev-red02-lbs-de: diff --git a/customer/lekkerland/dev-lekker-01-hy01.pixelpark.net.yaml b/customer/lekkerland/dev-lekker-01-hy01.pixelpark.net.yaml index 701090d3..7de21ad0 100644 --- a/customer/lekkerland/dev-lekker-01-hy01.pixelpark.net.yaml +++ b/customer/lekkerland/dev-lekker-01-hy01.pixelpark.net.yaml @@ -18,7 +18,7 @@ accounts::users: group: apache apache::default_vhost: false -apache::mpm_module: worker + site::profile::apache::htdigest: lekkerland: diff --git a/customer/lekkerland/dev-lekker-02-hy01.pixelpark.net.yaml b/customer/lekkerland/dev-lekker-02-hy01.pixelpark.net.yaml index d07d5dfe..a96b0e17 100644 --- a/customer/lekkerland/dev-lekker-02-hy01.pixelpark.net.yaml +++ b/customer/lekkerland/dev-lekker-02-hy01.pixelpark.net.yaml @@ -18,7 +18,7 @@ accounts::users: group: apache apache::default_vhost: false -apache::mpm_module: worker + site::profile::apache::htdigest: lekkerland: diff --git a/customer/linde/production.yaml b/customer/linde/production.yaml index 72df174f..b8a1418a 100644 --- a/customer/linde/production.yaml +++ b/customer/linde/production.yaml @@ -10,7 +10,7 @@ logstash::generic_resource: - "%{customer}" - "%{environment}" -apache::mpm_module: worker + apache::default_vhost: false apache::purge_configs: false diff --git a/customer/linde/test.yaml b/customer/linde/test.yaml index 723c7582..42ed5149 100644 --- a/customer/linde/test.yaml +++ b/customer/linde/test.yaml @@ -10,7 +10,7 @@ logstash::generic_resource: - "%{customer}" - "%{environment}" -apache::mpm_module: worker + apache::default_vhost: false apache::purge_configs: false diff --git a/customer/mbvd-fashionweek/common.yaml b/customer/mbvd-fashionweek/common.yaml index d12bde65..470a1f8c 100644 --- a/customer/mbvd-fashionweek/common.yaml +++ b/customer/mbvd-fashionweek/common.yaml @@ -17,7 +17,7 @@ accounts::users: group: apache apache::default_vhost: false -apache::mpm_module: worker + repo::remi_php56: true diff --git a/customer/mbvd-ngcc/common.yaml b/customer/mbvd-ngcc/common.yaml index 601164f8..56d43065 100644 --- a/customer/mbvd-ngcc/common.yaml +++ b/customer/mbvd-ngcc/common.yaml @@ -42,4 +42,4 @@ mysql::server::override_options: collation-server: utf8_general_ci apache::default_vhost: false -apache::mpm_module: worker + diff --git a/customer/mbvd-service-and-smile/common.yaml b/customer/mbvd-service-and-smile/common.yaml index 28c45d4f..43ce440b 100644 --- a/customer/mbvd-service-and-smile/common.yaml +++ b/customer/mbvd-service-and-smile/common.yaml @@ -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 diff --git a/customer/mbvd-transporter-training/common.yaml b/customer/mbvd-transporter-training/common.yaml index f51e74fb..842a90f8 100644 --- a/customer/mbvd-transporter-training/common.yaml +++ b/customer/mbvd-transporter-training/common.yaml @@ -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 diff --git a/customer/mbvd/int-odt-daimler-com.pixelpark.net.yaml b/customer/mbvd/int-odt-daimler-com.pixelpark.net.yaml index db3e7623..b01e040a 100644 --- a/customer/mbvd/int-odt-daimler-com.pixelpark.net.yaml +++ b/customer/mbvd/int-odt-daimler-com.pixelpark.net.yaml @@ -57,7 +57,7 @@ accounts::users: sudo: true apache::default_vhost: false -apache::mpm_module: worker + site::profile::apache::vhosts: int-odt-daimler-com: diff --git a/customer/mbvd/odt02-daimler-com.pixelpark.net.yaml b/customer/mbvd/odt02-daimler-com.pixelpark.net.yaml index 74a0e7ee..277afa21 100644 --- a/customer/mbvd/odt02-daimler-com.pixelpark.net.yaml +++ b/customer/mbvd/odt02-daimler-com.pixelpark.net.yaml @@ -29,7 +29,7 @@ accounts::users: apply: true apache::default_vhost: false -apache::mpm_module: worker + site::profile::apache::vhosts: odt.daimler.com: diff --git a/customer/mbvd/web01-prototyp-mbvd-de.pixelpark.net.yaml b/customer/mbvd/web01-prototyp-mbvd-de.pixelpark.net.yaml index 6d32e3b0..e96afde6 100644 --- a/customer/mbvd/web01-prototyp-mbvd-de.pixelpark.net.yaml +++ b/customer/mbvd/web01-prototyp-mbvd-de.pixelpark.net.yaml @@ -18,7 +18,7 @@ accounts::users: group: apache apache::default_vhost: false -apache::mpm_module: worker + site::profile::apache::htdigest: prototyp: diff --git a/customer/pfizer-schlaganfall/web-schlaganfall-verhindern-de.pixelpark.net.yaml b/customer/pfizer-schlaganfall/web-schlaganfall-verhindern-de.pixelpark.net.yaml index 81f9528d..e4100c7f 100644 --- a/customer/pfizer-schlaganfall/web-schlaganfall-verhindern-de.pixelpark.net.yaml +++ b/customer/pfizer-schlaganfall/web-schlaganfall-verhindern-de.pixelpark.net.yaml @@ -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 index d92f191c..00000000 --- a/customer/pfizer/common.yaml +++ /dev/null @@ -1,2 +0,0 @@ ---- -apache::mpm_module: worker \ No newline at end of file diff --git a/customer/pixelpark/foreman01.pixelpark.com.yaml b/customer/pixelpark/foreman01.pixelpark.com.yaml index 834a44e6..befd5787 100644 --- a/customer/pixelpark/foreman01.pixelpark.com.yaml +++ b/customer/pixelpark/foreman01.pixelpark.com.yaml @@ -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 diff --git a/customer/pixelpark/foreman02.pixelpark.com.yaml b/customer/pixelpark/foreman02.pixelpark.com.yaml index c5512080..17857dc0 100644 --- a/customer/pixelpark/foreman02.pixelpark.com.yaml +++ b/customer/pixelpark/foreman02.pixelpark.com.yaml @@ -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' diff --git a/customer/pixelpark/pass.pixelpark.com.yaml b/customer/pixelpark/pass.pixelpark.com.yaml index c131a3bb..9fe5375c 100644 --- a/customer/pixelpark/pass.pixelpark.com.yaml +++ b/customer/pixelpark/pass.pixelpark.com.yaml @@ -8,7 +8,7 @@ site::additional_packages: php-ldap: {} apache::default_vhost: false -apache::mpm_module: worker + repo::remi_php70: true diff --git a/customer/pixelpark/puppetmaster01.pixelpark.com.yaml b/customer/pixelpark/puppetmaster01.pixelpark.com.yaml index 14ab5798..89080811 100644 --- a/customer/pixelpark/puppetmaster01.pixelpark.com.yaml +++ b/customer/pixelpark/puppetmaster01.pixelpark.com.yaml @@ -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 diff --git a/customer/pixelpark/repo.pixelpark.com.yaml b/customer/pixelpark/repo.pixelpark.com.yaml index da45eb4d..dfe1ae25 100644 --- a/customer/pixelpark/repo.pixelpark.com.yaml +++ b/customer/pixelpark/repo.pixelpark.com.yaml @@ -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: diff --git a/customer/pixelpark/review.pixelpark.com.yaml b/customer/pixelpark/review.pixelpark.com.yaml index d7b5feaa..e3e9a0c1 100644 --- a/customer/pixelpark/review.pixelpark.com.yaml +++ b/customer/pixelpark/review.pixelpark.com.yaml @@ -5,7 +5,7 @@ site::additional_classes: - gerrit - logstash -apache::mpm_module: worker + apache::default_vhost: false site::profile::apache::vhosts: review: diff --git a/customer/pixelpark/rpm-repo.pixelpark.com.yaml b/customer/pixelpark/rpm-repo.pixelpark.com.yaml index b58c086f..96eb710f 100644 --- a/customer/pixelpark/rpm-repo.pixelpark.com.yaml +++ b/customer/pixelpark/rpm-repo.pixelpark.com.yaml @@ -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 diff --git a/customer/pixelpark/vm04-olli.pixelpark.com.yaml b/customer/pixelpark/vm04-olli.pixelpark.com.yaml index 623d627c..6a7f0008 100644 --- a/customer/pixelpark/vm04-olli.pixelpark.com.yaml +++ b/customer/pixelpark/vm04-olli.pixelpark.com.yaml @@ -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 diff --git a/customer/pixelpark/web-inhalte.pixelpark.net.yaml b/customer/pixelpark/web-inhalte.pixelpark.net.yaml index 412a3b27..cc6ce023 100644 --- a/customer/pixelpark/web-inhalte.pixelpark.net.yaml +++ b/customer/pixelpark/web-inhalte.pixelpark.net.yaml @@ -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 diff --git a/customer/q_perior/test-www-q-perior.pixelpark.net.yaml b/customer/q_perior/test-www-q-perior.pixelpark.net.yaml index 87d23cba..19f41c4d 100644 --- a/customer/q_perior/test-www-q-perior.pixelpark.net.yaml +++ b/customer/q_perior/test-www-q-perior.pixelpark.net.yaml @@ -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 diff --git a/customer/sirona-aem/common.yaml b/customer/sirona-aem/common.yaml index 00956a32..cde4637a 100644 --- a/customer/sirona-aem/common.yaml +++ b/customer/sirona-aem/common.yaml @@ -52,7 +52,7 @@ ntp::servers: - '1.centos.pool.ntp.org' - '2.centos.pool.ntp.org' -apache::mpm_module: worker + accounts::users: diff --git a/customer/spd/common.yaml b/customer/spd/common.yaml index c05f26ef..ce214999 100644 --- a/customer/spd/common.yaml +++ b/customer/spd/common.yaml @@ -44,7 +44,7 @@ site::additional_classes: - logstash apache::default_vhost: false -apache::mpm_module: worker + repo::remi_php56: true diff --git a/customer/spk-blog/dev-sparkasseblog01.sparkasse.local.yaml b/customer/spk-blog/dev-sparkasseblog01.sparkasse.local.yaml index b0ddc3da..fbb083ea 100644 --- a/customer/spk-blog/dev-sparkasseblog01.sparkasse.local.yaml +++ b/customer/spk-blog/dev-sparkasseblog01.sparkasse.local.yaml @@ -49,7 +49,7 @@ php::fpm::pools: ensure: absent apache::default_vhost: false -apache::mpm_module: worker + site::profile::apache::htdigest: server: diff --git a/customer/spk-blog/sparkasseblog01.sparkasse.local.yaml b/customer/spk-blog/sparkasseblog01.sparkasse.local.yaml index 0ede1f8e..494d0fe2 100644 --- a/customer/spk-blog/sparkasseblog01.sparkasse.local.yaml +++ b/customer/spk-blog/sparkasseblog01.sparkasse.local.yaml @@ -41,7 +41,7 @@ php::fpm::pools: ensure: absent apache::default_vhost: false -apache::mpm_module: worker + site::profile::apache::htdigest: server: diff --git a/customer/spk-microsites/dev-microsites01-sparkasse-de.pixelpark.net.yaml b/customer/spk-microsites/dev-microsites01-sparkasse-de.pixelpark.net.yaml index 7f9e09b0..e7814b1c 100644 --- a/customer/spk-microsites/dev-microsites01-sparkasse-de.pixelpark.net.yaml +++ b/customer/spk-microsites/dev-microsites01-sparkasse-de.pixelpark.net.yaml @@ -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: diff --git a/customer/spk-microsites/microsites01-sparkasse-de.pixelpark.net.yaml b/customer/spk-microsites/microsites01-sparkasse-de.pixelpark.net.yaml index cef7afd6..12b5fe53 100644 --- a/customer/spk-microsites/microsites01-sparkasse-de.pixelpark.net.yaml +++ b/customer/spk-microsites/microsites01-sparkasse-de.pixelpark.net.yaml @@ -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: diff --git a/customer/webstats/common.yaml b/customer/webstats/common.yaml index 46a0b81a..4ace8bca 100644 --- a/customer/webstats/common.yaml +++ b/customer/webstats/common.yaml @@ -4,7 +4,7 @@ accounts::users: apply: true groups: 'pixel' -apache::mpm_module: worker + repo::remi_php56: true diff --git a/customer/zf/common.yaml b/customer/zf/common.yaml index dbc1711f..f6bea5dc 100644 --- a/customer/zf/common.yaml +++ b/customer/zf/common.yaml @@ -6,7 +6,7 @@ accounts::users: group: apache apache::default_vhost: false -apache::mpm_module: worker + repo::remi_php56: true