From 7e55b24932612ef3105f4d438fec083c6d451f27 Mon Sep 17 00:00:00 2001 From: Robert Waffen Date: Fri, 14 Sep 2018 17:06:11 +0200 Subject: [PATCH] fix lint for pixelpark --- customer/pixelpark/amor.pixelpark.net.yaml | 2 +- customer/pixelpark/amun.pixelpark.net.yaml | 2 +- customer/pixelpark/app01.sparkasse.local.yaml | 1 - customer/pixelpark/app02.sparkasse.local.yaml | 1 - customer/pixelpark/atropos.pixelpark.com.yaml | 10 ++-- customer/pixelpark/bat.pixelpark.net.yaml | 4 +- customer/pixelpark/bauhaus.pixelpark.com.yaml | 35 ++++++------ ...gadget-mercedes-benz-de.pixelpark.net.yaml | 1 - ...bilder-emmt-daimler-com.pixelpark.net.yaml | 1 - .../pixelpark/brownies.pixelpark.net.yaml | 1 - .../pixelpark/chat-db01.pixelpark.com.yaml | 6 +- .../pixelpark/cobbler-test.pixelpark.net.yaml | 1 - customer/pixelpark/cow.pixelpark.net.yaml | 2 +- customer/pixelpark/deploy.pixelpark.com.yaml | 2 +- .../pixelpark/dev-app01.sparkasse.local.yaml | 1 - .../pixelpark/dev-app02.sparkasse.local.yaml | 1 - .../dev-artifacts.pixelpark.com.yaml | 3 +- .../pixelpark/dev-chat.pixelpark.com.yaml | 7 +-- .../dev-hy01-demo.pixelpark.net.yaml | 2 +- .../dev-monitoring-client.pixelpark.com.yaml | 10 ++-- .../dev-monitoring.pixelpark.com.yaml | 56 +++++++++---------- .../pixelpark/dev-typo3.pixelpark.net.yaml | 4 +- .../pixelpark/dev-web02.sparkasse.local.yaml | 1 - .../pixelpark/extranet01.pixelpark.com.yaml | 6 +- customer/pixelpark/git01.pixelpark.com.yaml | 4 +- customer/pixelpark/grazien.pixelpark.com.yaml | 10 ++-- ...db-odt-daimler-com.pixelpark.internal.yaml | 1 - .../intra-collective01.pixelpark.com.yaml | 1 - customer/pixelpark/ipam.pixelpark.com.yaml | 2 +- .../its-vm-sastrass.pixelpark.com.yaml | 1 - .../ivan-wheezy64.pixelpark.com.yaml | 1 - customer/pixelpark/ivandeb.pixelpark.com.yaml | 1 - ...enkins-slave-virtualbox.pixelpark.net.yaml | 2 +- customer/pixelpark/levana.pixelpark.net.yaml | 2 +- customer/pixelpark/lug.pixelpark.com.yaml | 2 +- customer/pixelpark/mailex.pixelpark.com.yaml | 2 +- .../marketing-publicis-ai.pixelpark.net.yaml | 4 +- customer/pixelpark/minerva.pixelpark.com.yaml | 2 +- ...01-publicispixelpark-de.pixelpark.net.yaml | 2 +- .../pixelpark/mysql-pp07.pixelpark.com.yaml | 2 +- customer/pixelpark/nuadu.pixelpark.com.yaml | 5 +- .../pixelpark/owasp-zap.pixelpark.com.yaml | 4 +- ...od01-author-aem-sandbox.pixelpark.com.yaml | 2 +- ...1-publisher-aem-sandbox.pixelpark.com.yaml | 2 +- .../pixelpark/psql-pp01.pixelpark.net.yaml | 23 ++++---- .../puppet-schulung-1.novalocal.yaml | 1 - .../puppet-schulung-2.novalocal.yaml | 2 +- ...puppetmaster.cloud.pixelpark.internal.yaml | 2 +- .../pixelpark/racktables.pixelpark.com.yaml | 7 +-- customer/pixelpark/repo.pixelpark.com.yaml | 3 +- customer/pixelpark/review.pixelpark.com.yaml | 4 +- customer/pixelpark/sancus.pixelpark.com.yaml | 2 +- .../pixelpark/selenium.pixelpark.com.yaml | 2 +- .../solaris11-afs.pixelpark.com.yaml | 1 - ...ww-publicispixelpark-de.pixelpark.com.yaml | 12 ++-- .../pixelpark/streaming01.pixelpark.net.yaml | 1 - .../pixelpark/streaming01.pixelpark.tv.yaml | 1 - .../pixelpark/streaming02.pixelpark.net.yaml | 1 - .../pixelpark/streaming02.pixelpark.tv.yaml | 1 - .../test-confluence01.pixelpark.net.yaml | 16 +++--- .../test-extranet01.pixelpark.com.yaml | 2 +- .../pixelpark/test-jira01.pixelpark.net.yaml | 3 + ...t-marketing-publicis-ai.pixelpark.net.yaml | 4 +- .../test-monitoring-db.pixelpark.net.yaml | 2 +- .../test-monitoring01.pixelpark.net.yaml | 1 - .../test-psql-pp01.pixelpark.net.yaml | 28 +++++----- .../pixelpark/vm-elk-01.pixelpark.net.yaml | 2 +- .../pixelpark/vm-elk-02.pixelpark.net.yaml | 2 +- .../vm-neoload-02.pixelpark.net.yaml | 1 - ...puppetclient.cloud.pixelpark.internal.yaml | 2 +- customer/pixelpark/web01.sparkasse.de.yaml | 1 - customer/pixelpark/web02.sparkasse.local.yaml | 1 - ...ww-publicispixelpark-de.pixelpark.com.yaml | 8 +-- customer/pixelpark/xymon.pixelpark.com.yaml | 6 +- customer/pixelpark/zabbixTesting.yaml | 7 +-- 75 files changed, 164 insertions(+), 197 deletions(-) diff --git a/customer/pixelpark/amor.pixelpark.net.yaml b/customer/pixelpark/amor.pixelpark.net.yaml index 4fa9a57a..3c002ac1 100644 --- a/customer/pixelpark/amor.pixelpark.net.yaml +++ b/customer/pixelpark/amor.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 # facter override diff --git a/customer/pixelpark/amun.pixelpark.net.yaml b/customer/pixelpark/amun.pixelpark.net.yaml index 934946b3..b61b813c 100644 --- a/customer/pixelpark/amun.pixelpark.net.yaml +++ b/customer/pixelpark/amun.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 # fact override diff --git a/customer/pixelpark/app01.sparkasse.local.yaml b/customer/pixelpark/app01.sparkasse.local.yaml index 4cdc959a..0b60c4bd 100644 --- a/customer/pixelpark/app01.sparkasse.local.yaml +++ b/customer/pixelpark/app01.sparkasse.local.yaml @@ -1,4 +1,3 @@ --- infra::additional_classes: - repo - diff --git a/customer/pixelpark/app02.sparkasse.local.yaml b/customer/pixelpark/app02.sparkasse.local.yaml index 4cdc959a..0b60c4bd 100644 --- a/customer/pixelpark/app02.sparkasse.local.yaml +++ b/customer/pixelpark/app02.sparkasse.local.yaml @@ -1,4 +1,3 @@ --- infra::additional_classes: - repo - diff --git a/customer/pixelpark/atropos.pixelpark.com.yaml b/customer/pixelpark/atropos.pixelpark.com.yaml index da67051d..0dcc730f 100644 --- a/customer/pixelpark/atropos.pixelpark.com.yaml +++ b/customer/pixelpark/atropos.pixelpark.com.yaml @@ -8,11 +8,11 @@ infra::additional_classes: # Postfix configuration: # Global configurations -#postfix::alias_maps: "hash:/etc/aliases" -#postfix::inet_interfaces: 'all' -#postfix::manage_mailx: false -#postfix::mastercf_source: 'puppet:///postfix_dir/master-nullclient.cf' -#postfix::myorigin: "pixelpark.com" +# postfix::alias_maps: "hash:/etc/aliases" +# postfix::inet_interfaces: 'all' +# postfix::manage_mailx: false +# postfix::mastercf_source: 'puppet:///postfix_dir/master-nullclient.cf' +# postfix::myorigin: "pixelpark.com" xymon::load_warnlevel: '15.0' xymon::load_paniclevel: '20.0' diff --git a/customer/pixelpark/bat.pixelpark.net.yaml b/customer/pixelpark/bat.pixelpark.net.yaml index 4adbabc3..c5e95c5d 100644 --- a/customer/pixelpark/bat.pixelpark.net.yaml +++ b/customer/pixelpark/bat.pixelpark.net.yaml @@ -5,7 +5,7 @@ infra::additional_classes: - apache::mod::headers - infra::profile::apache - apache::mod::proxy_ajp - + accounts::users: katja.liell: apply: true @@ -32,7 +32,7 @@ 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' - proxy_preserve_host: On + proxy_preserve_host: 'On' proxy_pass: - { path: /, url: 'http://bat.pixelpark.net:8080/' } no_proxy_uris: diff --git a/customer/pixelpark/bauhaus.pixelpark.com.yaml b/customer/pixelpark/bauhaus.pixelpark.com.yaml index 8c45de4a..4cd74cc9 100644 --- a/customer/pixelpark/bauhaus.pixelpark.com.yaml +++ b/customer/pixelpark/bauhaus.pixelpark.com.yaml @@ -49,7 +49,7 @@ nginx::nginx_vhosts: # # Nexus # -nexus::nexus_work_dir_manage: false # Grund: Recursion ueber den kompletten Ordner mit Berechtigungsueberpruefung - dauert viel zu lange ist auch unnoetig das alle halbe Stunde zu machen +nexus::nexus_work_dir_manage: false # Grund: Recursion ueber den kompletten Ordner mit Berechtigungsueberpruefung - dauert viel zu lange ist auch unnoetig das alle halbe Stunde zu machen infra::profile::infrastructure::nexus::nginx_vhosts: nexus: server_name: @@ -109,23 +109,23 @@ infra::profile::infrastructure::sonarqube::nginx_vhosts: ssl_key: /etc/pki/tls/private/wildcard.pixelpark.com-key.pem ssl_redirect: true -#infra::profile::infrastructure::sonarqube::plugins: -# sonar-php-plugin: -# version: '2.8' -# groupid: 'org.sonarsource.php' +# infra::profile::infrastructure::sonarqube::plugins: +# sonar-php-plugin: +# version: '2.8' +# groupid: 'org.sonarsource.php' # Not found in any maven Repo -# sonar-css-plugin: -# version: 1.6 -# groupid: 'org.codehaus.sonar-plugins.css' -# sonar-web-plugin: -# version: '2.4' -# groupid: 'org.sonarsource.sonar-web-plugin' -# sonar-javascript-plugin: -# version: '2.12' -# groupid: 'org.sonarsource.javascript' -# sonar-build-breaker-plugin: -# version: '1.1' -# groupid: 'org.codehaus.sonar-plugins' +# sonar-css-plugin: +# version: 1.6 +# groupid: 'org.codehaus.sonar-plugins.css' +# sonar-web-plugin: +# version: '2.4' +# groupid: 'org.sonarsource.sonar-web-plugin' +# sonar-javascript-plugin: +# version: '2.12' +# groupid: 'org.sonarsource.javascript' +# sonar-build-breaker-plugin: +# version: '1.1' +# groupid: 'org.codehaus.sonar-plugins' # # Jenkins @@ -148,7 +148,6 @@ infra::profile::infrastructure::jenkins::nginx_vhosts: ssl_redirect: true proxy_connect_timeout: "600" proxy_read_timeout: "600" - proxy_connect_timeout: "600" infra::profile::infrastructure::jenkins::jobs: {} # master-Watcher: diff --git a/customer/pixelpark/bfs-gadget-mercedes-benz-de.pixelpark.net.yaml b/customer/pixelpark/bfs-gadget-mercedes-benz-de.pixelpark.net.yaml index 03c1b0f2..9bc26486 100644 --- a/customer/pixelpark/bfs-gadget-mercedes-benz-de.pixelpark.net.yaml +++ b/customer/pixelpark/bfs-gadget-mercedes-benz-de.pixelpark.net.yaml @@ -1,4 +1,3 @@ --- infra::additional_classes: - accounts - diff --git a/customer/pixelpark/bilder-emmt-daimler-com.pixelpark.net.yaml b/customer/pixelpark/bilder-emmt-daimler-com.pixelpark.net.yaml index 5dec4687..cd231d43 100644 --- a/customer/pixelpark/bilder-emmt-daimler-com.pixelpark.net.yaml +++ b/customer/pixelpark/bilder-emmt-daimler-com.pixelpark.net.yaml @@ -2,4 +2,3 @@ infra::additional_classes: - repo - accounts - diff --git a/customer/pixelpark/brownies.pixelpark.net.yaml b/customer/pixelpark/brownies.pixelpark.net.yaml index cd21505a..ed97d539 100644 --- a/customer/pixelpark/brownies.pixelpark.net.yaml +++ b/customer/pixelpark/brownies.pixelpark.net.yaml @@ -1,2 +1 @@ --- - diff --git a/customer/pixelpark/chat-db01.pixelpark.com.yaml b/customer/pixelpark/chat-db01.pixelpark.com.yaml index 3cc939e6..3903722d 100644 --- a/customer/pixelpark/chat-db01.pixelpark.com.yaml +++ b/customer/pixelpark/chat-db01.pixelpark.com.yaml @@ -3,9 +3,9 @@ infra::role: base infra::additional_classes: - infra::profile::mongodb_server -infra::profile::mongodb_server::backup::replicaonslave: 'no' # Wir sind eine Standalone Instance -infra::profile::mongodb_server::backup::oplog: 'no' # we don't use an oplog -mongodb::server::master: true # Wir sind eine Standalone Instance +infra::profile::mongodb_server::backup::replicaonslave: 'no' # Wir sind eine Standalone Instance +infra::profile::mongodb_server::backup::oplog: 'no' # we don't use an oplog +mongodb::server::master: true # Wir sind eine Standalone Instance mongodb::server::bind_ip: '0.0.0.0' mongodb::server::ssl: true mongodb::server::ssl_key: '/etc/ssl/wildcard.pixelpark.com-key.pem' diff --git a/customer/pixelpark/cobbler-test.pixelpark.net.yaml b/customer/pixelpark/cobbler-test.pixelpark.net.yaml index 49dbd72d..5c24cb63 100644 --- a/customer/pixelpark/cobbler-test.pixelpark.net.yaml +++ b/customer/pixelpark/cobbler-test.pixelpark.net.yaml @@ -8,4 +8,3 @@ infra::additional_classes: java::package: 'java-1.8.0-openjdk-devel' logstash::verbose_run: true - diff --git a/customer/pixelpark/cow.pixelpark.net.yaml b/customer/pixelpark/cow.pixelpark.net.yaml index fa6ce89a..1cefa89f 100644 --- a/customer/pixelpark/cow.pixelpark.net.yaml +++ b/customer/pixelpark/cow.pixelpark.net.yaml @@ -6,4 +6,4 @@ infra::additional_classes: accounts::users: ivan.prikhodko: apply: true - sudo: true \ No newline at end of file + sudo: true diff --git a/customer/pixelpark/deploy.pixelpark.com.yaml b/customer/pixelpark/deploy.pixelpark.com.yaml index d8c2a592..8b889c44 100644 --- a/customer/pixelpark/deploy.pixelpark.com.yaml +++ b/customer/pixelpark/deploy.pixelpark.com.yaml @@ -17,7 +17,7 @@ infra::profile::ansible::optional_packages: logstash::generic_resource: ansible: resource: file - order: 10 # Input + order: 10 # Input parameters: path: '/var/log/ansible/*.log' type: ansible-log diff --git a/customer/pixelpark/dev-app01.sparkasse.local.yaml b/customer/pixelpark/dev-app01.sparkasse.local.yaml index 4cdc959a..0b60c4bd 100644 --- a/customer/pixelpark/dev-app01.sparkasse.local.yaml +++ b/customer/pixelpark/dev-app01.sparkasse.local.yaml @@ -1,4 +1,3 @@ --- infra::additional_classes: - repo - diff --git a/customer/pixelpark/dev-app02.sparkasse.local.yaml b/customer/pixelpark/dev-app02.sparkasse.local.yaml index 4cdc959a..0b60c4bd 100644 --- a/customer/pixelpark/dev-app02.sparkasse.local.yaml +++ b/customer/pixelpark/dev-app02.sparkasse.local.yaml @@ -1,4 +1,3 @@ --- infra::additional_classes: - repo - diff --git a/customer/pixelpark/dev-artifacts.pixelpark.com.yaml b/customer/pixelpark/dev-artifacts.pixelpark.com.yaml index af2226cc..3f1793d6 100644 --- a/customer/pixelpark/dev-artifacts.pixelpark.com.yaml +++ b/customer/pixelpark/dev-artifacts.pixelpark.com.yaml @@ -49,7 +49,7 @@ resolv_conf::searchpath: ##################################################### # Nexus Geraffel -# Grund: Recursion ueber den kompletten Ordner mit Berechtigungsueberpruefung - +# Grund: Recursion ueber den kompletten Ordner mit Berechtigungsueberpruefung - # dauert viel zu lange ist auch unnoetig das alle halbe Stunde zu machen nexus::nexus_work_dir_manage: false @@ -74,4 +74,3 @@ infra::profile::infrastructure::nexus::version: '3.11.0-01' # fact override nginx::config::http2: 'on' - diff --git a/customer/pixelpark/dev-chat.pixelpark.com.yaml b/customer/pixelpark/dev-chat.pixelpark.com.yaml index d7dded1a..2ec196dc 100644 --- a/customer/pixelpark/dev-chat.pixelpark.com.yaml +++ b/customer/pixelpark/dev-chat.pixelpark.com.yaml @@ -53,9 +53,9 @@ nginx::nginx_upstreams: members: - 127.0.0.1:3000 -infra::profile::mongodb_server::backup::replicaonslave: 'no' # Wir sind eine Standalone Instance -infra::profile::mongodb_server::backup::oplog: 'no' # we don't use an oplog -mongodb::server::master: true # Wir sind eine Standalone Instance +infra::profile::mongodb_server::backup::replicaonslave: 'no' # Wir sind eine Standalone Instance +infra::profile::mongodb_server::backup::oplog: 'no' # we don't use an oplog +mongodb::server::master: true # Wir sind eine Standalone Instance mongodb::server::bind_ip: - '0.0.0.0' mongodb::server::ssl: true @@ -77,4 +77,3 @@ infra::profile::mongodb_server::backup::db_username: 'backup' infra::profile::mongodb_server::backup::db_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEADnsZr8XUejQ9RYfJPQBj3rJj9EMyF7GRavfTV30xrV56hzpCwzCrtjSkiyFFTg4ZEGZtK52mx7neAQ0McfX/gtXM4IJodSJ7x8jmlnFH0VvSki7pmuAolQ1IzHkUSLLTjabCqG+lj+ehv1WUy5RHVhV9K16GmSpORIwHVcPTUC/cZlXeYouBcM1f2e4FaO8XF+jT28h6Vr91ib2KxkGHDfrcE0JaSOrRa+FXWTZciCfpBDtk9TwvAoo7jneWCXL9uRjA0UjPjK3GJo2tPICOKl4Yj0uAgkp/9Ydg3y22SjVpCEEihvHinTRx1cppuVPeGJD5nAwFztdawlkONbH5KjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDxolzY/HNhKuX84v2/+nA2gCBmeCtYKIQ2p3uTi8vbAIqX9G6EFrEgUKPbRvHS/wbPxw==] rocket_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEABIDfV58nF0XEFjPS+zwb+X0H99upbpHvwSsY/V5Cf41T5ifJxPQWWmyYksKd8FGRnLEw82IglmMDmMX7RN3glQ1/Jmk1HXrURYFTVdo0+2LGBDdf+7KDBWvGC9y0s73hxNz7mcN7lGfYEGy+BSPvTBSv0J3tgCzcpPDbNEbC3Q8UWXBqpxinvrtEU7FWDwswslkUS9enrsvzAgBwb6Gd4Frzn9Bn9fyT3UkIs05UHudPhqY5PJHv7HXk0lbh8eUTF+WZTsm06nKjrTfs851yLbNp0f8j0CHb5BjhwXj8iPv1CyYlbW7OaqDeM886D7UC9qG1Dth8PLdYM3TEex65+DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBKsqKaYeW/OMwpMx3Ii80VgCCAtXimV5KVpklI6qVNGdXL4LE1Upz3zLr5nnCsnGY0/w==] - diff --git a/customer/pixelpark/dev-hy01-demo.pixelpark.net.yaml b/customer/pixelpark/dev-hy01-demo.pixelpark.net.yaml index 7d9b2347..3b0442d3 100644 --- a/customer/pixelpark/dev-hy01-demo.pixelpark.net.yaml +++ b/customer/pixelpark/dev-hy01-demo.pixelpark.net.yaml @@ -1,2 +1,2 @@ --- -infra::role: base \ No newline at end of file +infra::role: base diff --git a/customer/pixelpark/dev-monitoring-client.pixelpark.com.yaml b/customer/pixelpark/dev-monitoring-client.pixelpark.com.yaml index f74ee686..5c888d4d 100644 --- a/customer/pixelpark/dev-monitoring-client.pixelpark.com.yaml +++ b/customer/pixelpark/dev-monitoring-client.pixelpark.com.yaml @@ -14,10 +14,10 @@ icinga2::feature::notification::ensure: absent # custom checkcommands muessen spaeter nach common.yaml infra::profile::icinga2::object::checkcommand: - 'check_service_crond': - import: - - 'ipv4-or-ipv6' - command: '/opt/pixelpark-monitoring-checks/check_service crond' - target: '/etc/icinga2/conf.d/pixelpark-monitoring-checkcommands.conf' + 'check_service_crond': + import: + - 'ipv4-or-ipv6' + command: '/opt/pixelpark-monitoring-checks/check_service crond' + target: '/etc/icinga2/conf.d/pixelpark-monitoring-checkcommands.conf' # custom checkcommands muessen spaeter nach common.yaml diff --git a/customer/pixelpark/dev-monitoring.pixelpark.com.yaml b/customer/pixelpark/dev-monitoring.pixelpark.com.yaml index 4726d407..84753995 100644 --- a/customer/pixelpark/dev-monitoring.pixelpark.com.yaml +++ b/customer/pixelpark/dev-monitoring.pixelpark.com.yaml @@ -41,8 +41,6 @@ icinga2::feature::idomysql::password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYC icinga2::feature::idomysql::database: 'icinga_ido' icinga2::feature::idomysql::import_schema: true - - infra::profile::icinga2::object::user: 'icingaadmin': target: '/etc/icinga2/conf.d/users.conf' @@ -184,7 +182,7 @@ infra::profile::icinga2::object::service: import: - 'generic-service' check_command: 'check_systemd' -#_ppplugindir_ +# _ppplugindir_ command_endpoint: 'host.name' apply: true assign: @@ -195,7 +193,7 @@ infra::profile::icinga2::object::service: import: - 'generic-service' check_command: 'check_service_crond' -#_ppplugindir_ +# _ppplugindir_ command_endpoint: 'host.name' apply: true assign: @@ -206,7 +204,7 @@ infra::profile::icinga2::object::service: import: - 'generic-service' check_command: 'check_service_rsyslog' -#_ppplugindir_ +# _ppplugindir_ command_endpoint: 'host.name' apply: true assign: @@ -217,7 +215,7 @@ infra::profile::icinga2::object::service: import: - 'generic-service' check_command: 'check_service_postfix' -#_ppplugindir_ +# _ppplugindir_ command_endpoint: 'host.name' apply: true assign: @@ -232,7 +230,7 @@ infra::profile::icinga2::object::service: 'mailq_warning': 1 'mailq_critical': 5 'mailq_servertype': 'postfix' -#_ppplugindir_ +# _ppplugindir_ command_endpoint: 'host.name' apply: true assign: @@ -247,7 +245,7 @@ infra::profile::icinga2::object::service: 'warning': 1 'critical': 5 'address': 'time.pixelpark.com' -#_ppplugindir_ +# _ppplugindir_ command_endpoint: 'host.name' apply: true assign: @@ -261,7 +259,7 @@ infra::profile::icinga2::object::service: vars: 'swap_wfree': '25%' 'swap_cfree': '10%' -#_ppplugindir_ +# _ppplugindir_ command_endpoint: 'host.name' apply: true assign: @@ -283,26 +281,26 @@ infra::profile::icinga2::object::checkcommand: - 'ipv4-or-ipv6' command: '/opt/pixelpark-monitoring-checks/check_publicis_ad' target: '/etc/icinga2/conf.d/pixelpark-monitoring-checks.conf' - 'check_service_crond': - import: - - 'ipv4-or-ipv6' - command: '/opt/pixelpark-monitoring-checks/check_service crond' - target: '/etc/icinga2/conf.d/pixelpark-monitoring-checkcommands.conf' - 'check_service_rsyslog': - import: - - 'ipv4-or-ipv6' - command: '/opt/pixelpark-monitoring-checks/check_service rsyslog' - target: '/etc/icinga2/conf.d/pixelpark-monitoring-checkcommands.conf' - 'check_service_postfix': - import: - - 'ipv4-or-ipv6' - command: '/opt/pixelpark-monitoring-checks/check_service postfix' - target: '/etc/icinga2/conf.d/pixelpark-monitoring-checkcommands.conf' - 'check_systemd': - import: - - 'ipv4-or-ipv6' - command: '/opt/pixelpark-monitoring-checks/check_systemd' - target: '/etc/icinga2/conf.d/pixelpark-monitoring-checkcommands.conf' + 'check_service_crond': + import: + - 'ipv4-or-ipv6' + command: '/opt/pixelpark-monitoring-checks/check_service crond' + target: '/etc/icinga2/conf.d/pixelpark-monitoring-checkcommands.conf' + 'check_service_rsyslog': + import: + - 'ipv4-or-ipv6' + command: '/opt/pixelpark-monitoring-checks/check_service rsyslog' + target: '/etc/icinga2/conf.d/pixelpark-monitoring-checkcommands.conf' + 'check_service_postfix': + import: + - 'ipv4-or-ipv6' + command: '/opt/pixelpark-monitoring-checks/check_service postfix' + target: '/etc/icinga2/conf.d/pixelpark-monitoring-checkcommands.conf' + 'check_systemd': + import: + - 'ipv4-or-ipv6' + command: '/opt/pixelpark-monitoring-checks/check_systemd' + target: '/etc/icinga2/conf.d/pixelpark-monitoring-checkcommands.conf' infra::profile::icinga2::object::hostgroup: 'linux-servers': diff --git a/customer/pixelpark/dev-typo3.pixelpark.net.yaml b/customer/pixelpark/dev-typo3.pixelpark.net.yaml index cef2c3d2..12345855 100644 --- a/customer/pixelpark/dev-typo3.pixelpark.net.yaml +++ b/customer/pixelpark/dev-typo3.pixelpark.net.yaml @@ -39,8 +39,8 @@ accounts::users: apply: true sudo: true stephan.vits: - apply: true - sudo: true + apply: true + sudo: true christian.schoenherr: apply: true sudo: true diff --git a/customer/pixelpark/dev-web02.sparkasse.local.yaml b/customer/pixelpark/dev-web02.sparkasse.local.yaml index 4cdc959a..0b60c4bd 100644 --- a/customer/pixelpark/dev-web02.sparkasse.local.yaml +++ b/customer/pixelpark/dev-web02.sparkasse.local.yaml @@ -1,4 +1,3 @@ --- infra::additional_classes: - repo - diff --git a/customer/pixelpark/extranet01.pixelpark.com.yaml b/customer/pixelpark/extranet01.pixelpark.com.yaml index 731d0071..08c4b0df 100644 --- a/customer/pixelpark/extranet01.pixelpark.com.yaml +++ b/customer/pixelpark/extranet01.pixelpark.com.yaml @@ -13,10 +13,10 @@ infra::additional_classes: infra::profile::apache::pp_vhosts: extranet: docroot: /var/www/extranet - servername: extranet.pixelpark.com # wenn fertig umgezogen + servername: extranet.pixelpark.com # wenn fertig umgezogen serveraliases: - - extranet01.pixelpark.net # DNS Eintrag - - extranet01.pixelpark.com # CNAME von extranet01.pixelpark.net + - extranet01.pixelpark.net # DNS Eintrag + - extranet01.pixelpark.com # CNAME von extranet01.pixelpark.net cert_servername: 'wildcard.pixelpark.com' cert_customer: 'pixelpark' ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.com-cert.pem' diff --git a/customer/pixelpark/git01.pixelpark.com.yaml b/customer/pixelpark/git01.pixelpark.com.yaml index 0c48dfbe..02e65f2d 100644 --- a/customer/pixelpark/git01.pixelpark.com.yaml +++ b/customer/pixelpark/git01.pixelpark.com.yaml @@ -23,7 +23,7 @@ nginx::nginx_vhosts: ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.com-cert.pem ssl_key: /etc/pki/tls/private/wildcard.pixelpark.com-key.pem rewrite_to_https: true - client_max_body_size: '250m'# + client_max_body_size: '250m' use_default_location: false error_pages: '404': '/404.html' @@ -69,4 +69,4 @@ nginx::nginx_vhosts: - 'X-Forwarded-Proto $scheme' - 'X-Forwarded-For $proxy_add_x_forwarded_for' - 'X-Real-IP $remote_addr' - - 'Host $http_host' \ No newline at end of file + - 'Host $http_host' diff --git a/customer/pixelpark/grazien.pixelpark.com.yaml b/customer/pixelpark/grazien.pixelpark.com.yaml index da67051d..0dcc730f 100644 --- a/customer/pixelpark/grazien.pixelpark.com.yaml +++ b/customer/pixelpark/grazien.pixelpark.com.yaml @@ -8,11 +8,11 @@ infra::additional_classes: # Postfix configuration: # Global configurations -#postfix::alias_maps: "hash:/etc/aliases" -#postfix::inet_interfaces: 'all' -#postfix::manage_mailx: false -#postfix::mastercf_source: 'puppet:///postfix_dir/master-nullclient.cf' -#postfix::myorigin: "pixelpark.com" +# postfix::alias_maps: "hash:/etc/aliases" +# postfix::inet_interfaces: 'all' +# postfix::manage_mailx: false +# postfix::mastercf_source: 'puppet:///postfix_dir/master-nullclient.cf' +# postfix::myorigin: "pixelpark.com" xymon::load_warnlevel: '15.0' xymon::load_paniclevel: '20.0' diff --git a/customer/pixelpark/int-db-odt-daimler-com.pixelpark.internal.yaml b/customer/pixelpark/int-db-odt-daimler-com.pixelpark.internal.yaml index 03c1b0f2..9bc26486 100644 --- a/customer/pixelpark/int-db-odt-daimler-com.pixelpark.internal.yaml +++ b/customer/pixelpark/int-db-odt-daimler-com.pixelpark.internal.yaml @@ -1,4 +1,3 @@ --- infra::additional_classes: - accounts - diff --git a/customer/pixelpark/intra-collective01.pixelpark.com.yaml b/customer/pixelpark/intra-collective01.pixelpark.com.yaml index 31d46bec..54d18ca6 100644 --- a/customer/pixelpark/intra-collective01.pixelpark.com.yaml +++ b/customer/pixelpark/intra-collective01.pixelpark.com.yaml @@ -1,4 +1,3 @@ --- infra::additional_classes: - xymon - diff --git a/customer/pixelpark/ipam.pixelpark.com.yaml b/customer/pixelpark/ipam.pixelpark.com.yaml index 2008f1cb..541a1f39 100644 --- a/customer/pixelpark/ipam.pixelpark.com.yaml +++ b/customer/pixelpark/ipam.pixelpark.com.yaml @@ -19,7 +19,7 @@ infra::profile::apache::pp_vhosts: ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.com-cert.pem' ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.com-key.pem' ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.com-cert.pem' - + rewrites_non_ssl: - https: comment: 'all to https' diff --git a/customer/pixelpark/its-vm-sastrass.pixelpark.com.yaml b/customer/pixelpark/its-vm-sastrass.pixelpark.com.yaml index c90ec476..3b0442d3 100644 --- a/customer/pixelpark/its-vm-sastrass.pixelpark.com.yaml +++ b/customer/pixelpark/its-vm-sastrass.pixelpark.com.yaml @@ -1,3 +1,2 @@ --- infra::role: base - diff --git a/customer/pixelpark/ivan-wheezy64.pixelpark.com.yaml b/customer/pixelpark/ivan-wheezy64.pixelpark.com.yaml index d06336c4..838b90bb 100644 --- a/customer/pixelpark/ivan-wheezy64.pixelpark.com.yaml +++ b/customer/pixelpark/ivan-wheezy64.pixelpark.com.yaml @@ -19,4 +19,3 @@ xymon::check::rabbitmq::members: - rabbitmq02.test-cloud.pixelpark.internal:5672 xymon::check::rabbitmq::password: 'sUTrsaeSKduY33io' xymon::check::rabbitmq::user: 'guest' - diff --git a/customer/pixelpark/ivandeb.pixelpark.com.yaml b/customer/pixelpark/ivandeb.pixelpark.com.yaml index b05138fa..709e46cb 100644 --- a/customer/pixelpark/ivandeb.pixelpark.com.yaml +++ b/customer/pixelpark/ivandeb.pixelpark.com.yaml @@ -2,4 +2,3 @@ infra::additional_classes: - motd - tcsh - diff --git a/customer/pixelpark/jenkins-slave-virtualbox.pixelpark.net.yaml b/customer/pixelpark/jenkins-slave-virtualbox.pixelpark.net.yaml index a709c950..e4d29398 100644 --- a/customer/pixelpark/jenkins-slave-virtualbox.pixelpark.net.yaml +++ b/customer/pixelpark/jenkins-slave-virtualbox.pixelpark.net.yaml @@ -2,4 +2,4 @@ infra::role: base accounts::users: jenkins: - managed: false \ No newline at end of file + managed: false diff --git a/customer/pixelpark/levana.pixelpark.net.yaml b/customer/pixelpark/levana.pixelpark.net.yaml index 5dddc17d..5d719968 100644 --- a/customer/pixelpark/levana.pixelpark.net.yaml +++ b/customer/pixelpark/levana.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 # fact override diff --git a/customer/pixelpark/lug.pixelpark.com.yaml b/customer/pixelpark/lug.pixelpark.com.yaml index ad484e4f..60f5748c 100644 --- a/customer/pixelpark/lug.pixelpark.com.yaml +++ b/customer/pixelpark/lug.pixelpark.com.yaml @@ -2,7 +2,7 @@ infra::role: base infra::additional_classes: - zabbix::agent - + zabbix::agent::server: '217.66.51.48,217.66.51.91' zabbix::agent::manage_repo: false diff --git a/customer/pixelpark/mailex.pixelpark.com.yaml b/customer/pixelpark/mailex.pixelpark.com.yaml index d73e4952..4893829e 100644 --- a/customer/pixelpark/mailex.pixelpark.com.yaml +++ b/customer/pixelpark/mailex.pixelpark.com.yaml @@ -6,7 +6,7 @@ infra::additional_classes: logstash::generic_resource: ansible: resource: file - order: 10 # Input + order: 10 # Input parameters: path: '/var/log/maillog' type: mailex diff --git a/customer/pixelpark/marketing-publicis-ai.pixelpark.net.yaml b/customer/pixelpark/marketing-publicis-ai.pixelpark.net.yaml index f522476e..d47a72be 100644 --- a/customer/pixelpark/marketing-publicis-ai.pixelpark.net.yaml +++ b/customer/pixelpark/marketing-publicis-ai.pixelpark.net.yaml @@ -89,9 +89,9 @@ infra::profile::apache::htdigest: infra::profile::apache::pp_vhosts: marketing: docroot: /var/www/marketing - servername: marketing-publicis-ai.pixelpark.net # Realserver Name + servername: marketing-publicis-ai.pixelpark.net # Realserver Name serveraliases: - - campaign.pixelpark.com # LB VIP + - campaign.pixelpark.com # LB VIP cert_servername: 'wildcard.pixelpark.com' cert_customer: 'pixelpark' ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.com-cert.pem' diff --git a/customer/pixelpark/minerva.pixelpark.com.yaml b/customer/pixelpark/minerva.pixelpark.com.yaml index 3b2d165f..f246dc01 100644 --- a/customer/pixelpark/minerva.pixelpark.com.yaml +++ b/customer/pixelpark/minerva.pixelpark.com.yaml @@ -1,3 +1,3 @@ --- # time03.pixelpark.com -infra::profile::ntp::disable_ntp: true \ No newline at end of file +infra::profile::ntp::disable_ntp: true diff --git a/customer/pixelpark/monitor-db01-publicispixelpark-de.pixelpark.net.yaml b/customer/pixelpark/monitor-db01-publicispixelpark-de.pixelpark.net.yaml index f2d282cf..cbb57114 100644 --- a/customer/pixelpark/monitor-db01-publicispixelpark-de.pixelpark.net.yaml +++ b/customer/pixelpark/monitor-db01-publicispixelpark-de.pixelpark.net.yaml @@ -1,4 +1,4 @@ --- -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 diff --git a/customer/pixelpark/mysql-pp07.pixelpark.com.yaml b/customer/pixelpark/mysql-pp07.pixelpark.com.yaml index e8b02399..4e4be4bf 100644 --- a/customer/pixelpark/mysql-pp07.pixelpark.com.yaml +++ b/customer/pixelpark/mysql-pp07.pixelpark.com.yaml @@ -11,7 +11,7 @@ mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEh mysql::server::override_options: mysqld: bind-address: '0.0.0.0' - innodb_file_per_table: ON + innodb_file_per_table: true max_allowed_packet: 512M innodb_log_file_size: 768M innodb_log_buffer_size: 32M diff --git a/customer/pixelpark/nuadu.pixelpark.com.yaml b/customer/pixelpark/nuadu.pixelpark.com.yaml index b01e610d..8bcc2d06 100644 --- a/customer/pixelpark/nuadu.pixelpark.com.yaml +++ b/customer/pixelpark/nuadu.pixelpark.com.yaml @@ -3,12 +3,11 @@ infra::role: base infra::additional_classes: - infra::profile::mcollective::common - zabbix::agent - + zabbix::agent::server: '217.66.51.48,217.66.51.91' zabbix::agent::manage_repo: false - + accounts::users: ivan.prikhodko: apply: true sudo: true - diff --git a/customer/pixelpark/owasp-zap.pixelpark.com.yaml b/customer/pixelpark/owasp-zap.pixelpark.com.yaml index 33fa3567..cb843f73 100644 --- a/customer/pixelpark/owasp-zap.pixelpark.com.yaml +++ b/customer/pixelpark/owasp-zap.pixelpark.com.yaml @@ -3,7 +3,7 @@ infra::role: base infra::additional_classes: - infra::profile::apache accounts::users: - stephan.vits: # Rollout Stephan as Tester + stephan.vits: # Rollout Stephan as Tester apply: true sudo: true infra::profile::apache::pp_vhosts: @@ -20,4 +20,4 @@ infra::profile::apache::pp_vhosts: - https: comment: 'all to https' rewrite_rule: - - '^(.*)$ https://owasp-zap.pixelpark.com$1 [L,R=301]' \ No newline at end of file + - '^(.*)$ https://owasp-zap.pixelpark.com$1 [L,R=301]' diff --git a/customer/pixelpark/prod01-author-aem-sandbox.pixelpark.com.yaml b/customer/pixelpark/prod01-author-aem-sandbox.pixelpark.com.yaml index d81d3fef..6df7596b 100644 --- a/customer/pixelpark/prod01-author-aem-sandbox.pixelpark.com.yaml +++ b/customer/pixelpark/prod01-author-aem-sandbox.pixelpark.com.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 # facter override diff --git a/customer/pixelpark/prod01-publisher-aem-sandbox.pixelpark.com.yaml b/customer/pixelpark/prod01-publisher-aem-sandbox.pixelpark.com.yaml index 4fa9a57a..3c002ac1 100644 --- a/customer/pixelpark/prod01-publisher-aem-sandbox.pixelpark.com.yaml +++ b/customer/pixelpark/prod01-publisher-aem-sandbox.pixelpark.com.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 # facter override diff --git a/customer/pixelpark/psql-pp01.pixelpark.net.yaml b/customer/pixelpark/psql-pp01.pixelpark.net.yaml index e0d973c3..f1ed1dde 100644 --- a/customer/pixelpark/psql-pp01.pixelpark.net.yaml +++ b/customer/pixelpark/psql-pp01.pixelpark.net.yaml @@ -6,10 +6,10 @@ accounts::users: # custom-admins infra::role: base -#infra::additional_classes: -# - infra::profile::postgresql_server -# - www_tree -# - pp_postgresql::backup +# infra::additional_classes: +# - infra::profile::postgresql_server +# - www_tree +# - pp_postgresql::backup postgresql::globals::validcon_script_path: "/www/tmp/valid_postgres_connection.sh" postgresql::globals::version: "9.3" @@ -18,17 +18,17 @@ postgresql::conf::shared_buffers: value: "4096MB" postgresql::server::ipv4acls: - - "host confluence confluence 217.66.53.114/32 md5" # Confluence - - "host confluence confluence 217.66.51.0/24 md5" # Confluence Admin Netz - - "host jira jira 217.66.53.113/32 md5" # Jira - - "host jira jira 217.66.51.0/24 md5" # Jira Admin Netz + - "host confluence confluence 217.66.53.114/32 md5" # Confluence + - "host confluence confluence 217.66.51.0/24 md5" # Confluence Admin Netz + - "host jira jira 217.66.53.113/32 md5" # Jira + - "host jira jira 217.66.51.0/24 md5" # Jira Admin Netz - "host confluence_ext confluence_ext 217.66.52.72/32 md5" - "host confluence_ext confluence_ext 217.66.51.0/24 md5" - - "host postgres xymon 217.66.53.169/32 trust" # Xymon monitoring User + - "host postgres xymon 217.66.53.169/32 trust" # Xymon monitoring User - "host puppetdb_live puppetdb 93.188.104.37/32 md5" - "host foreman_live foreman 93.188.104.39/32 md5" - - "host gerrit gerrit 217.66.53.243/32 md5" # Gerrit - - "host gitlab gitlab 217.66.53.247/32 md5" # Gitlab + - "host gerrit gerrit 217.66.53.243/32 md5" # Gerrit + - "host gitlab gitlab 217.66.53.247/32 md5" # Gitlab - "host all ppadmin 217.66.51.0/24 md5" - "host all ppadmin 217.66.53.169/32 md5" @@ -85,4 +85,3 @@ infra::profile::postgresql_server::databases: user: gitlab tablespace: ts_gitlab password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAiaTRnXoqqntq/hQNQ8GeQ3GYGFhOOqbKm6ZDir8vvv7eWwz9J7MbkbdlvSrqFZ6SlJY9EIPHm/XP8yGJeSCAqyhVheQteWxj9RhUltslCQNpB5ytJSoMzMDwy/DlRDkcyLCSBd5FxVO3EkMc8BvqlwJ+Y4st1QYqInJzIsFNipk+ctD3zRMlbtWEcnwNaHLUMqkB3eYAlKEljDf6U8cjKYx/RxATbgzGYCFc6H7Ku9GeXdmXjF9nOd2l5XZoL/Exm93UTT2rTsJl4SLnk0TCNTYB0tcBsomnhBSjwxKkXGuEARrErhIdTN72Ph3k916QhY11dXM/qIC5p9ZRyVkNRDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBcGn4icdib/AYF31XThsMrgCBAMArSMWPgWeZbn8xLkpzcHegmVqHaUx0rm8uS4AeAwg==] - diff --git a/customer/pixelpark/puppet-schulung-1.novalocal.yaml b/customer/pixelpark/puppet-schulung-1.novalocal.yaml index 85d068e4..2294b807 100644 --- a/customer/pixelpark/puppet-schulung-1.novalocal.yaml +++ b/customer/pixelpark/puppet-schulung-1.novalocal.yaml @@ -4,4 +4,3 @@ accounts::users: apply: true sudo: true bash::package_ensure: latest - diff --git a/customer/pixelpark/puppet-schulung-2.novalocal.yaml b/customer/pixelpark/puppet-schulung-2.novalocal.yaml index e00bd9eb..1caf5761 100644 --- a/customer/pixelpark/puppet-schulung-2.novalocal.yaml +++ b/customer/pixelpark/puppet-schulung-2.novalocal.yaml @@ -2,4 +2,4 @@ accounts::users: ivan.prikhodko: apply: true - sudo: true \ No newline at end of file + sudo: true diff --git a/customer/pixelpark/puppetmaster.cloud.pixelpark.internal.yaml b/customer/pixelpark/puppetmaster.cloud.pixelpark.internal.yaml index d137b351..82785c88 100644 --- a/customer/pixelpark/puppetmaster.cloud.pixelpark.internal.yaml +++ b/customer/pixelpark/puppetmaster.cloud.pixelpark.internal.yaml @@ -3,4 +3,4 @@ puppetconf::params::is_puppetmaster: true accounts::users: thomas.bussmeyer: apply: true - sudo: true \ No newline at end of file + sudo: true diff --git a/customer/pixelpark/racktables.pixelpark.com.yaml b/customer/pixelpark/racktables.pixelpark.com.yaml index 4706e9f0..383edb24 100644 --- a/customer/pixelpark/racktables.pixelpark.com.yaml +++ b/customer/pixelpark/racktables.pixelpark.com.yaml @@ -10,7 +10,6 @@ infra::additional_classes: postfix::mastercf_source: 'puppet:///postfix_dir/master-client.cf' pp_postfix::virtual_aliases_source: 'maps/virtual-nullclient-webmaster' pp_postfix::client_all_interfaces: true -#pp_postfix::local_relay_interfaces: -# - ether0 -#pp_postfix::add_my_networks: '10.12.11.0/24' - +# pp_postfix::local_relay_interfaces: +# - ether0 +# pp_postfix::add_my_networks: '10.12.11.0/24' diff --git a/customer/pixelpark/repo.pixelpark.com.yaml b/customer/pixelpark/repo.pixelpark.com.yaml index 24c57f51..a719fa50 100644 --- a/customer/pixelpark/repo.pixelpark.com.yaml +++ b/customer/pixelpark/repo.pixelpark.com.yaml @@ -3,7 +3,6 @@ infra::role: base infra::additional_classes: - infra::profile::apache_php - apache::default_vhost: false repo::remi_php70: true php::composer: true @@ -65,4 +64,4 @@ infra::profile::apache::pp_vhosts: rewrite_cond: - '%%{ich-trickse}{HTTPS} !=on' rewrite_rule: - - '(.*) https://%%{ich-trickse}{HTTP_HOST}%%{ich-trickse}{REQUEST_URI} [R=301,L]' \ No newline at end of file + - '(.*) https://%%{ich-trickse}{HTTP_HOST}%%{ich-trickse}{REQUEST_URI} [R=301,L]' diff --git a/customer/pixelpark/review.pixelpark.com.yaml b/customer/pixelpark/review.pixelpark.com.yaml index 2a0f3c60..390b442f 100644 --- a/customer/pixelpark/review.pixelpark.com.yaml +++ b/customer/pixelpark/review.pixelpark.com.yaml @@ -26,7 +26,7 @@ infra::profile::apache::vhosts: allow_encoded_slashes: 'on' scriptaliases: - { alias: /gitweb, path: /var/www/git/gitweb.cgi } - directories: + directories: - directory1: provider: directory path: '/var/www/git/' @@ -36,7 +36,7 @@ infra::profile::apache::vhosts: addhandlers: handler: 'cgi-script' extensions: '.cgi' - proxy_preserve_host: On + proxy_preserve_host: 'On' proxy_pass: - { path: /server-status, url: '!' } - { path: /server-info, url: '!' } diff --git a/customer/pixelpark/sancus.pixelpark.com.yaml b/customer/pixelpark/sancus.pixelpark.com.yaml index ad484e4f..60f5748c 100644 --- a/customer/pixelpark/sancus.pixelpark.com.yaml +++ b/customer/pixelpark/sancus.pixelpark.com.yaml @@ -2,7 +2,7 @@ infra::role: base infra::additional_classes: - zabbix::agent - + zabbix::agent::server: '217.66.51.48,217.66.51.91' zabbix::agent::manage_repo: false diff --git a/customer/pixelpark/selenium.pixelpark.com.yaml b/customer/pixelpark/selenium.pixelpark.com.yaml index c1a952e9..fcba6e75 100644 --- a/customer/pixelpark/selenium.pixelpark.com.yaml +++ b/customer/pixelpark/selenium.pixelpark.com.yaml @@ -3,4 +3,4 @@ infra::role: base accounts::users: florian.schade: apply: true - sudo: true \ No newline at end of file + sudo: true diff --git a/customer/pixelpark/solaris11-afs.pixelpark.com.yaml b/customer/pixelpark/solaris11-afs.pixelpark.com.yaml index 3d55b2d0..4b80367c 100644 --- a/customer/pixelpark/solaris11-afs.pixelpark.com.yaml +++ b/customer/pixelpark/solaris11-afs.pixelpark.com.yaml @@ -8,4 +8,3 @@ accounts::users: ivan.prikhodko: apply: true sudo: true - diff --git a/customer/pixelpark/stage-www-publicispixelpark-de.pixelpark.com.yaml b/customer/pixelpark/stage-www-publicispixelpark-de.pixelpark.com.yaml index c5c94e58..3b046862 100644 --- a/customer/pixelpark/stage-www-publicispixelpark-de.pixelpark.com.yaml +++ b/customer/pixelpark/stage-www-publicispixelpark-de.pixelpark.com.yaml @@ -35,11 +35,11 @@ postfix::myorigin: 'pixelpark.com' infra::additional_packages: ImageMagick: {} -#redis -#redis::bind: 127.0.0.1 -#redis::manage_repo: true -#redis::timeout: 30 -#redis::maxmemory: 1gb +# redis +# redis::bind: 127.0.0.1 +# redis::manage_repo: true +# redis::timeout: 30 +# redis::maxmemory: 1gb # php packages repo::remi_php71: true @@ -88,8 +88,6 @@ mysql::server::remove_default_accounts: true mysql::server::backup::backupuser: backup mysql::server::backup::backuppassword: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAscVEKPUgGhwAg6oByrKzDFHfmBICYOMHmvQ6XAHM1SGqsMYvOUFoEW7qAQ6GhWDF8KlppCAy/4Lz/EEYKI+TdSw05r/3yfZITHgNsIiCbYkAoF2E8C2ppzC9xwcv3S5Gq8yEff12met+e6nIlX74ts0kOdWmkHH2CHZKprVxFjAu/N1X8CXyNSJi+apXvgTNsURzcUNVaTLu8fyfaXVlqcnuiZpeqC8Z3/Re3aIKfummtwphE+WUvWw+kAELNAGrlzQpO0cwyWGFN0/0BxpCG7Ui2J+CLAWZ4aBr3Yq33wWvxmQ8nPCOaTfvJLAwdpnStvtjNXynwr1/pJYHMDZy0jA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA6JJihOwd7423NICIlXdHFgBBbqX3qphQUN1GZyHN+A9nE] -mysql::server::backup::backupdir: /var/lib/backup/mysql - # typo3 scheduler cron infra::profile::cron::cronjobs: typo3_scheduler: diff --git a/customer/pixelpark/streaming01.pixelpark.net.yaml b/customer/pixelpark/streaming01.pixelpark.net.yaml index b189894c..a61082b8 100644 --- a/customer/pixelpark/streaming01.pixelpark.net.yaml +++ b/customer/pixelpark/streaming01.pixelpark.net.yaml @@ -3,4 +3,3 @@ infra::role: base infra::additional_classes: - infra::profile::postfix - infra::profile::cron - diff --git a/customer/pixelpark/streaming01.pixelpark.tv.yaml b/customer/pixelpark/streaming01.pixelpark.tv.yaml index b189894c..a61082b8 100644 --- a/customer/pixelpark/streaming01.pixelpark.tv.yaml +++ b/customer/pixelpark/streaming01.pixelpark.tv.yaml @@ -3,4 +3,3 @@ infra::role: base infra::additional_classes: - infra::profile::postfix - infra::profile::cron - diff --git a/customer/pixelpark/streaming02.pixelpark.net.yaml b/customer/pixelpark/streaming02.pixelpark.net.yaml index b189894c..a61082b8 100644 --- a/customer/pixelpark/streaming02.pixelpark.net.yaml +++ b/customer/pixelpark/streaming02.pixelpark.net.yaml @@ -3,4 +3,3 @@ infra::role: base infra::additional_classes: - infra::profile::postfix - infra::profile::cron - diff --git a/customer/pixelpark/streaming02.pixelpark.tv.yaml b/customer/pixelpark/streaming02.pixelpark.tv.yaml index b189894c..a61082b8 100644 --- a/customer/pixelpark/streaming02.pixelpark.tv.yaml +++ b/customer/pixelpark/streaming02.pixelpark.tv.yaml @@ -3,4 +3,3 @@ infra::role: base infra::additional_classes: - infra::profile::postfix - infra::profile::cron - diff --git a/customer/pixelpark/test-confluence01.pixelpark.net.yaml b/customer/pixelpark/test-confluence01.pixelpark.net.yaml index dc73bb22..00044c2f 100644 --- a/customer/pixelpark/test-confluence01.pixelpark.net.yaml +++ b/customer/pixelpark/test-confluence01.pixelpark.net.yaml @@ -15,7 +15,7 @@ infra::additional_classes: infra::profile::apache::pp_vhosts: test-confluence: docroot: /var/www/test-confluence - servername: test-confluence01.pixelpark.net # wenn fertig umgezogen + servername: test-confluence01.pixelpark.net # wenn fertig umgezogen cert_servername: 'wildcard.pixelpark.net' cert_customer: 'pixelpark' ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem' @@ -48,19 +48,19 @@ infra::profile::apache::pp_vhosts: - 'valid-user' - 'ip 217.66.51' enforce: all - + - provider: location path: '/confluence' - provider: location path: '/synchrony' rewrites: - - comment: 'synchrony' - rewrite_cond: - - '%{literal("%")}{HTTP:UPGRADE} ^WebSocket$ [NC]' - - '%{literal("%")}{HTTP:CONNECTION} Upgrade$ [NC]' - rewrite_rule: - - .* ws://test-confluence01.pixelpark.net:8091%{REQUEST_URI} [P] + - comment: 'synchrony' + rewrite_cond: + - '%{literal("%")}{HTTP:UPGRADE} ^WebSocket$ [NC]' + - '%{literal("%")}{HTTP:CONNECTION} Upgrade$ [NC]' + rewrite_rule: + - .* ws://test-confluence01.pixelpark.net:8091%{REQUEST_URI} [P] proxy_pass: - { path: /server-status, url: '!' } diff --git a/customer/pixelpark/test-extranet01.pixelpark.com.yaml b/customer/pixelpark/test-extranet01.pixelpark.com.yaml index 4268ee27..8afc17f4 100644 --- a/customer/pixelpark/test-extranet01.pixelpark.com.yaml +++ b/customer/pixelpark/test-extranet01.pixelpark.com.yaml @@ -8,4 +8,4 @@ accounts::users: sudo: true # custom-admins -infra::role: base \ No newline at end of file +infra::role: base diff --git a/customer/pixelpark/test-jira01.pixelpark.net.yaml b/customer/pixelpark/test-jira01.pixelpark.net.yaml index 57e0b7d8..bb362658 100644 --- a/customer/pixelpark/test-jira01.pixelpark.net.yaml +++ b/customer/pixelpark/test-jira01.pixelpark.net.yaml @@ -2,6 +2,9 @@ infra::role: base accounts::users: + gregor.naeckel: + apply: true + sudo: true katleen.thiele: apply: true sudo: true diff --git a/customer/pixelpark/test-marketing-publicis-ai.pixelpark.net.yaml b/customer/pixelpark/test-marketing-publicis-ai.pixelpark.net.yaml index da4021c9..b2a81972 100644 --- a/customer/pixelpark/test-marketing-publicis-ai.pixelpark.net.yaml +++ b/customer/pixelpark/test-marketing-publicis-ai.pixelpark.net.yaml @@ -94,9 +94,9 @@ infra::profile::apache::htdigest: infra::profile::apache::pp_vhosts: marketing: docroot: /var/www/marketing - servername: test-marketing-publicis-ai.pixelpark.net # Realserver Name + servername: test-marketing-publicis-ai.pixelpark.net # Realserver Name serveraliases: - - test-marketing.publicis.ai # LB VIP + - test-marketing.publicis.ai # LB VIP cert_servername: 'wildcard.pixelpark.net' cert_customer: 'pixelpark' ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem' diff --git a/customer/pixelpark/test-monitoring-db.pixelpark.net.yaml b/customer/pixelpark/test-monitoring-db.pixelpark.net.yaml index f2d282cf..cbb57114 100644 --- a/customer/pixelpark/test-monitoring-db.pixelpark.net.yaml +++ b/customer/pixelpark/test-monitoring-db.pixelpark.net.yaml @@ -1,4 +1,4 @@ --- -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 diff --git a/customer/pixelpark/test-monitoring01.pixelpark.net.yaml b/customer/pixelpark/test-monitoring01.pixelpark.net.yaml index f9809122..ac92c49e 100644 --- a/customer/pixelpark/test-monitoring01.pixelpark.net.yaml +++ b/customer/pixelpark/test-monitoring01.pixelpark.net.yaml @@ -5,4 +5,3 @@ accounts::users: ivan.prikhodko: apply: true sudo: true - diff --git a/customer/pixelpark/test-psql-pp01.pixelpark.net.yaml b/customer/pixelpark/test-psql-pp01.pixelpark.net.yaml index 74fc3c1f..ba6d4869 100644 --- a/customer/pixelpark/test-psql-pp01.pixelpark.net.yaml +++ b/customer/pixelpark/test-psql-pp01.pixelpark.net.yaml @@ -6,25 +6,25 @@ accounts::users: # custom-admins infra::role: base -#infra::additional_classes: -# - infra::profile::postgresql_server +# infra::additional_classes: +# - infra::profile::postgresql_server postgresql::globals::validcon_script_path: "/www/tmp/valid_postgres_connection.sh" postgresql::globals::version: "9.3" postgresql::server::ipv4acls: - - "host confluence confluence 217.66.53.112/32 md5" # Test Confluence - - "host confluence confluence 217.66.51.0/24 md5" # Test Confluence Admin Netz - - "host jira jira 217.66.53.111/32 md5" # Test Jira - - "host jira jira 217.66.51.0/24 md5" # Test Jira Admin Netz - - "host jira_test jira 217.66.51.0/24 md5" # Test JIRA Migration - - "host confluence_ext confluence_ext 217.66.53.108/32 md5" # Test Confluence Extranet - - "host confluence_ext confluence_ext 217.66.51.0/24 md5" # Test Confluence Extranet - - "host confluence_test confluence_test 217.66.53.109/32 md5" # Test Confluence Migration - - "host confluence_test confluence_test 217.66.53.112/32 md5" # Test Confluence Migration - - "host confluence_test confluence_test 217.66.51.0/24 md5" # Test Confluence Migration - - "host postgres xymon 217.66.53.170/32 trust" # self access Xymon - + - "host confluence confluence 217.66.53.112/32 md5" # Test Confluence + - "host confluence confluence 217.66.51.0/24 md5" # Test Confluence Admin Netz + - "host jira jira 217.66.53.111/32 md5" # Test Jira + - "host jira jira 217.66.51.0/24 md5" # Test Jira Admin Netz + - "host jira_test jira 217.66.51.0/24 md5" # Test JIRA Migration + - "host confluence_ext confluence_ext 217.66.53.108/32 md5" # Test Confluence Extranet + - "host confluence_ext confluence_ext 217.66.51.0/24 md5" # Test Confluence Extranet + - "host confluence_test confluence_test 217.66.53.109/32 md5" # Test Confluence Migration + - "host confluence_test confluence_test 217.66.53.112/32 md5" # Test Confluence Migration + - "host confluence_test confluence_test 217.66.51.0/24 md5" # Test Confluence Migration + - "host postgres xymon 217.66.53.170/32 trust" # self access Xymon + postgresql::server::listen_addresses: 217.66.53.170 infra::profile::postgresql_server::tablespaces: diff --git a/customer/pixelpark/vm-elk-01.pixelpark.net.yaml b/customer/pixelpark/vm-elk-01.pixelpark.net.yaml index 7d9b2347..3b0442d3 100644 --- a/customer/pixelpark/vm-elk-01.pixelpark.net.yaml +++ b/customer/pixelpark/vm-elk-01.pixelpark.net.yaml @@ -1,2 +1,2 @@ --- -infra::role: base \ No newline at end of file +infra::role: base diff --git a/customer/pixelpark/vm-elk-02.pixelpark.net.yaml b/customer/pixelpark/vm-elk-02.pixelpark.net.yaml index 7d9b2347..3b0442d3 100644 --- a/customer/pixelpark/vm-elk-02.pixelpark.net.yaml +++ b/customer/pixelpark/vm-elk-02.pixelpark.net.yaml @@ -1,2 +1,2 @@ --- -infra::role: base \ No newline at end of file +infra::role: base diff --git a/customer/pixelpark/vm-neoload-02.pixelpark.net.yaml b/customer/pixelpark/vm-neoload-02.pixelpark.net.yaml index 2b5fecc5..d0ae52bc 100644 --- a/customer/pixelpark/vm-neoload-02.pixelpark.net.yaml +++ b/customer/pixelpark/vm-neoload-02.pixelpark.net.yaml @@ -24,4 +24,3 @@ accounts::users: tim.schroeder: apply: true shell: bash - diff --git a/customer/pixelpark/vm-puppetclient.cloud.pixelpark.internal.yaml b/customer/pixelpark/vm-puppetclient.cloud.pixelpark.internal.yaml index 13e2c91d..3afe670c 100644 --- a/customer/pixelpark/vm-puppetclient.cloud.pixelpark.internal.yaml +++ b/customer/pixelpark/vm-puppetclient.cloud.pixelpark.internal.yaml @@ -5,7 +5,7 @@ database::postgresqlUser: testuser1: ensure: "present" createdb: true - createrole : false + createrole: false login: true password: "mypass" superuser: true diff --git a/customer/pixelpark/web01.sparkasse.de.yaml b/customer/pixelpark/web01.sparkasse.de.yaml index 4cdc959a..0b60c4bd 100644 --- a/customer/pixelpark/web01.sparkasse.de.yaml +++ b/customer/pixelpark/web01.sparkasse.de.yaml @@ -1,4 +1,3 @@ --- infra::additional_classes: - repo - diff --git a/customer/pixelpark/web02.sparkasse.local.yaml b/customer/pixelpark/web02.sparkasse.local.yaml index 4cdc959a..0b60c4bd 100644 --- a/customer/pixelpark/web02.sparkasse.local.yaml +++ b/customer/pixelpark/web02.sparkasse.local.yaml @@ -1,4 +1,3 @@ --- infra::additional_classes: - repo - diff --git a/customer/pixelpark/www-publicispixelpark-de.pixelpark.com.yaml b/customer/pixelpark/www-publicispixelpark-de.pixelpark.com.yaml index 848f9d17..b18a0173 100644 --- a/customer/pixelpark/www-publicispixelpark-de.pixelpark.com.yaml +++ b/customer/pixelpark/www-publicispixelpark-de.pixelpark.com.yaml @@ -36,10 +36,10 @@ infra::additional_packages: ImageMagick: {} # redis for typo3 cache -#redis::bind: 127.0.0.1 -#redis::manage_repo: true -#redis::timeout: 30 -#redis::maxmemory: 1gb +# redis::bind: 127.0.0.1 +# redis::manage_repo: true +# redis::timeout: 30 +# redis::maxmemory: 1gb # php packages repo::remi_php71: true diff --git a/customer/pixelpark/xymon.pixelpark.com.yaml b/customer/pixelpark/xymon.pixelpark.com.yaml index 4ddfa09e..4ba3b4a2 100644 --- a/customer/pixelpark/xymon.pixelpark.com.yaml +++ b/customer/pixelpark/xymon.pixelpark.com.yaml @@ -16,9 +16,6 @@ xymon_server::static_content: | PROC "%baggage_trace.php" 0 2 "TEXT=Gepaeckermittlung Import" HOST=prd-dyna-dm-01.pixelpark.net DISK * 95 98 -# HOST=prd-ws01-fbb.pixelpark.net -# PROC "%/bin/sh ./start-twitter-tracker.sh" "TEXT=Twitter Tracker Starter" -# PROC "%php twitter-tracker.php" "TEXT=Twitter Tracker PROCESS" HOST=atropos.pixelpark.com LOAD 15.0 20.0 PROC "%/bin/java -Xms16g -Xmx16g -XX" 1 1 "TEXT=Elasticsearch" @@ -27,3 +24,6 @@ xymon_server::static_content: | PROC "%/usr/bin/redis-server" 1 2 "TEXT=Redis" HOST=grazien.pixelpark.com LOAD 15.0 20.0 +# HOST=prd-ws01-fbb.pixelpark.net +# PROC "%/bin/sh ./start-twitter-tracker.sh" "TEXT=Twitter Tracker Starter" +# PROC "%php twitter-tracker.php" "TEXT=Twitter Tracker PROCESS" diff --git a/customer/pixelpark/zabbixTesting.yaml b/customer/pixelpark/zabbixTesting.yaml index 2dea9e3b..e351526d 100644 --- a/customer/pixelpark/zabbixTesting.yaml +++ b/customer/pixelpark/zabbixTesting.yaml @@ -1,9 +1,8 @@ --- -#zabbix::agent::server: '217.66.51.48' -#zabbix::agent::listenport: 10050 -#zabbix::agent::manage_repo: false +# zabbix::agent::server: '217.66.51.48' +# zabbix::agent::listenport: 10050 +# zabbix::agent::manage_repo: false zabbix::agent::server: '217.66.51.48,217.66.51.91' zabbix::agent::manage_repo: true zabbix::repo::version: '2.4' - -- 2.39.5