From 9a4ffaf1058a3454ae47be2225f882f5c187ea0a Mon Sep 17 00:00:00 2001 From: Stefan Teschke Date: Tue, 6 Jun 2017 10:48:16 +0200 Subject: [PATCH] Config files fixes --- .../aamt/web-aamt-facebook.pixelpark.net.yaml | 20 +++++++------- customer/basf/development.yaml | 6 ++--- ...author-dispatcher01-bbm.pixelpark.net.yaml | 2 +- .../dev-author01-bbm.pixelpark.net.yaml | 1 - .../dev-dispatcher01-bbm.pixelpark.net.yaml | 2 +- customer/bbm_aem/development.yaml | 13 +++++----- ...1-meine-krankenkasse-de.pixelpark.net.yaml | 20 +++++++------- customer/bmas-anmeldung/common.yaml | 2 +- ...www-anmeldung02-bmas-de.pixelpark.net.yaml | 2 +- .../bmas-g20/www-g20-bmas.pixelpark.net.yaml | 4 +-- .../dev-sgb2-info.pixelpark.net.yaml | 8 +++--- customer/bmas-sgb2/production.yaml | 2 +- .../test-web01-sgb2-info.pixelpark.net.yaml | 26 +++++++++---------- customer/bmas-sgb2/test.yaml | 2 +- .../web01-sgb2-info.pixelpark.net.yaml | 8 +++--- customer/bmas-typo3/common.yaml | 2 +- customer/bmas-typo3/production.yaml | 20 +++++++------- customer/bmas-typo3/test.yaml | 2 +- .../bmas/db01-bmas-gsb6-de.pixelpark.net.yaml | 2 +- .../bmas/db02-bmas-gsb6-de.pixelpark.net.yaml | 2 +- .../master01-bmas-gsb6-de.pixelpark.net.yaml | 1 - .../slave01-bmas-gsb6-de.pixelpark.net.yaml | 1 - .../test-db01-bmas-gsb6-de.pixelpark.net.yaml | 2 +- .../test-db02-bmas-gsb6-de.pixelpark.net.yaml | 2 +- .../bmas/test-lb-bmas-de.pixelpark.net.yaml | 2 +- ...t-master01-bmas-gsb6-de.pixelpark.net.yaml | 1 - ...st-slave01-bmas-gsb6-de.pixelpark.net.yaml | 1 - ...t-www-anmeldung-bmas-de.pixelpark.net.yaml | 7 +++-- ...test-www01-bmas-gsb6-de.pixelpark.net.yaml | 1 - ...test-www02-bmas-gsb6-de.pixelpark.net.yaml | 1 - customer/bmas/test.yaml | 1 + .../www-anmeldung-bmas-de.pixelpark.net.yaml | 2 +- .../www01-bmas-gsb6-de.pixelpark.net.yaml | 1 - customer/bmbf/common.yaml | 7 +++-- .../bmbf/test-web02-bmbf.pixelpark.net.yaml | 10 +++---- customer/bmbf/web02-bmbf.pixelpark.net.yaml | 12 ++++----- customer/bmf-datacenter/common.yaml | 2 +- customer/bmf-datacenter/production.yaml | 8 +++--- customer/bmf-europa/common.yaml | 2 +- ...web-so-klingt-europa-de.pixelpark.net.yaml | 2 +- customer/bmf/db01-bmf-de.pixelpark.net.yaml | 7 ++--- customer/bmf/db02-bmf-de.pixelpark.net.yaml | 6 ++--- .../bmf/db02-red-bmf-de.pixelpark.net.yaml | 4 +-- customer/bmf/db03-bmf-de.pixelpark.net.yaml | 6 ++--- customer/bmf/dev-bmf-de.pixelpark.net.yaml | 2 +- customer/bmf/development.yaml | 2 +- .../bmf/master01-bmf-de.pixelpark.net.yaml | 2 +- customer/bmf/red-bmf-de.pixelpark.net.yaml | 4 +-- .../bmf/slave01-bmf-de.pixelpark.net.yaml | 2 +- .../bmf/test-db01-bmf-de.pixelpark.net.yaml | 6 ++--- .../bmf/test-db02-bmf-de.pixelpark.net.yaml | 6 ++--- .../bmf/test-db03-bmf-de.pixelpark.net.yaml | 6 ++--- .../test-master01-bmf-de.pixelpark.net.yaml | 2 +- .../test-slave01-bmf-de.pixelpark.net.yaml | 2 +- .../bmf/test-www01-bmf-de.pixelpark.net.yaml | 2 +- .../bmf/test-www02-bmf-de.pixelpark.net.yaml | 2 +- customer/bmf/test.yaml | 1 + customer/bmwi-gruenderwoche/production.yaml | 8 +++--- customer/bmwi-gruenderwoche/test.yaml | 2 +- customer/bmwi/db01-bmwi-de.pixelpark.net.yaml | 2 +- customer/bmwi/db02-bmwi-de.pixelpark.net.yaml | 2 +- customer/bmwi/dev-bmwi.pixelpark.net.yaml | 1 - .../bmwi/dev-db-bmwi-de.pixelpark.net.yaml | 2 +- .../bmwi/master01-bmwi-de.pixelpark.net.yaml | 1 - .../bmwi/slave01-bmwi-de.pixelpark.net.yaml | 6 ++--- .../bmwi/test-db01-bmwi-de.pixelpark.net.yaml | 2 +- .../bmwi/test-db02-bmwi-de.pixelpark.net.yaml | 2 +- .../test-listserv-bmwi-de.pixelpark.net.yaml | 3 +-- customer/bmwi/test.yaml | 1 + .../bmwi/www01-bmwi-de.pixelpark.net.yaml | 1 - customer/buschjaeger/common.yaml | 2 +- .../db02-buschjaeger-de.pixelpark.net.yaml | 1 - customer/buschjaeger/production.yaml | 12 ++++----- .../web01-buschjaeger-de.pixelpark.net.yaml | 2 +- .../web02-buschjaeger-de.pixelpark.net.yaml | 2 +- .../cosar-centos.pixelpark.com.yaml | 10 +++---- modules/apache.yaml | 2 +- modules/epel.yaml | 2 +- modules/mcollective.yaml | 2 +- modules/mysql.yaml | 6 +---- modules/ntp.yaml | 2 +- modules/php.yaml | 2 +- modules/repo.yaml | 2 +- modules/rvm.yaml | 2 +- modules/zabbix.yaml | 2 +- 85 files changed, 171 insertions(+), 187 deletions(-) diff --git a/customer/aamt/web-aamt-facebook.pixelpark.net.yaml b/customer/aamt/web-aamt-facebook.pixelpark.net.yaml index 7828c06f..4c157646 100644 --- a/customer/aamt/web-aamt-facebook.pixelpark.net.yaml +++ b/customer/aamt/web-aamt-facebook.pixelpark.net.yaml @@ -36,15 +36,15 @@ infra::profile::apache::pp_vhosts: allow_override: - All directoryindex: 'index.php index.html' -# - location1: -# provider: location -# path: '/' -# auth_type: Digest -# auth_name: server -# auth_digest_provider: file -# auth_digest_algorithm: MD5 -# auth_user_file: '/etc/httpd/htdigest' -# auth_require: 'valid-user' + # - location1: + # provider: location + # path: '/' + # auth_type: Digest + # auth_name: server + # auth_digest_provider: file + # auth_digest_algorithm: MD5 + # auth_user_file: '/etc/httpd/htdigest' + # auth_require: 'valid-user' test-aamt-facebook: servername: test-aamt-facebook.pixelpark.net serveraliases: @@ -89,4 +89,4 @@ infra::profile::apache_php::fpm_pool: php::fpm::pools: www: - ensure: absent \ No newline at end of file + ensure: absent diff --git a/customer/basf/development.yaml b/customer/basf/development.yaml index 3534ca5d..6800549e 100644 --- a/customer/basf/development.yaml +++ b/customer/basf/development.yaml @@ -7,14 +7,14 @@ accounts::users: apply: true sudo: true # -#infra::additional_classes: +# infra::additional_classes: # - apache::mod::headers # - infra::profile::apache # - apache::mod::proxy_ajp # - infra::profile::mysql_server # -#infra::profile::apache::pp_vhosts: -####test-dev-basftoday: +# infra::profile::apache::pp_vhosts: +# ###test-dev-basftoday: # servername: test-dev-basftoday-de.pixelpark.net # ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem' # ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem' diff --git a/customer/bbm_aem/dev-author-dispatcher01-bbm.pixelpark.net.yaml b/customer/bbm_aem/dev-author-dispatcher01-bbm.pixelpark.net.yaml index 0776febd..8d5c88e0 100644 --- a/customer/bbm_aem/dev-author-dispatcher01-bbm.pixelpark.net.yaml +++ b/customer/bbm_aem/dev-author-dispatcher01-bbm.pixelpark.net.yaml @@ -1,4 +1,4 @@ --- aem::dispatcher::proxy_host: dev-author01-bbm.pixelpark.net aem::dispatcher::proxy_port: 4502 -aem::dispatcher::type: author \ No newline at end of file +aem::dispatcher::type: author diff --git a/customer/bbm_aem/dev-author01-bbm.pixelpark.net.yaml b/customer/bbm_aem/dev-author01-bbm.pixelpark.net.yaml index 1c593e7b..5d064c75 100644 --- a/customer/bbm_aem/dev-author01-bbm.pixelpark.net.yaml +++ b/customer/bbm_aem/dev-author01-bbm.pixelpark.net.yaml @@ -2,4 +2,3 @@ infra::additional_classes: - aem::author - aem - diff --git a/customer/bbm_aem/dev-dispatcher01-bbm.pixelpark.net.yaml b/customer/bbm_aem/dev-dispatcher01-bbm.pixelpark.net.yaml index 4b9ae2ee..fc11f171 100644 --- a/customer/bbm_aem/dev-dispatcher01-bbm.pixelpark.net.yaml +++ b/customer/bbm_aem/dev-dispatcher01-bbm.pixelpark.net.yaml @@ -1,4 +1,4 @@ --- infra::role: base aem::dispatcher::proxy_host: dev-publish01-bbm.pixelpark.net -aem::dispatcher::proxy_port: 4503 \ No newline at end of file +aem::dispatcher::proxy_port: 4503 diff --git a/customer/bbm_aem/development.yaml b/customer/bbm_aem/development.yaml index 54dcf0f4..9df5e238 100644 --- a/customer/bbm_aem/development.yaml +++ b/customer/bbm_aem/development.yaml @@ -7,8 +7,8 @@ aem::author::install_mode: 'quickstart' aem::author::install_options: download_type: maven download_uri: "com.pixelpark.aem.bbm:aem-quickstart:6.0:jar" -#aem::author::install_mode: 'backup' -#aem::author::install_options: +# aem::author::install_mode: 'backup' +# aem::author::install_options: # download_type: 'wget' # download_uri: 'http://tools-bbm.pixelpark.net:8081/nexus/service/local/repositories/thirdparty/content/com/pixelpark/aem/bbm/aem_base_author/0.1.0/aem_base_author-0.1.0.tar.gz' @@ -26,8 +26,8 @@ aem::publish::install_mode: 'quickstart' aem::publish::install_options: download_type: maven download_uri: "com.pixelpark.aem.bbm:aem-quickstart:6.0:jar" -#aem::publish::install_mode: 'backup' -#aem::publish::install_options: +# aem::publish::install_mode: 'backup' +# aem::publish::install_options: # download_type: 'wget' # download_uri: 'http://tools-bbm.pixelpark.net:8081/nexus/service/local/repositories/thirdparty/content/com/pixelpark/aem/bbm/aem_base_publish/0.1.0/aem_base_publish-0.1.0.tar.gz' @@ -40,7 +40,7 @@ aem::publish::packages: aem::manage_oracle_java: true aem::base_path: '/opt/aem' aem::maven::install: true -aem::maven::repos: +aem::maven::repos: - "id": "pixelpark.nexus" "url": "http://tools-bbm.pixelpark.net:8081/nexus/content/repositories/thirdparty/" @@ -67,7 +67,6 @@ aem::domain_mappings: dev-site03-bbm.pixelpark.net: path: "/content/geometrixx-outdoors" default_lang: en - aem::hosts: dev-publish01-bbm.pixelpark.net: ip: '77.74.232.106' @@ -84,4 +83,4 @@ aem::hosts: dev-dispatcher02-bbm.pixelpark.net: ip: '77.74.232.107' host_aliases: - - flush02 \ No newline at end of file + - flush02 diff --git a/customer/bkk-vbu/dev-web01-meine-krankenkasse-de.pixelpark.net.yaml b/customer/bkk-vbu/dev-web01-meine-krankenkasse-de.pixelpark.net.yaml index 0e283477..7b1d5970 100644 --- a/customer/bkk-vbu/dev-web01-meine-krankenkasse-de.pixelpark.net.yaml +++ b/customer/bkk-vbu/dev-web01-meine-krankenkasse-de.pixelpark.net.yaml @@ -64,7 +64,7 @@ infra::profile::apache::pp_vhosts: - FollowSymLinks - MultiViews allow_override: - - None + - None - preapproot: provider: directory path: '/var/www/bkk-express-proxy' @@ -100,10 +100,10 @@ infra::profile::apache::pp_vhosts: 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' -# headers: -# - 'set X-Frame-Options: sameorigin' -# - 'set X-XSS-Protection: "1; mode=block"' -# - 'set X-Content-Type-Options: nosniff' + # headers: + # - 'set X-Frame-Options: sameorigin' + # - 'set X-XSS-Protection: "1; mode=block"' + # - 'set X-Content-Type-Options: nosniff' headers_ssl: - 'always set Strict-Transport-Security "max-age=31556926"' custom_fragment: | @@ -126,12 +126,12 @@ infra::profile::apache::pp_vhosts: - FollowSymLinks - MultiViews allow_override: - - None + - None - preapproot: provider: directory path: '/var/www/bkk-imagetool' options: - - None + - None infra::profile::typo3::projects: cms01: @@ -145,7 +145,7 @@ infra::profile::typo3::projects: 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' -# redirect_dest_non_ssl: 'https://dev-cms01-meine-krankenkasse-de.pixelpark.net/' + # redirect_dest_non_ssl: 'https://dev-cms01-meine-krankenkasse-de.pixelpark.net/' user: deploy.vogel mode: '2775' @@ -158,7 +158,7 @@ infra::profile::symfony::projects: 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' -# redirect_dest_non_ssl: 'https://dev-member01-meine-krankenkasse-de.pixelpark.net' + # redirect_dest_non_ssl: 'https://dev-member01-meine-krankenkasse-de.pixelpark.net' user: deploy.vogel mode: '2775' setenv: @@ -173,7 +173,7 @@ infra::profile::symfony::projects: 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' -# redirect_dest_non_ssl: 'https://dev-info01-meine-krankenkasse-de.pixelpark.net' + # redirect_dest_non_ssl: 'https://dev-info01-meine-krankenkasse-de.pixelpark.net' user: deploy.vogel mode: '2775' setenv: diff --git a/customer/bmas-anmeldung/common.yaml b/customer/bmas-anmeldung/common.yaml index 16a8e5c2..95cb9c29 100644 --- a/customer/bmas-anmeldung/common.yaml +++ b/customer/bmas-anmeldung/common.yaml @@ -6,4 +6,4 @@ accounts::users: apply: true sudo: true -mcollective::core_libdir: '/usr/share/mcollective/plugins/' \ No newline at end of file +mcollective::core_libdir: '/usr/share/mcollective/plugins/' diff --git a/customer/bmas-anmeldung/test-www-anmeldung02-bmas-de.pixelpark.net.yaml b/customer/bmas-anmeldung/test-www-anmeldung02-bmas-de.pixelpark.net.yaml index df1f8589..1b083d9d 100644 --- a/customer/bmas-anmeldung/test-www-anmeldung02-bmas-de.pixelpark.net.yaml +++ b/customer/bmas-anmeldung/test-www-anmeldung02-bmas-de.pixelpark.net.yaml @@ -11,7 +11,7 @@ infra::profile::apache::pp_vhosts: serveraliases: - test-www-anmeldung02-bmas-de.pixelpark.net cert_servername: 'wildcard.pixelpark.net' - cert_customer: 'pixelpark' + cert_customer: 'pixelpark' ssl_cert: '/etc/ssl/certs/wildcard.pixelpark.net-cert.pem' ssl_key: '/etc/ssl/private/wildcard.pixelpark.net-key.pem' ssl_chain: '/etc/ssl/certs/wildcard.pixelpark.net-cert.pem' diff --git a/customer/bmas-g20/www-g20-bmas.pixelpark.net.yaml b/customer/bmas-g20/www-g20-bmas.pixelpark.net.yaml index 6762ff01..9b6bb5fe 100644 --- a/customer/bmas-g20/www-g20-bmas.pixelpark.net.yaml +++ b/customer/bmas-g20/www-g20-bmas.pixelpark.net.yaml @@ -31,8 +31,8 @@ infra::profile::apache::pp_vhosts: - www-g20-bmas.pixelpark.net cert_servername: 'www.g20ewg.org' cert_customer: 'bmas' - cert_servername: 'www.g20ewg.org' - cert_customer: 'bmas' + # cert_servername: 'www.g20ewg.org' + # cert_customer: 'bmas' ssl_cert: '/etc/pki/tls/certs/www.g20ewg.org-cert.pem' ssl_chain: '/etc/pki/tls/certs/www.g20ewg.org-cert.pem' ssl_key: '/etc/pki/tls/private/www.g20ewg.org-key.pem' diff --git a/customer/bmas-sgb2/dev-sgb2-info.pixelpark.net.yaml b/customer/bmas-sgb2/dev-sgb2-info.pixelpark.net.yaml index 268cbc7b..9a63bd11 100644 --- a/customer/bmas-sgb2/dev-sgb2-info.pixelpark.net.yaml +++ b/customer/bmas-sgb2/dev-sgb2-info.pixelpark.net.yaml @@ -25,7 +25,7 @@ infra::additional_classes: solr::cores: drupal: - replace: true # Can trigger a restart from Solr if a change is found + replace: true # Can trigger a restart from Solr if a change is found protwords_src_file: /srv/www/gf.sgb2.info/profiles/openatrium/modules/init/features/init_search/solr-conf/5.x/protwords.txt schema_src_file: /srv/www/gf.sgb2.info/profiles/openatrium/modules/init/features/init_search/solr-conf/5.x/schema.xml solrconfig_src_file: /srv/www/gf.sgb2.info/profiles/openatrium/modules/init/features/init_search/solr-conf/5.x/solrconfig.xml @@ -60,7 +60,7 @@ infra::profile::mysql_server::databases: php::extensions: gd: {} mbstring: {} -# pecl-uploadprogress: {} -> benoetigt remi + # pecl-uploadprogress: {} -> benoetigt remi mysqlnd: {} opcache: {} @@ -80,7 +80,7 @@ infra::profile::drupal::projects: ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem ssl_chain: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem ssl_key: /etc/pki/tls/private/wildcard.pixelpark.net-key.pem - #SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0 + # SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0 mode: '2775' directories: - location1: @@ -101,7 +101,7 @@ infra::profile::drupal::projects: ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem ssl_chain: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem ssl_key: /etc/pki/tls/private/wildcard.pixelpark.net-key.pem - #SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0 + # SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0 mode: '2775' directories: - location1: diff --git a/customer/bmas-sgb2/production.yaml b/customer/bmas-sgb2/production.yaml index 7244f9ff..b867b8de 100644 --- a/customer/bmas-sgb2/production.yaml +++ b/customer/bmas-sgb2/production.yaml @@ -2,4 +2,4 @@ infra::profile::apache::htdigest: server: - www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAYev9tYQG8tu4heqI8/rlMBnpik9HBnIgO1ZMPPUsBRMzuvvb3Qo5tbVvatrMoFmIMx1nQGD98HiBF7onC3AwCkm7zRUMxMDUIBNXYSDYwBBfb14cbydDYlp8Gz3Qxm6/Rrb3rycOOWyw+/xnR6Mrtrfv7dlmwLgWou3toQDoDu00I/nwqJ1qBOSO/38PtLSSZ85l6P0dnQbbdXI2IXQhwr7cqhpD13EvVQIRmoo7MCN6trAuSyxJ/9lid0Dy8TcTE3Yu6DUzHlTEr81QivhcSm9cPelL69FupU8nMfwxRoMtlCV4GpTVAY97sHHE0o4+EW6MBbEtpdriG3xmiXuq2DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBIWs9p47LWQCgE9huA5g0rgCDu//btUahADcKnwLWcDztViIt4cCoMnOi76XAzPB8+sQ==] \ No newline at end of file + www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAYev9tYQG8tu4heqI8/rlMBnpik9HBnIgO1ZMPPUsBRMzuvvb3Qo5tbVvatrMoFmIMx1nQGD98HiBF7onC3AwCkm7zRUMxMDUIBNXYSDYwBBfb14cbydDYlp8Gz3Qxm6/Rrb3rycOOWyw+/xnR6Mrtrfv7dlmwLgWou3toQDoDu00I/nwqJ1qBOSO/38PtLSSZ85l6P0dnQbbdXI2IXQhwr7cqhpD13EvVQIRmoo7MCN6trAuSyxJ/9lid0Dy8TcTE3Yu6DUzHlTEr81QivhcSm9cPelL69FupU8nMfwxRoMtlCV4GpTVAY97sHHE0o4+EW6MBbEtpdriG3xmiXuq2DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBIWs9p47LWQCgE9huA5g0rgCDu//btUahADcKnwLWcDztViIt4cCoMnOi76XAzPB8+sQ==] 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 2f28c4b3..83da8a70 100644 --- a/customer/bmas-sgb2/test-web01-sgb2-info.pixelpark.net.yaml +++ b/customer/bmas-sgb2/test-web01-sgb2-info.pixelpark.net.yaml @@ -8,7 +8,7 @@ infra::additional_classes: solr::cores: drupal: - replace: true # Can trigger a restart from Solr if a change is found + replace: true # Can trigger a restart from Solr if a change is found protwords_src_file: /srv/www/gf.sgb2.info/profiles/openatrium/modules/init/features/init_search/solr-conf/5.x/protwords.txt schema_src_file: /srv/www/gf.sgb2.info/profiles/openatrium/modules/init/features/init_search/solr-conf/5.x/schema.xml solrconfig_src_file: /srv/www/gf.sgb2.info/profiles/openatrium/modules/init/features/init_search/solr-conf/5.x/solrconfig.xml @@ -62,7 +62,7 @@ repo::remi_php56: true php::extensions: gd: {} mbstring: {} -# pecl-uploadprogress: {} -> benoetigt remi + # pecl-uploadprogress: {} -> benoetigt remi mysqlnd: {} opcache: {} @@ -77,7 +77,7 @@ infra::profile::drupal::projects: ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem ssl_chain: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem ssl_key: /etc/pki/tls/private/wildcard.pixelpark.net-key.pem - #SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0 + # SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0 mode: '2775' directories: - directory_root: @@ -98,13 +98,13 @@ infra::profile::drupal::projects: auth_digest_algorithm: MD5 auth_user_file: '/etc/httpd/htdigest' auth_require: 'valid-user' -# rewrites: -# - http_to_https: -# comment: 'Alles auf https umleiten' -# rewrite_cond: -# - '%%{ich-trickse}{HTTPS} !=on' -# rewrite_rule: -# - ^(.*)$ https://gf.sgb2.info$1 [R=301,L] + # rewrites: + # - http_to_https: + # comment: 'Alles auf https umleiten' + # rewrite_cond: + # - '%%{ich-trickse}{HTTPS} !=on' + # rewrite_rule: + # - ^(.*)$ https://gf.sgb2.info$1 [R=301,L] php_admin_value: post_max_size: 128M upload_max_filesize: 128M @@ -114,11 +114,11 @@ infra::profile::drupal::projects: servername: old-www-gf-sgb2-info.pixelpark.net ssl: true cert_servername: 'wildcard.pixelpark.net' - cert_customer: 'pixelpark' + cert_customer: 'pixelpark' ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem ssl_chain: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem ssl_key: /etc/pki/tls/private/wildcard.pixelpark.net-key.pem - #SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0 + # SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0 mode: '2775' directories: - directory_root: @@ -138,4 +138,4 @@ infra::profile::drupal::projects: auth_digest_provider: file auth_digest_algorithm: MD5 auth_user_file: '/etc/httpd/htdigest' - auth_require: 'valid-user' \ No newline at end of file + auth_require: 'valid-user' diff --git a/customer/bmas-sgb2/test.yaml b/customer/bmas-sgb2/test.yaml index 41ce0ec0..61bde809 100644 --- a/customer/bmas-sgb2/test.yaml +++ b/customer/bmas-sgb2/test.yaml @@ -17,4 +17,4 @@ sudo::configs: jenkins_deploy: priority: "06" content: | - jenkins ALL=(apache) NOPASSWD: ALL \ No newline at end of file + jenkins ALL=(apache) NOPASSWD: ALL diff --git a/customer/bmas-sgb2/web01-sgb2-info.pixelpark.net.yaml b/customer/bmas-sgb2/web01-sgb2-info.pixelpark.net.yaml index 3af68f4e..721bc793 100644 --- a/customer/bmas-sgb2/web01-sgb2-info.pixelpark.net.yaml +++ b/customer/bmas-sgb2/web01-sgb2-info.pixelpark.net.yaml @@ -8,7 +8,7 @@ infra::additional_classes: solr::cores: drupal: - replace: true # Can trigger a restart from Solr if a change is found + replace: true # Can trigger a restart from Solr if a change is found protwords_src_file: /srv/www/gf.sgb2.info/profiles/openatrium/modules/init/features/init_search/solr-conf/5.x/protwords.txt schema_src_file: /srv/www/gf.sgb2.info/profiles/openatrium/modules/init/features/init_search/solr-conf/5.x/schema.xml solrconfig_src_file: /srv/www/gf.sgb2.info/profiles/openatrium/modules/init/features/init_search/solr-conf/5.x/solrconfig.xml @@ -56,7 +56,7 @@ php::settings: php::extensions: gd: {} mbstring: {} -# pecl-uploadprogress: {} -> benoetigt remi + # pecl-uploadprogress: {} -> benoetigt remi mysqlnd: {} opcache: {} @@ -74,7 +74,7 @@ infra::profile::drupal::projects: ssl_cert: /etc/pki/tls/certs/extranet.sgb2.info-cert.pem ssl_chain: /etc/pki/tls/certs/extranet.sgb2.info-cert.pem ssl_key: /etc/pki/tls/private/extranet.sgb2.info-key.pem - #SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0 + # SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0 rewrites: - http_to_https: comment: 'Alles auf https umleiten' @@ -85,4 +85,4 @@ infra::profile::drupal::projects: php_admin_value: post_max_size: 128M upload_max_filesize: 128M - memory_limit: 512M \ No newline at end of file + memory_limit: 512M diff --git a/customer/bmas-typo3/common.yaml b/customer/bmas-typo3/common.yaml index f5103dbd..8e674765 100644 --- a/customer/bmas-typo3/common.yaml +++ b/customer/bmas-typo3/common.yaml @@ -31,4 +31,4 @@ repo::remi_php56: true php::fpm::pools: www: - ensure: absent \ No newline at end of file + ensure: absent diff --git a/customer/bmas-typo3/production.yaml b/customer/bmas-typo3/production.yaml index 16390ec5..837ca46b 100644 --- a/customer/bmas-typo3/production.yaml +++ b/customer/bmas-typo3/production.yaml @@ -1,7 +1,7 @@ --- infra::role: base infra::additional_classes: -# - infra::profile::apache_php + # - infra::profile::apache_php - infra::profile::typo3 - mysql::server::backup - infra::profile::mysql_server @@ -54,7 +54,7 @@ memcached::max_memory: 256 memcached::listen_ip: '127.0.0.1' php::fpm::pools: - fachkraefte-offensive: # Pool for pdfgenerator - pdf.fachkraefte-offensive.de + fachkraefte-offensive: # Pool for pdfgenerator - pdf.fachkraefte-offensive.de listen: '/var/run/php5-fpm-fachkraefte-offensive.sock' listen_owner: apache listen_group: apache @@ -67,7 +67,7 @@ php::fpm::pools: pm_max_requests: '10000' pm_status_path: '/php-fpm-status' ping_path: '/ping' - ping_response: 'pong' + ping_response: 'pong' request_terminate_timeout: '5m' request_slowlog_timeout: '10s' slowlog: '/var/log/php-fpm/fachkraefte-offensive-slow.log' @@ -108,7 +108,7 @@ infra::profile::apache::vhosts: - '%%{ich-trickse}{REQUEST_URI} "!^/pdfgenerator"' rewrite_rule: - '^(.*)$ http://www.fachkraefte-offensive.de [R=301,L]' -# custom_fragment: 'ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000/srv/www/pdfgenerator/$1' + # custom_fragment: 'ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000/srv/www/pdfgenerator/$1' directories: - directory_docroot: provider: 'directory' @@ -290,7 +290,7 @@ infra::profile::typo3::projects: - psyga.inqa-check.de - personalplanung.inqa-check.de - www.personalplanung.inqa-check.de -# Pixelpark Addressen + # Pixelpark Addressen - www-psyga-inqa-check-de.pixelpark.net - www-personalplaner-inqa-check-de.pixelpark.net cert_servername: 'wildcard.inqa-check.de' @@ -340,11 +340,11 @@ infra::profile::typo3::projects: db_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAoXhIE3LScKk47IO4nXcrbgQNQgsyD75DJhaURzgI2hCfp1RwhpINzL8py6SILYxcibhEyZWUAPf3jVqr2epjeiDH0DsemNUdjCrr58xGW8RVLOkdd9VQJSOsbSWPBaFpd835bf4HTiuC4SV0KIwtcZTY2l72EZ0YftoV0q/sKONgiZfhWvmE7uJ2fq0gADiSh24kj/q+1ySJ9vvB2ZxkzVs/ny7GUA7X9dORgVEXoZRXs3nesoXnqpjfkXmQlKu4+oapoRQ1EPtaWa0cHffTiKGOEdX1LsAIqb3iSjxIoyZM9gtUM2sYqSXgKdOOlZVjaxgQH0E7eVRBwrhgx6Vp/zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDEiAzKKvLBnRd1nJZGmUzZgCDQmTbjzrxht7u+aEbfPNJjxhHY7EM+ChE2NQV6V5iSmg==] db_user: inqacheck db_name: inqacheck - manage_typo3_project: false # selbe docroot wie inqacheck + manage_typo3_project: false # selbe docroot wie inqacheck ip: 217.66.58.169 servername: unternehmenscheck.fachkraefte-offensive.de serveraliases: -# Pixelpark Addressen + # Pixelpark Addressen - unternehmenscheck-fachkraefte-offensive-de.pixelpark.net cert_servername: 'wildcard.pixelpark.net' cert_customer: 'pixelpark' @@ -372,11 +372,11 @@ infra::profile::typo3::projects: db_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAoXhIE3LScKk47IO4nXcrbgQNQgsyD75DJhaURzgI2hCfp1RwhpINzL8py6SILYxcibhEyZWUAPf3jVqr2epjeiDH0DsemNUdjCrr58xGW8RVLOkdd9VQJSOsbSWPBaFpd835bf4HTiuC4SV0KIwtcZTY2l72EZ0YftoV0q/sKONgiZfhWvmE7uJ2fq0gADiSh24kj/q+1ySJ9vvB2ZxkzVs/ny7GUA7X9dORgVEXoZRXs3nesoXnqpjfkXmQlKu4+oapoRQ1EPtaWa0cHffTiKGOEdX1LsAIqb3iSjxIoyZM9gtUM2sYqSXgKdOOlZVjaxgQH0E7eVRBwrhgx6Vp/zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDEiAzKKvLBnRd1nJZGmUzZgCDQmTbjzrxht7u+aEbfPNJjxhHY7EM+ChE2NQV6V5iSmg==] db_user: inqacheck db_name: inqacheck - manage_typo3_project: false # selbe docroot wie inqacheck + manage_typo3_project: false # selbe docroot wie inqacheck ip: 217.66.58.171 servername: beschaeftigtencheck.fachkraefte-offensive.de serveraliases: -# Pixelpark Addressen + # Pixelpark Addressen - beschaeftigtencheck-fachkraefte-offensive-de.pixelpark.net cert_servername: 'wildcard.pixelpark.net' cert_customer: 'pixelpark' @@ -406,7 +406,7 @@ infra::profile::typo3::projects: ip: 217.66.58.172 servername: www.fis-netzwerk.de serveraliases: -# Pixelpark Addressen + # Pixelpark Addressen - www-fis-netzwerk-de.pixelpark.net - fis-netzwerk.de cert_servername: 'www.fis-netzwerk.de' diff --git a/customer/bmas-typo3/test.yaml b/customer/bmas-typo3/test.yaml index c39cf16c..5c97e8d6 100644 --- a/customer/bmas-typo3/test.yaml +++ b/customer/bmas-typo3/test.yaml @@ -184,7 +184,7 @@ infra::profile::apache_php::vhosts: docroot: /srv/www/mikrokredit port: 80 docroot_owner: apache - servername: test-www-mein-mikrokredit-de.pixelpark.net + servername: test-www-mein-mikrokredit-de.pixelpark.net directories: - directory_root: provider: directory diff --git a/customer/bmas/db01-bmas-gsb6-de.pixelpark.net.yaml b/customer/bmas/db01-bmas-gsb6-de.pixelpark.net.yaml index 45b4bd13..9bc26486 100644 --- a/customer/bmas/db01-bmas-gsb6-de.pixelpark.net.yaml +++ b/customer/bmas/db01-bmas-gsb6-de.pixelpark.net.yaml @@ -1,3 +1,3 @@ --- infra::additional_classes: - - accounts \ No newline at end of file + - accounts diff --git a/customer/bmas/db02-bmas-gsb6-de.pixelpark.net.yaml b/customer/bmas/db02-bmas-gsb6-de.pixelpark.net.yaml index 45b4bd13..9bc26486 100644 --- a/customer/bmas/db02-bmas-gsb6-de.pixelpark.net.yaml +++ b/customer/bmas/db02-bmas-gsb6-de.pixelpark.net.yaml @@ -1,3 +1,3 @@ --- infra::additional_classes: - - accounts \ No newline at end of file + - accounts diff --git a/customer/bmas/master01-bmas-gsb6-de.pixelpark.net.yaml b/customer/bmas/master01-bmas-gsb6-de.pixelpark.net.yaml index e38c15e7..209f9077 100644 --- a/customer/bmas/master01-bmas-gsb6-de.pixelpark.net.yaml +++ b/customer/bmas/master01-bmas-gsb6-de.pixelpark.net.yaml @@ -2,4 +2,3 @@ infra::additional_classes: - accounts - pp_mcollective - diff --git a/customer/bmas/slave01-bmas-gsb6-de.pixelpark.net.yaml b/customer/bmas/slave01-bmas-gsb6-de.pixelpark.net.yaml index 03c1b0f2..9bc26486 100644 --- a/customer/bmas/slave01-bmas-gsb6-de.pixelpark.net.yaml +++ b/customer/bmas/slave01-bmas-gsb6-de.pixelpark.net.yaml @@ -1,4 +1,3 @@ --- infra::additional_classes: - accounts - diff --git a/customer/bmas/test-db01-bmas-gsb6-de.pixelpark.net.yaml b/customer/bmas/test-db01-bmas-gsb6-de.pixelpark.net.yaml index 45b4bd13..9bc26486 100644 --- a/customer/bmas/test-db01-bmas-gsb6-de.pixelpark.net.yaml +++ b/customer/bmas/test-db01-bmas-gsb6-de.pixelpark.net.yaml @@ -1,3 +1,3 @@ --- infra::additional_classes: - - accounts \ No newline at end of file + - accounts diff --git a/customer/bmas/test-db02-bmas-gsb6-de.pixelpark.net.yaml b/customer/bmas/test-db02-bmas-gsb6-de.pixelpark.net.yaml index 45b4bd13..9bc26486 100644 --- a/customer/bmas/test-db02-bmas-gsb6-de.pixelpark.net.yaml +++ b/customer/bmas/test-db02-bmas-gsb6-de.pixelpark.net.yaml @@ -1,3 +1,3 @@ --- infra::additional_classes: - - accounts \ No newline at end of file + - accounts diff --git a/customer/bmas/test-lb-bmas-de.pixelpark.net.yaml b/customer/bmas/test-lb-bmas-de.pixelpark.net.yaml index 7d9b2347..3b0442d3 100644 --- a/customer/bmas/test-lb-bmas-de.pixelpark.net.yaml +++ b/customer/bmas/test-lb-bmas-de.pixelpark.net.yaml @@ -1,2 +1,2 @@ --- -infra::role: base \ No newline at end of file +infra::role: base diff --git a/customer/bmas/test-master01-bmas-gsb6-de.pixelpark.net.yaml b/customer/bmas/test-master01-bmas-gsb6-de.pixelpark.net.yaml index c577a269..e7b96f53 100644 --- a/customer/bmas/test-master01-bmas-gsb6-de.pixelpark.net.yaml +++ b/customer/bmas/test-master01-bmas-gsb6-de.pixelpark.net.yaml @@ -1,4 +1,3 @@ --- infra::additional_classes: - pp_mcollective - diff --git a/customer/bmas/test-slave01-bmas-gsb6-de.pixelpark.net.yaml b/customer/bmas/test-slave01-bmas-gsb6-de.pixelpark.net.yaml index 03c1b0f2..9bc26486 100644 --- a/customer/bmas/test-slave01-bmas-gsb6-de.pixelpark.net.yaml +++ b/customer/bmas/test-slave01-bmas-gsb6-de.pixelpark.net.yaml @@ -1,4 +1,3 @@ --- infra::additional_classes: - accounts - diff --git a/customer/bmas/test-www-anmeldung-bmas-de.pixelpark.net.yaml b/customer/bmas/test-www-anmeldung-bmas-de.pixelpark.net.yaml index 12ba27e9..543a5fd1 100644 --- a/customer/bmas/test-www-anmeldung-bmas-de.pixelpark.net.yaml +++ b/customer/bmas/test-www-anmeldung-bmas-de.pixelpark.net.yaml @@ -1,6 +1,6 @@ --- infra::role: base -#infra::additional_classes: +# infra::additional_classes: # - httpd # - vivenio::app_server::tomcat # - vivenio::webserver::apache @@ -20,8 +20,7 @@ httpd::webserver: - 0.0.0.0:443 extendedStatus: true worker: true - - + vivenio::webserver::apache::host_servername: test-www-anmeldung-bmas-de.pixelpark.net vivenio::webserver::apache::ssl: true vivenio::webserver::apache::ssl_cert: /www/conf/certs/test-www-anmeldung-bmas-de.pixelpark.net @@ -41,4 +40,4 @@ xymon::procs: text: Postgres Datenbank fuer Applikation java: color: red - text: Tomcat Java Applikation Vivenio \ No newline at end of file + text: Tomcat Java Applikation Vivenio diff --git a/customer/bmas/test-www01-bmas-gsb6-de.pixelpark.net.yaml b/customer/bmas/test-www01-bmas-gsb6-de.pixelpark.net.yaml index eaba450b..3efe38df 100644 --- a/customer/bmas/test-www01-bmas-gsb6-de.pixelpark.net.yaml +++ b/customer/bmas/test-www01-bmas-gsb6-de.pixelpark.net.yaml @@ -2,4 +2,3 @@ infra::additional_classes: - accounts # - pp_mcollective - diff --git a/customer/bmas/test-www02-bmas-gsb6-de.pixelpark.net.yaml b/customer/bmas/test-www02-bmas-gsb6-de.pixelpark.net.yaml index eaba450b..3efe38df 100644 --- a/customer/bmas/test-www02-bmas-gsb6-de.pixelpark.net.yaml +++ b/customer/bmas/test-www02-bmas-gsb6-de.pixelpark.net.yaml @@ -2,4 +2,3 @@ infra::additional_classes: - accounts # - pp_mcollective - diff --git a/customer/bmas/test.yaml b/customer/bmas/test.yaml index 3cd13b1b..68ec7358 100644 --- a/customer/bmas/test.yaml +++ b/customer/bmas/test.yaml @@ -1,3 +1,4 @@ +--- accounts::users: jenkins: apply: true diff --git a/customer/bmas/www-anmeldung-bmas-de.pixelpark.net.yaml b/customer/bmas/www-anmeldung-bmas-de.pixelpark.net.yaml index 211fe344..ff7c63c0 100644 --- a/customer/bmas/www-anmeldung-bmas-de.pixelpark.net.yaml +++ b/customer/bmas/www-anmeldung-bmas-de.pixelpark.net.yaml @@ -1,6 +1,6 @@ --- infra::role: base -#infra::additional_classes: +# infra::additional_classes: # - httpd # - vivenio # - vivenio::app_server::tomcat diff --git a/customer/bmas/www01-bmas-gsb6-de.pixelpark.net.yaml b/customer/bmas/www01-bmas-gsb6-de.pixelpark.net.yaml index e38c15e7..209f9077 100644 --- a/customer/bmas/www01-bmas-gsb6-de.pixelpark.net.yaml +++ b/customer/bmas/www01-bmas-gsb6-de.pixelpark.net.yaml @@ -2,4 +2,3 @@ infra::additional_classes: - accounts - pp_mcollective - diff --git a/customer/bmbf/common.yaml b/customer/bmbf/common.yaml index 521f17b1..42f05f85 100644 --- a/customer/bmbf/common.yaml +++ b/customer/bmbf/common.yaml @@ -23,7 +23,7 @@ accounts::users: matthias.schmidt: apply: true sylvia.egger: - apply: true + apply: true sudo::configs: cmd_alias: @@ -36,8 +36,7 @@ sudo::configs: becomeApache: priority: "07" content: | - jenkins ALL=(apache) NOPASSWD: ALL - + jenkins ALL=(apache) NOPASSWD: ALL nodejs::manage_package_repo: false @@ -46,4 +45,4 @@ php::fpm::pools: ensure: absent xymon::disk_warnlevel: 80 -xymon::disk_paniclevel: 90 \ No newline at end of file +xymon::disk_paniclevel: 90 diff --git a/customer/bmbf/test-web02-bmbf.pixelpark.net.yaml b/customer/bmbf/test-web02-bmbf.pixelpark.net.yaml index e24e7618..f11aa2dd 100644 --- a/customer/bmbf/test-web02-bmbf.pixelpark.net.yaml +++ b/customer/bmbf/test-web02-bmbf.pixelpark.net.yaml @@ -40,9 +40,9 @@ infra::profile::mysql_server::databases: infra::profile::typo3::projects: wissenschaftsjahr: - version: '7.6.18' # dummy value + version: '7.6.18' # dummy value db_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAIKoLre5XPzsMdCxCfly4GcvxSmrx4XEXJ9+0p7UV1AjO6dwYOm8qhsWtodG0MwBYXaoKGqTaipeF7eCvsBuE0zNF1+07MOzCWgTwSrR6EIBUybr7Xc04PvoPQllMSvp1CfRGVBbYZ/JIZhtXuiGoP87MKwa0BlIFO+1gXIu+5AFsFpraFeZnB1hmFnsHBJfK/utGmONA1w2hrsYLVnMJ0WO/mubwmKJE92Im7i/1kHXCc+6aVyICGfD+E9On2Ktlq0F8JOoE3CJT/wqryNNSwCb672gTaZYl1UUVBh8wVXK1rByiXOxUMRLgJb6FGQdMNuKwaOf4yhYstSv0tZwsCDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBePGMowQ3L7+7Kk/VI0/UegCC04jr6cPSBijavVA6vwj1e2q2hFqg+lnXh7tX37eMZCA==] - manage_typo3_project: false # on-top vhost for all wissenschaftsjahr vhosts + manage_typo3_project: false # on-top vhost for all wissenschaftsjahr vhosts servername: test-web02-bmbf.pixelpark.net fallbackresource: '/2016-17/service/seite-nicht-gefunden.html' error_documents: @@ -87,7 +87,7 @@ infra::profile::typo3::projects: 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' - minute: '*' # jede Minute Cron Job + minute: '*' # jede Minute Cron Job directories: - location1: provider: location @@ -107,7 +107,7 @@ infra::profile::typo3::projects: post_max_size: '50M' upload_max_filesize: '50M' -infra::profile::flow::manage_php: false # managed by typo3 +infra::profile::flow::manage_php: false # managed by typo3 infra::profile::flow::projects: wissen-flow: version: '3.2.2' @@ -119,7 +119,7 @@ infra::profile::flow::projects: ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem' ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem' user: service.typo3 - setflow_context: false # we overwrite the default flow context + setflow_context: false # we overwrite the default flow context setenv: - 'FLOW_CONTEXT Development' diff --git a/customer/bmbf/web02-bmbf.pixelpark.net.yaml b/customer/bmbf/web02-bmbf.pixelpark.net.yaml index 05c28338..ec675013 100644 --- a/customer/bmbf/web02-bmbf.pixelpark.net.yaml +++ b/customer/bmbf/web02-bmbf.pixelpark.net.yaml @@ -25,7 +25,7 @@ mysql::server::override_options: innodb_log_buffer_size: 16M query_cache_type: 0 default-storage-engine: INNODB - innodb_file_per_table: ON + innodb_file_per_table: 'ON' infra::profile::apache::htdigest: server: @@ -48,9 +48,9 @@ infra::profile::mysql_server::databases: infra::profile::typo3::projects: wissenschaftsjahr: - version: '7.6.18' # dummy value + version: '7.6.18' # dummy value db_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmL6L4Gjwh2CJn7VR3nggYsGrUWGfCc5wyqDENDoN0hpZY3/Z5KYXwqxmgYzYrJQDcz4y7MtqsVaJa43RQNxFvMHm/u0MBq5Lj3gFXiCwERl4iGS2cjC9p64kCB9DygN4SshQb1LssGO08vKi9o3PLPIbu3x2L/f3ntBlh3C7Z1sGnXJTRt1vDPmnennadDpPXPBr1YXO+PjDHPM2aYmK1ObNUSJuj+aSVoO+39/MbKItu1PWGxun8t4LYOJeVX9UO0dRaKe+Jb5Y2n1Pi9ehM4CFh2GGntRhpxKLzSRpVB+7pbw0t4+L9opWlYWYuGegEV30QXgHIjwqGjL4LPL/kjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCGcbqulPE0TFeB6SkB8sOegCCz5uvjwlpS1tq7H1lDffHfCR2OAw8M0xmWWHwJQpSJ6w==] # dummy value - manage_typo3_project: false # on-top vhost for all wissenschaftsjahr vhosts + manage_typo3_project: false # on-top vhost for all wissenschaftsjahr vhosts servername: www.wissenschaftsjahr.de serveraliases: - wissenschaftsjahr.de @@ -141,7 +141,7 @@ infra::profile::typo3::projects: 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' - minute: '*' # jede Minute Cron Job + minute: '*' # jede Minute Cron Job directories: - location1: provider: location @@ -175,7 +175,7 @@ infra::profile::typo3::projects: post_max_size: '50M' upload_max_filesize: '50M' -infra::profile::flow::manage_php: false # managed by typo3 +infra::profile::flow::manage_php: false # managed by typo3 infra::profile::flow::projects: wissen-flow: version: '3.2.2' @@ -187,7 +187,7 @@ infra::profile::flow::projects: ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem' ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem' user: service.typo3 - setflow_context: false # we overwrite the default flow context + setflow_context: false # we overwrite the default flow context setenv: - 'FLOW_CONTEXT Development' diff --git a/customer/bmf-datacenter/common.yaml b/customer/bmf-datacenter/common.yaml index ac602edf..e8fe4f6e 100644 --- a/customer/bmf-datacenter/common.yaml +++ b/customer/bmf-datacenter/common.yaml @@ -29,7 +29,7 @@ sudo::configs: priority: "06" content: | jenkins ALL=(apache) NOPASSWD: ALL - + infra::role: base infra::additional_classes: - infra::profile::typo3 diff --git a/customer/bmf-datacenter/production.yaml b/customer/bmf-datacenter/production.yaml index 4d1a2bbb..09bd7c1b 100644 --- a/customer/bmf-datacenter/production.yaml +++ b/customer/bmf-datacenter/production.yaml @@ -73,10 +73,10 @@ infra::profile::typo3::projects: alias: '/logs' path: '/var/log/httpd' access_log_format: urchinpp_xf4 - ssl_real: false # because we are behind lb -# ssl_cert: '/etc/pki/tls/certs/www.bundeshaushalt-info.de-cert.pem' -# ssl_key: '/etc/pki/tls/private/www.bundeshaushalt-info.de-key.pem' -# ssl_chain: '/etc/pki/tls/certs/www.bundeshaushalt-info.de-cert.pem' + ssl_real: false # because we are behind lb + # ssl_cert: '/etc/pki/tls/certs/www.bundeshaushalt-info.de-cert.pem' + # ssl_key: '/etc/pki/tls/private/www.bundeshaushalt-info.de-key.pem' + # ssl_chain: '/etc/pki/tls/certs/www.bundeshaushalt-info.de-cert.pem' directories: - directory2: provider: directory diff --git a/customer/bmf-europa/common.yaml b/customer/bmf-europa/common.yaml index e60f2576..cd0a30be 100644 --- a/customer/bmf-europa/common.yaml +++ b/customer/bmf-europa/common.yaml @@ -35,7 +35,7 @@ sudo::configs: becomeApache: priority: "06" content: | - jenkins ALL=(apache) NOPASSWD: ALL + jenkins ALL=(apache) NOPASSWD: ALL infra::role: base infra::additional_classes: diff --git a/customer/bmf-europa/web-so-klingt-europa-de.pixelpark.net.yaml b/customer/bmf-europa/web-so-klingt-europa-de.pixelpark.net.yaml index ce030b25..956a70b0 100644 --- a/customer/bmf-europa/web-so-klingt-europa-de.pixelpark.net.yaml +++ b/customer/bmf-europa/web-so-klingt-europa-de.pixelpark.net.yaml @@ -74,7 +74,7 @@ infra::profile::drupal::projects: ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem' ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem' ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem' - #directories: + # directories: # - location1: # provider: location # path: '/' diff --git a/customer/bmf/db01-bmf-de.pixelpark.net.yaml b/customer/bmf/db01-bmf-de.pixelpark.net.yaml index 30907db9..5921610c 100644 --- a/customer/bmf/db01-bmf-de.pixelpark.net.yaml +++ b/customer/bmf/db01-bmf-de.pixelpark.net.yaml @@ -1,13 +1,14 @@ --- infra::role: base + infra::additional_classes: -# - infra::profile::galera_cluster -# - infra::profile::mysql_server + # - infra::profile::galera_cluster + # - infra::profile::mysql_server - logstash mysql::server::override_options: mysqld: - innodb_file_per_table: ON + innodb_file_per_table: 'ON' mysql::server::backup::backupdir: /var/lib/backup/mysql diff --git a/customer/bmf/db02-bmf-de.pixelpark.net.yaml b/customer/bmf/db02-bmf-de.pixelpark.net.yaml index 30907db9..9faec858 100644 --- a/customer/bmf/db02-bmf-de.pixelpark.net.yaml +++ b/customer/bmf/db02-bmf-de.pixelpark.net.yaml @@ -1,13 +1,13 @@ --- infra::role: base infra::additional_classes: -# - infra::profile::galera_cluster -# - infra::profile::mysql_server + # - infra::profile::galera_cluster + # - infra::profile::mysql_server - logstash mysql::server::override_options: mysqld: - innodb_file_per_table: ON + innodb_file_per_table: 'ON' mysql::server::backup::backupdir: /var/lib/backup/mysql diff --git a/customer/bmf/db02-red-bmf-de.pixelpark.net.yaml b/customer/bmf/db02-red-bmf-de.pixelpark.net.yaml index 9d185c4e..1b2ea87d 100644 --- a/customer/bmf/db02-red-bmf-de.pixelpark.net.yaml +++ b/customer/bmf/db02-red-bmf-de.pixelpark.net.yaml @@ -1,7 +1,7 @@ --- infra::role: base -#infra::additional_classes: #disabled until merge of https://github.com/puppetlabs/puppetlabs-mysql/pull/920 - #- infra::profile::mysql_server # disabled until merge of https://github.com/puppetlabs/puppetlabs-mysql/pull/920 +# infra::additional_classes: #disabled until merge of https://github.com/puppetlabs/puppetlabs-mysql/pull/920 +# - infra::profile::mysql_server # disabled until merge of https://github.com/puppetlabs/puppetlabs-mysql/pull/920 mysql::server::override_options: mysqld: diff --git a/customer/bmf/db03-bmf-de.pixelpark.net.yaml b/customer/bmf/db03-bmf-de.pixelpark.net.yaml index 30907db9..9faec858 100644 --- a/customer/bmf/db03-bmf-de.pixelpark.net.yaml +++ b/customer/bmf/db03-bmf-de.pixelpark.net.yaml @@ -1,13 +1,13 @@ --- infra::role: base infra::additional_classes: -# - infra::profile::galera_cluster -# - infra::profile::mysql_server + # - infra::profile::galera_cluster + # - infra::profile::mysql_server - logstash mysql::server::override_options: mysqld: - innodb_file_per_table: ON + innodb_file_per_table: 'ON' mysql::server::backup::backupdir: /var/lib/backup/mysql diff --git a/customer/bmf/dev-bmf-de.pixelpark.net.yaml b/customer/bmf/dev-bmf-de.pixelpark.net.yaml index 7d9b2347..3b0442d3 100644 --- a/customer/bmf/dev-bmf-de.pixelpark.net.yaml +++ b/customer/bmf/dev-bmf-de.pixelpark.net.yaml @@ -1,2 +1,2 @@ --- -infra::role: base \ No newline at end of file +infra::role: base diff --git a/customer/bmf/development.yaml b/customer/bmf/development.yaml index 9e460382..b8da8de8 100644 --- a/customer/bmf/development.yaml +++ b/customer/bmf/development.yaml @@ -41,4 +41,4 @@ infra::profile::mysql_server::databases: user: ADMINPORTAL password: hee3eeK4Gouyii5a host: '%' -mysql::server::backup::backupdir: /var/lib/backup/mysql \ No newline at end of file +mysql::server::backup::backupdir: /var/lib/backup/mysql diff --git a/customer/bmf/master01-bmf-de.pixelpark.net.yaml b/customer/bmf/master01-bmf-de.pixelpark.net.yaml index 7d9b2347..3b0442d3 100644 --- a/customer/bmf/master01-bmf-de.pixelpark.net.yaml +++ b/customer/bmf/master01-bmf-de.pixelpark.net.yaml @@ -1,2 +1,2 @@ --- -infra::role: base \ No newline at end of file +infra::role: base diff --git a/customer/bmf/red-bmf-de.pixelpark.net.yaml b/customer/bmf/red-bmf-de.pixelpark.net.yaml index e41baf30..3e1626ba 100644 --- a/customer/bmf/red-bmf-de.pixelpark.net.yaml +++ b/customer/bmf/red-bmf-de.pixelpark.net.yaml @@ -10,8 +10,8 @@ sudo::configs: jenkins ALL=(ALL) NOPASSWD: ALL infra::role: base -#infra::additional_classes: # disabled until merge of https://github.com/puppetlabs/puppetlabs-mysql/pull/920 - #- infra::profile::mysql_server # disabled until merge of https://github.com/puppetlabs/puppetlabs-mysql/pull/920 +# infra::additional_classes: # disabled until merge of https://github.com/puppetlabs/puppetlabs-mysql/pull/920 +# - infra::profile::mysql_server # disabled until merge of https://github.com/puppetlabs/puppetlabs-mysql/pull/920 mysql::server::override_options: mysqld: diff --git a/customer/bmf/slave01-bmf-de.pixelpark.net.yaml b/customer/bmf/slave01-bmf-de.pixelpark.net.yaml index 7d9b2347..3b0442d3 100644 --- a/customer/bmf/slave01-bmf-de.pixelpark.net.yaml +++ b/customer/bmf/slave01-bmf-de.pixelpark.net.yaml @@ -1,2 +1,2 @@ --- -infra::role: base \ No newline at end of file +infra::role: base diff --git a/customer/bmf/test-db01-bmf-de.pixelpark.net.yaml b/customer/bmf/test-db01-bmf-de.pixelpark.net.yaml index bdebbb25..1219043a 100644 --- a/customer/bmf/test-db01-bmf-de.pixelpark.net.yaml +++ b/customer/bmf/test-db01-bmf-de.pixelpark.net.yaml @@ -1,15 +1,15 @@ --- infra::role: base infra::additional_classes: -# - infra::profile::galera_cluster -# - infra::profile::mysql_server + # - infra::profile::galera_cluster + # - infra::profile::mysql_server - logstash galera::repo::yum_mariadb_baseurl: "http://repo.pixelpark.com/Linux/yum/mariadb/10.1/centos/%{operatingsystemmajrelease}/%{architecture}/" infra::profile::galera_cluster::override_options: mysqld: - innodb_file_per_table: ON + innodb_file_per_table: 'ON' wait_timeout: '600' interactive_timeout: '600' max_allowed_packet: '128M' diff --git a/customer/bmf/test-db02-bmf-de.pixelpark.net.yaml b/customer/bmf/test-db02-bmf-de.pixelpark.net.yaml index bdebbb25..1219043a 100644 --- a/customer/bmf/test-db02-bmf-de.pixelpark.net.yaml +++ b/customer/bmf/test-db02-bmf-de.pixelpark.net.yaml @@ -1,15 +1,15 @@ --- infra::role: base infra::additional_classes: -# - infra::profile::galera_cluster -# - infra::profile::mysql_server + # - infra::profile::galera_cluster + # - infra::profile::mysql_server - logstash galera::repo::yum_mariadb_baseurl: "http://repo.pixelpark.com/Linux/yum/mariadb/10.1/centos/%{operatingsystemmajrelease}/%{architecture}/" infra::profile::galera_cluster::override_options: mysqld: - innodb_file_per_table: ON + innodb_file_per_table: 'ON' wait_timeout: '600' interactive_timeout: '600' max_allowed_packet: '128M' diff --git a/customer/bmf/test-db03-bmf-de.pixelpark.net.yaml b/customer/bmf/test-db03-bmf-de.pixelpark.net.yaml index bdebbb25..1219043a 100644 --- a/customer/bmf/test-db03-bmf-de.pixelpark.net.yaml +++ b/customer/bmf/test-db03-bmf-de.pixelpark.net.yaml @@ -1,15 +1,15 @@ --- infra::role: base infra::additional_classes: -# - infra::profile::galera_cluster -# - infra::profile::mysql_server + # - infra::profile::galera_cluster + # - infra::profile::mysql_server - logstash galera::repo::yum_mariadb_baseurl: "http://repo.pixelpark.com/Linux/yum/mariadb/10.1/centos/%{operatingsystemmajrelease}/%{architecture}/" infra::profile::galera_cluster::override_options: mysqld: - innodb_file_per_table: ON + innodb_file_per_table: 'ON' wait_timeout: '600' interactive_timeout: '600' max_allowed_packet: '128M' diff --git a/customer/bmf/test-master01-bmf-de.pixelpark.net.yaml b/customer/bmf/test-master01-bmf-de.pixelpark.net.yaml index 7d9b2347..3b0442d3 100644 --- a/customer/bmf/test-master01-bmf-de.pixelpark.net.yaml +++ b/customer/bmf/test-master01-bmf-de.pixelpark.net.yaml @@ -1,2 +1,2 @@ --- -infra::role: base \ No newline at end of file +infra::role: base diff --git a/customer/bmf/test-slave01-bmf-de.pixelpark.net.yaml b/customer/bmf/test-slave01-bmf-de.pixelpark.net.yaml index 7d9b2347..3b0442d3 100644 --- a/customer/bmf/test-slave01-bmf-de.pixelpark.net.yaml +++ b/customer/bmf/test-slave01-bmf-de.pixelpark.net.yaml @@ -1,2 +1,2 @@ --- -infra::role: base \ No newline at end of file +infra::role: base diff --git a/customer/bmf/test-www01-bmf-de.pixelpark.net.yaml b/customer/bmf/test-www01-bmf-de.pixelpark.net.yaml index 7d9b2347..3b0442d3 100644 --- a/customer/bmf/test-www01-bmf-de.pixelpark.net.yaml +++ b/customer/bmf/test-www01-bmf-de.pixelpark.net.yaml @@ -1,2 +1,2 @@ --- -infra::role: base \ No newline at end of file +infra::role: base diff --git a/customer/bmf/test-www02-bmf-de.pixelpark.net.yaml b/customer/bmf/test-www02-bmf-de.pixelpark.net.yaml index 7d9b2347..3b0442d3 100644 --- a/customer/bmf/test-www02-bmf-de.pixelpark.net.yaml +++ b/customer/bmf/test-www02-bmf-de.pixelpark.net.yaml @@ -1,2 +1,2 @@ --- -infra::role: base \ No newline at end of file +infra::role: base diff --git a/customer/bmf/test.yaml b/customer/bmf/test.yaml index 3cd13b1b..68ec7358 100644 --- a/customer/bmf/test.yaml +++ b/customer/bmf/test.yaml @@ -1,3 +1,4 @@ +--- accounts::users: jenkins: apply: true diff --git a/customer/bmwi-gruenderwoche/production.yaml b/customer/bmwi-gruenderwoche/production.yaml index de69def1..5cffc99b 100644 --- a/customer/bmwi-gruenderwoche/production.yaml +++ b/customer/bmwi-gruenderwoche/production.yaml @@ -42,11 +42,11 @@ infra::profile::typo3::projects: - grwo4: comment: 'Ueber die Gruenderwoche' rewrite_rule: - - ^/ueber/index.php$ https://www.gruenderwoche.de/ueber-die-gruenderwoche/ [R=301,L] + - ^/ueber/index.php$ https://www.gruenderwoche.de/ueber-die-gruenderwoche/ [R=301,L] - grwo5: comment: 'Partnerbereich' rewrite_rule: - - ^/partner/partnerbereich/index.php$ https://www.gruenderwoche.de/partnerbereich/ [R=301,L] + - ^/partner/partnerbereich/index.php$ https://www.gruenderwoche.de/partnerbereich/ [R=301,L] - grwo6: comment: 'Fuer Partner und Foerderer' rewrite_rule: @@ -78,11 +78,11 @@ infra::profile::typo3::projects: - grwo13: comment: 'Ansprechpartner' rewrite_rule: - - ^/partner/ansprechpartner/index.php$ https://www.gruenderwoche.de/service/ansprechpartner/ [R=301,L] + - ^/partner/ansprechpartner/index.php$ https://www.gruenderwoche.de/service/ansprechpartner/ [R=301,L] - grwo14: comment: 'Als Partner registrieren' rewrite_rule: - - ^/partner/registrierung.php$ https://www.gruenderwoche.de/fuer-partner-und-foerderer/als-partner-registrieren/ [R=301,L] + - ^/partner/registrierung.php$ https://www.gruenderwoche.de/fuer-partner-und-foerderer/als-partner-registrieren/ [R=301,L] - grwo15: comment: 'Veranstaltungsideen' rewrite_rule: diff --git a/customer/bmwi-gruenderwoche/test.yaml b/customer/bmwi-gruenderwoche/test.yaml index 88a65602..b56c6b5b 100644 --- a/customer/bmwi-gruenderwoche/test.yaml +++ b/customer/bmwi-gruenderwoche/test.yaml @@ -9,7 +9,7 @@ infra::profile::mysql_server::databases: php::dev: true php::pear: true -apache::timeout: 1800 # temporary for migration +apache::timeout: 1800 # temporary for migration infra::profile::apache::htdigest: server: www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAL/9BZJBKMne3z5KC9A3kUCz1LrvEteRUPnwkQiz+qT9YhZDfMQCASZ4e0ylxB4T/55XM60ajDai22y2gPq4jDdMqFLeWYQy+1WS4kpeMTf465KuWrxAQUtVFEBM+PQe53+4USr7KSVUofufOA+UCCb01yQIfN6QPxRMij9rcCjRU0fhbtANkOGxQyzm26ECTPlTBjaOl8+Eaa5Z0CMs0Y/O7KzoawbWPRe7ESd2CN4Ooyabn1rrgMCzQeVfZ9WqCIKfhYGaFTQX/X7QHOXwYyMJJdwAEw2GDUecbE2dG0U0no1uzth4MfoPiPTvxhbg3otLpbSVBOt9rxYH0XxxLujBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAK+e31GjupB7aqXOrl4zvdgCCnwwYIL195PyxzFkEvC+Nnft9rdjC0JQSTNH57MKmQWg==] diff --git a/customer/bmwi/db01-bmwi-de.pixelpark.net.yaml b/customer/bmwi/db01-bmwi-de.pixelpark.net.yaml index bf42d7b6..96a724bc 100644 --- a/customer/bmwi/db01-bmwi-de.pixelpark.net.yaml +++ b/customer/bmwi/db01-bmwi-de.pixelpark.net.yaml @@ -1,5 +1,5 @@ --- -infra::role: base_for_old_systems # because we don't need xymon +infra::role: base_for_old_systems # because we don't need xymon infra::additional_classes: - accounts accounts::users: diff --git a/customer/bmwi/db02-bmwi-de.pixelpark.net.yaml b/customer/bmwi/db02-bmwi-de.pixelpark.net.yaml index bf42d7b6..96a724bc 100644 --- a/customer/bmwi/db02-bmwi-de.pixelpark.net.yaml +++ b/customer/bmwi/db02-bmwi-de.pixelpark.net.yaml @@ -1,5 +1,5 @@ --- -infra::role: base_for_old_systems # because we don't need xymon +infra::role: base_for_old_systems # because we don't need xymon infra::additional_classes: - accounts accounts::users: diff --git a/customer/bmwi/dev-bmwi.pixelpark.net.yaml b/customer/bmwi/dev-bmwi.pixelpark.net.yaml index 03c1b0f2..9bc26486 100644 --- a/customer/bmwi/dev-bmwi.pixelpark.net.yaml +++ b/customer/bmwi/dev-bmwi.pixelpark.net.yaml @@ -1,4 +1,3 @@ --- infra::additional_classes: - accounts - diff --git a/customer/bmwi/dev-db-bmwi-de.pixelpark.net.yaml b/customer/bmwi/dev-db-bmwi-de.pixelpark.net.yaml index bf42d7b6..96a724bc 100644 --- a/customer/bmwi/dev-db-bmwi-de.pixelpark.net.yaml +++ b/customer/bmwi/dev-db-bmwi-de.pixelpark.net.yaml @@ -1,5 +1,5 @@ --- -infra::role: base_for_old_systems # because we don't need xymon +infra::role: base_for_old_systems # because we don't need xymon infra::additional_classes: - accounts accounts::users: diff --git a/customer/bmwi/master01-bmwi-de.pixelpark.net.yaml b/customer/bmwi/master01-bmwi-de.pixelpark.net.yaml index a86ae86d..a5988311 100644 --- a/customer/bmwi/master01-bmwi-de.pixelpark.net.yaml +++ b/customer/bmwi/master01-bmwi-de.pixelpark.net.yaml @@ -3,4 +3,3 @@ infra::role: base infra::additional_classes: - accounts - pp_mcollective - diff --git a/customer/bmwi/slave01-bmwi-de.pixelpark.net.yaml b/customer/bmwi/slave01-bmwi-de.pixelpark.net.yaml index 1a29cf47..77bd9249 100644 --- a/customer/bmwi/slave01-bmwi-de.pixelpark.net.yaml +++ b/customer/bmwi/slave01-bmwi-de.pixelpark.net.yaml @@ -1,13 +1,13 @@ --- infra::role: base -#infra::additional_classes: +# infra::additional_classes: # - logstash logstash::generic_resource: catalina: resource: file - order: 10 # Input + order: 10 # Input parameters: path: '/opt/gsb/active/rls-tomcat/logs/catalina.out' type: catalina-tomcat @@ -16,7 +16,7 @@ logstash::generic_resource: - "%{customer}" webapp: resource: file - order: 10 # Input + order: 10 # Input parameters: path: '/opt/gsb/active/rls-tomcat/logs/webapp-replicationliveserver.log' type: webapp diff --git a/customer/bmwi/test-db01-bmwi-de.pixelpark.net.yaml b/customer/bmwi/test-db01-bmwi-de.pixelpark.net.yaml index bf42d7b6..96a724bc 100644 --- a/customer/bmwi/test-db01-bmwi-de.pixelpark.net.yaml +++ b/customer/bmwi/test-db01-bmwi-de.pixelpark.net.yaml @@ -1,5 +1,5 @@ --- -infra::role: base_for_old_systems # because we don't need xymon +infra::role: base_for_old_systems # because we don't need xymon infra::additional_classes: - accounts accounts::users: diff --git a/customer/bmwi/test-db02-bmwi-de.pixelpark.net.yaml b/customer/bmwi/test-db02-bmwi-de.pixelpark.net.yaml index bf42d7b6..96a724bc 100644 --- a/customer/bmwi/test-db02-bmwi-de.pixelpark.net.yaml +++ b/customer/bmwi/test-db02-bmwi-de.pixelpark.net.yaml @@ -1,5 +1,5 @@ --- -infra::role: base_for_old_systems # because we don't need xymon +infra::role: base_for_old_systems # because we don't need xymon infra::additional_classes: - accounts accounts::users: diff --git a/customer/bmwi/test-listserv-bmwi-de.pixelpark.net.yaml b/customer/bmwi/test-listserv-bmwi-de.pixelpark.net.yaml index a203e2c8..09e770b1 100644 --- a/customer/bmwi/test-listserv-bmwi-de.pixelpark.net.yaml +++ b/customer/bmwi/test-listserv-bmwi-de.pixelpark.net.yaml @@ -5,7 +5,6 @@ mailman::site_pw: 'CHANGEME' mailman::language: 'en' mailman::mta: 'Postfix' mailman::smtp_max_rcpts: '50' -mailman::enable_service: true httpd::webserver: test-listserv-bmwi-de-tmp.pixelpark.net: @@ -14,4 +13,4 @@ httpd::webserver: xymon::disks: '/boot': - ignore: true \ No newline at end of file + ignore: true diff --git a/customer/bmwi/test.yaml b/customer/bmwi/test.yaml index 3cd13b1b..68ec7358 100644 --- a/customer/bmwi/test.yaml +++ b/customer/bmwi/test.yaml @@ -1,3 +1,4 @@ +--- accounts::users: jenkins: apply: true diff --git a/customer/bmwi/www01-bmwi-de.pixelpark.net.yaml b/customer/bmwi/www01-bmwi-de.pixelpark.net.yaml index c90ec476..3b0442d3 100644 --- a/customer/bmwi/www01-bmwi-de.pixelpark.net.yaml +++ b/customer/bmwi/www01-bmwi-de.pixelpark.net.yaml @@ -1,3 +1,2 @@ --- infra::role: base - diff --git a/customer/buschjaeger/common.yaml b/customer/buschjaeger/common.yaml index 28c2d301..c84a9f5b 100644 --- a/customer/buschjaeger/common.yaml +++ b/customer/buschjaeger/common.yaml @@ -17,4 +17,4 @@ php::extensions: php::fpm::pools: www: - ensure: absent \ No newline at end of file + ensure: absent diff --git a/customer/buschjaeger/db02-buschjaeger-de.pixelpark.net.yaml b/customer/buschjaeger/db02-buschjaeger-de.pixelpark.net.yaml index 3b349ebf..48621b38 100644 --- a/customer/buschjaeger/db02-buschjaeger-de.pixelpark.net.yaml +++ b/customer/buschjaeger/db02-buschjaeger-de.pixelpark.net.yaml @@ -18,4 +18,3 @@ mysql::server::override_options: log-bin: 'binlog' binlog-format: 'MIXED' binlog-ignore-db: 'performance_schema, information_schema' - diff --git a/customer/buschjaeger/production.yaml b/customer/buschjaeger/production.yaml index 9958b126..23462f62 100644 --- a/customer/buschjaeger/production.yaml +++ b/customer/buschjaeger/production.yaml @@ -12,11 +12,11 @@ zookeeper::servers: solr::version: 6.3.0 solr::cloud: true solr::cloudmembers: - - search01-buschjaeger-de.pixelpark.net:2181 - - search02-buschjaeger-de.pixelpark.net:2181 - - search03-buschjaeger-de.pixelpark.net:2181 - - search04-buschjaeger-de.pixelpark.net:2181 -# We create empty core,because we get Config from Zookeeper, Read https://intra.pixelpark.com/confluence/x/khd1Ag how to move config files to zookeeper + - search01-buschjaeger-de.pixelpark.net:2181 + - search02-buschjaeger-de.pixelpark.net:2181 + - search03-buschjaeger-de.pixelpark.net:2181 + - search04-buschjaeger-de.pixelpark.net:2181 + # We create empty core,because we get Config from Zookeeper, Read https://intra.pixelpark.com/confluence/x/khd1Ag how to move config files to zookeeper solr::cores: german: {} austrian: {} @@ -69,7 +69,7 @@ infra::profile::typo3::projects: - busch-jaeger.de - www.busch-jaeger.com - busch-jaeger.com - # Pixelpark Aliase + # Pixelpark Aliase - web-buschjaeger-de.pixelpark.net - web01-buschjaeger-de.pixelpark.net - web02-buschjaeger-de.pixelpark.net diff --git a/customer/buschjaeger/web01-buschjaeger-de.pixelpark.net.yaml b/customer/buschjaeger/web01-buschjaeger-de.pixelpark.net.yaml index bf8f21a4..4ea92607 100644 --- a/customer/buschjaeger/web01-buschjaeger-de.pixelpark.net.yaml +++ b/customer/buschjaeger/web01-buschjaeger-de.pixelpark.net.yaml @@ -36,7 +36,7 @@ accounts::users: apply: true ### SFTP Accounts ### -#infra::profile::apache::pp_vhosts: +# infra::profile::apache::pp_vhosts: # update.busch-jaeger.de: # ip: 93.188.107.176 # docroot: '/var/www/html/update.busch-jaeger.de' diff --git a/customer/buschjaeger/web02-buschjaeger-de.pixelpark.net.yaml b/customer/buschjaeger/web02-buschjaeger-de.pixelpark.net.yaml index 8c43797a..aa25d7fc 100644 --- a/customer/buschjaeger/web02-buschjaeger-de.pixelpark.net.yaml +++ b/customer/buschjaeger/web02-buschjaeger-de.pixelpark.net.yaml @@ -36,7 +36,7 @@ accounts::users: apply: true ### SFTP Accounts ### -#infra::profile::apache::pp_vhosts: +# infra::profile::apache::pp_vhosts: # update.busch-jaeger.de: # ip: 93.188.107.177 # docroot: '/var/www/html/update.busch-jaeger.de' diff --git a/customer/cosar-test-customer/cosar-centos.pixelpark.com.yaml b/customer/cosar-test-customer/cosar-centos.pixelpark.com.yaml index a940ec64..fea40440 100644 --- a/customer/cosar-test-customer/cosar-centos.pixelpark.com.yaml +++ b/customer/cosar-test-customer/cosar-centos.pixelpark.com.yaml @@ -1,15 +1,15 @@ --- -infra::role: base_for_old_systems # because we don't need xymon +infra::role: base_for_old_systems # because we don't need xymon infra::additional_classes: - accounts -# Disable because of extra 7.3 download path -# - repo::redhat::zfs + # Disable because of extra 7.3 download path + # - repo::redhat::zfs - infra::profile::aem::author infra::profile::cron::cronjobs: zfs_rotation: user: root - command: '/usr/local/sbin/zfs_rotation.sh datapool 2592000' # 30 days + command: '/usr/local/sbin/zfs_rotation.sh datapool 2592000' # 30 days minute: 0 hour: 2 - description: ZFS Snapshot \ No newline at end of file + description: ZFS Snapshot diff --git a/modules/apache.yaml b/modules/apache.yaml index c0122885..cea4c570 100644 --- a/modules/apache.yaml +++ b/modules/apache.yaml @@ -27,7 +27,7 @@ apache::mod::deflate::types: - 'application/x-javascript application/javascript application/ecmascript' - 'application/rss+xml' - 'application/json' - - 'image/svg+xml' # new + - 'image/svg+xml' # new apache::log_formats: lb_combined: '%%{ich-trickse}{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%%{ich-trickse}{Referer}i\" \"%%{ich-trickse}{User-Agent}i\"' diff --git a/modules/epel.yaml b/modules/epel.yaml index bf4b75b4..e7750185 100644 --- a/modules/epel.yaml +++ b/modules/epel.yaml @@ -1,4 +1,4 @@ --- epel::epel_baseurl: "https://repo.pixelpark.com/Linux/yum/epel/%{operatingsystemmajrelease}/$basearch" -epel::epel_mirrorlist: absent \ No newline at end of file +epel::epel_mirrorlist: absent diff --git a/modules/mcollective.yaml b/modules/mcollective.yaml index 56f4ad0d..19fa17c4 100644 --- a/modules/mcollective.yaml +++ b/modules/mcollective.yaml @@ -1,3 +1,4 @@ +--- mcollective::connector: rabbitmq mcollective::securityprovider: ssl mcollective::classesfile: "%{puppet_vardir}/state/classes.txt" @@ -11,4 +12,3 @@ mcollective::ssl_server_public: puppet:///mco_dir/mcollective-servers-cert.pem mcollective::ssl_server_private: puppet:///mco_dir/mcollective-servers-key.pem mcollective::ssl_client_certs: puppet:///mco_dir/clients mcollective::core_libdir: '/usr/libexec/mcollective' - \ No newline at end of file diff --git a/modules/mysql.yaml b/modules/mysql.yaml index 4ece233c..b29fcbb5 100644 --- a/modules/mysql.yaml +++ b/modules/mysql.yaml @@ -1,15 +1,11 @@ --- - mysql::server::remove_default_accounts: true - - mysql::server::backup::backupuser: backup mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAp0L8xZAUtkyTLd/sptQP3QbzlR6T9GzTCIGonIBXYu7SlGh305KKCt8yUDtd2Wp0uJe/JMAfpJ091wEWV82hgpQarwGCWSIpG+JfewvnMnWlu1VCe5kPhisBZHM0iAzuJblsjDpVhpHxhXujKDlY7O7IsUpE/zNjN/tT+IhKXeQNaoM4pRgtzd21YDDTz6+Tz4rMH4nxdqK2BS1tu13GgqAh2siZzmgNRUQe9ZnUHLVRB6plYSDSMngF3CjdVWIs9r2JgVSdbVUJX/xRWhn0+qtTGsKz9loT2PflbtuLGINyts4WNXhZbTVI8K3I7UlQjBHP0ampUI1Kl8JqMBDdHDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBClJspHN3EpItpDsGEju9gbgCA2k6Xo8WRJKk1cjU8cru/Tihi+FCGEnT4eI7F1+GstuA==] mysql::server::backup::backupdir: /srv/backup/mysql mysql::server::backup::backuprotate: 3 mysql::server::backup::maxallowedpacket: '512M' - mysql::server::backup::file_per_database: true mysql::server::backup::time: - '21' - - '30' \ No newline at end of file + - '30' diff --git a/modules/ntp.yaml b/modules/ntp.yaml index d16258f6..5a3fa9fe 100644 --- a/modules/ntp.yaml +++ b/modules/ntp.yaml @@ -2,4 +2,4 @@ ntp::servers: - time01.pixelpark.com - time02.pixelpark.com - - time03.pixelpark.com \ No newline at end of file + - time03.pixelpark.com diff --git a/modules/php.yaml b/modules/php.yaml index 05f05cf3..0a790cd7 100644 --- a/modules/php.yaml +++ b/modules/php.yaml @@ -6,4 +6,4 @@ php::settings: php::manage_repos: false php::dev: false php::composer: false -php::pear: false \ No newline at end of file +php::pear: false diff --git a/modules/repo.yaml b/modules/repo.yaml index 5c6ebe78..2a7fe079 100644 --- a/modules/repo.yaml +++ b/modules/repo.yaml @@ -27,4 +27,4 @@ repo::redhat::centos::base_baseurl: 'https://repo.pixelpark.com/Linux/yum/centos repo::redhat::centos::updates_baseurl: 'https://repo.pixelpark.com/Linux/yum/centos/$releasever/updates/$basearch/' repo::redhat::centos::extra_baseurl: 'https://repo.pixelpark.com/Linux/yum/centos/$releasever/extras/$basearch/' -repo::redhat::passenger::baseurl: 'https://repo.pixelpark.com/Linux/yum/phusionpassenger/el/$releasever/$basearch' \ No newline at end of file +repo::redhat::passenger::baseurl: 'https://repo.pixelpark.com/Linux/yum/phusionpassenger/el/$releasever/$basearch' diff --git a/modules/rvm.yaml b/modules/rvm.yaml index 41008446..e6932b69 100644 --- a/modules/rvm.yaml +++ b/modules/rvm.yaml @@ -1,2 +1,2 @@ --- -rvm::key_server: 'hkp://keys.gnupg.net:80' \ No newline at end of file +rvm::key_server: 'hkp://keys.gnupg.net:80' diff --git a/modules/zabbix.yaml b/modules/zabbix.yaml index 97ba37b3..21d89993 100644 --- a/modules/zabbix.yaml +++ b/modules/zabbix.yaml @@ -6,4 +6,4 @@ zabbix::agent::serveractive: 217.66.51.48 # Fix some versions zabbix::repo::zabbix_version: 2.4 -zabbix::agent::zabbix_version: 2.4 \ No newline at end of file +zabbix::agent::zabbix_version: 2.4 -- 2.39.5