]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
fix lint for pixelpark
authorRobert Waffen <robert.waffen@pixelpark.com>
Fri, 14 Sep 2018 15:06:11 +0000 (17:06 +0200)
committerFrank Brehm <frank.brehm@pixelpark.com>
Tue, 18 Sep 2018 14:40:15 +0000 (16:40 +0200)
75 files changed:
customer/pixelpark/amor.pixelpark.net.yaml
customer/pixelpark/amun.pixelpark.net.yaml
customer/pixelpark/app01.sparkasse.local.yaml
customer/pixelpark/app02.sparkasse.local.yaml
customer/pixelpark/atropos.pixelpark.com.yaml
customer/pixelpark/bat.pixelpark.net.yaml
customer/pixelpark/bauhaus.pixelpark.com.yaml
customer/pixelpark/bfs-gadget-mercedes-benz-de.pixelpark.net.yaml
customer/pixelpark/bilder-emmt-daimler-com.pixelpark.net.yaml
customer/pixelpark/brownies.pixelpark.net.yaml
customer/pixelpark/chat-db01.pixelpark.com.yaml
customer/pixelpark/cobbler-test.pixelpark.net.yaml
customer/pixelpark/cow.pixelpark.net.yaml
customer/pixelpark/deploy.pixelpark.com.yaml
customer/pixelpark/dev-app01.sparkasse.local.yaml
customer/pixelpark/dev-app02.sparkasse.local.yaml
customer/pixelpark/dev-artifacts.pixelpark.com.yaml
customer/pixelpark/dev-chat.pixelpark.com.yaml
customer/pixelpark/dev-hy01-demo.pixelpark.net.yaml
customer/pixelpark/dev-monitoring-client.pixelpark.com.yaml
customer/pixelpark/dev-monitoring.pixelpark.com.yaml
customer/pixelpark/dev-typo3.pixelpark.net.yaml
customer/pixelpark/dev-web02.sparkasse.local.yaml
customer/pixelpark/extranet01.pixelpark.com.yaml
customer/pixelpark/git01.pixelpark.com.yaml
customer/pixelpark/grazien.pixelpark.com.yaml
customer/pixelpark/int-db-odt-daimler-com.pixelpark.internal.yaml
customer/pixelpark/intra-collective01.pixelpark.com.yaml
customer/pixelpark/ipam.pixelpark.com.yaml
customer/pixelpark/its-vm-sastrass.pixelpark.com.yaml
customer/pixelpark/ivan-wheezy64.pixelpark.com.yaml
customer/pixelpark/ivandeb.pixelpark.com.yaml
customer/pixelpark/jenkins-slave-virtualbox.pixelpark.net.yaml
customer/pixelpark/levana.pixelpark.net.yaml
customer/pixelpark/lug.pixelpark.com.yaml
customer/pixelpark/mailex.pixelpark.com.yaml
customer/pixelpark/marketing-publicis-ai.pixelpark.net.yaml
customer/pixelpark/minerva.pixelpark.com.yaml
customer/pixelpark/monitor-db01-publicispixelpark-de.pixelpark.net.yaml
customer/pixelpark/mysql-pp07.pixelpark.com.yaml
customer/pixelpark/nuadu.pixelpark.com.yaml
customer/pixelpark/owasp-zap.pixelpark.com.yaml
customer/pixelpark/prod01-author-aem-sandbox.pixelpark.com.yaml
customer/pixelpark/prod01-publisher-aem-sandbox.pixelpark.com.yaml
customer/pixelpark/psql-pp01.pixelpark.net.yaml
customer/pixelpark/puppet-schulung-1.novalocal.yaml
customer/pixelpark/puppet-schulung-2.novalocal.yaml
customer/pixelpark/puppetmaster.cloud.pixelpark.internal.yaml
customer/pixelpark/racktables.pixelpark.com.yaml
customer/pixelpark/repo.pixelpark.com.yaml
customer/pixelpark/review.pixelpark.com.yaml
customer/pixelpark/sancus.pixelpark.com.yaml
customer/pixelpark/selenium.pixelpark.com.yaml
customer/pixelpark/solaris11-afs.pixelpark.com.yaml
customer/pixelpark/stage-www-publicispixelpark-de.pixelpark.com.yaml
customer/pixelpark/streaming01.pixelpark.net.yaml
customer/pixelpark/streaming01.pixelpark.tv.yaml
customer/pixelpark/streaming02.pixelpark.net.yaml
customer/pixelpark/streaming02.pixelpark.tv.yaml
customer/pixelpark/test-confluence01.pixelpark.net.yaml
customer/pixelpark/test-extranet01.pixelpark.com.yaml
customer/pixelpark/test-jira01.pixelpark.net.yaml
customer/pixelpark/test-marketing-publicis-ai.pixelpark.net.yaml
customer/pixelpark/test-monitoring-db.pixelpark.net.yaml
customer/pixelpark/test-monitoring01.pixelpark.net.yaml
customer/pixelpark/test-psql-pp01.pixelpark.net.yaml
customer/pixelpark/vm-elk-01.pixelpark.net.yaml
customer/pixelpark/vm-elk-02.pixelpark.net.yaml
customer/pixelpark/vm-neoload-02.pixelpark.net.yaml
customer/pixelpark/vm-puppetclient.cloud.pixelpark.internal.yaml
customer/pixelpark/web01.sparkasse.de.yaml
customer/pixelpark/web02.sparkasse.local.yaml
customer/pixelpark/www-publicispixelpark-de.pixelpark.com.yaml
customer/pixelpark/xymon.pixelpark.com.yaml
customer/pixelpark/zabbixTesting.yaml

index 4fa9a57acc7708a5ff3454d6fcabfb982fa11d8c..3c002ac147a2e1f8fb602ea445c00f67fe0bd126 100644 (file)
@@ -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
index 934946b3bf188a546097dffa6030f0adeccca2ed..b61b813c01b254d09356434e848cbe86b2149a3a 100644 (file)
@@ -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
index 4cdc959a63a11e1186028f246b4e9646c7e25d4c..0b60c4bdbb7d98bb95994ee2d0613c79bb2c7276 100644 (file)
@@ -1,4 +1,3 @@
 ---
 infra::additional_classes:
   - repo
-
index 4cdc959a63a11e1186028f246b4e9646c7e25d4c..0b60c4bdbb7d98bb95994ee2d0613c79bb2c7276 100644 (file)
@@ -1,4 +1,3 @@
 ---
 infra::additional_classes:
   - repo
-
index da67051d90364506f65f1434eb9bb1ea2e999b2b..0dcc730fdbe69cf02d46f8fc9e1086fd3d1f5916 100644 (file)
@@ -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'
index 4adbabc34f6c5308d36a8b29dbbe79eb3afcc536..c5e95c5df58d805dbefbe3af3fda6d7b9d3bc9d7 100644 (file)
@@ -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:
index 8c45de4ab9f840e5b98010cdf6e7dd027e5cdd54..4cd74cc9991aa20a44ff0041c7702edc90224650 100644 (file)
@@ -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:
index 03c1b0f2af7be56b73ea9b59005a570a2399dcf6..9bc2648672184a388342c0f4f5c12f41a73f0fde 100644 (file)
@@ -1,4 +1,3 @@
 ---
 infra::additional_classes:
   - accounts
-
index 5dec46872f166e8e43540a4f3a7c46b1502cb528..cd231d439ad47160fb9dba0a5c45d5ac7533de50 100644 (file)
@@ -2,4 +2,3 @@
 infra::additional_classes:
   - repo
   - accounts
-
index cd21505a47e530a967e3c44bd2a772d1b8d08bd7..ed97d539c095cf1413af30cc23dea272095b97dd 100644 (file)
@@ -1,2 +1 @@
 ---
-
index 3cc939e6772be6e88ae4f74474dde714d72d8a43..3903722dd939dcd8ae78a3b09cee95f4dcf86ddb 100644 (file)
@@ -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'
index 49dbd72d9385721fa7b7ade5a0ed891b9df457a5..5c24cb6364462377b1f609600ca0a82493659808 100644 (file)
@@ -8,4 +8,3 @@ infra::additional_classes:
 java::package: 'java-1.8.0-openjdk-devel'
 
 logstash::verbose_run: true
-
index fa6ce89a4cb1e19382691fb2da054dde2f6678a0..1cefa89f5ead8a12639c2b1d93236a361befe4cb 100644 (file)
@@ -6,4 +6,4 @@ infra::additional_classes:
 accounts::users:
   ivan.prikhodko:
     apply: true
-    sudo: true
\ No newline at end of file
+    sudo: true
index d8c2a59277cccb9b5c68e7b4a339271f48637877..8b889c443e9bbb7697defca609fc49f2fea23b00 100644 (file)
@@ -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
index 4cdc959a63a11e1186028f246b4e9646c7e25d4c..0b60c4bdbb7d98bb95994ee2d0613c79bb2c7276 100644 (file)
@@ -1,4 +1,3 @@
 ---
 infra::additional_classes:
   - repo
-
index 4cdc959a63a11e1186028f246b4e9646c7e25d4c..0b60c4bdbb7d98bb95994ee2d0613c79bb2c7276 100644 (file)
@@ -1,4 +1,3 @@
 ---
 infra::additional_classes:
   - repo
-
index af2226ccd976dd22c17891a3876d64e76b760788..3f1793d62ff1ba01799282abea5666feb14fd73c 100644 (file)
@@ -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'
-
index d7dded1a2ec04ac3bdc0dfc17902573a19457221..2ec196dce74a7d0a60d63668f38415ec626a9f7b 100644 (file)
@@ -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==]
-
index 7d9b23474c8424bf1e2917bc8b9bc01f7fde43fc..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-infra::role: base
\ No newline at end of file
+infra::role: base
index f74ee686ef2de05880993b8d9cf9d4c05e498b1f..5c888d4d2336d063aa656040281d5236ec0f1458 100644 (file)
@@ -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
index 4726d407844aa0d02388e0957a307285669b593b..84753995e96eb75a2788ccd1665cf137bbcd0392 100644 (file)
@@ -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':
index cef2c3d26a4d5f1cd7d93dc6ff56fc507c745ea5..12345855271e93fdb6245c1bb7180bd695d522dd 100644 (file)
@@ -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
index 4cdc959a63a11e1186028f246b4e9646c7e25d4c..0b60c4bdbb7d98bb95994ee2d0613c79bb2c7276 100644 (file)
@@ -1,4 +1,3 @@
 ---
 infra::additional_classes:
   - repo
-
index 731d0071f4c7e1d184a07850224e8aea7c3863ee..08c4b0dfe3f4de8420341e27e8f65dd07a225dd5 100644 (file)
@@ -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'
index 0c48dfbefb920cd6e928d9dfaac6f737ff6a5ccb..02e65f2d6d19ff625e150b56999589b13c41863e 100644 (file)
@@ -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'
index da67051d90364506f65f1434eb9bb1ea2e999b2b..0dcc730fdbe69cf02d46f8fc9e1086fd3d1f5916 100644 (file)
@@ -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'
index 03c1b0f2af7be56b73ea9b59005a570a2399dcf6..9bc2648672184a388342c0f4f5c12f41a73f0fde 100644 (file)
@@ -1,4 +1,3 @@
 ---
 infra::additional_classes:
   - accounts
-
index 31d46bec4a404a117b7d087b0e0b8d0fdcb653c2..54d18ca6bedd9900605486ebe708c1d342773a4e 100644 (file)
@@ -1,4 +1,3 @@
 ---
 infra::additional_classes:
   - xymon
-
index 2008f1cb696b56790641ea8e0a120e7e5fea99ef..541a1f39e27cb60dcf4aa04356990c5aa67293d4 100644 (file)
@@ -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'
index c90ec476aad915d4a05de6a97939c2082daea259..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,3 +1,2 @@
 ---
 infra::role: base
-
index d06336c42522bf77e38cd8f987406a5ecde51e6e..838b90bb1eb9ea7a93f1ce7c929e6069c6c4e318 100644 (file)
@@ -19,4 +19,3 @@ xymon::check::rabbitmq::members:
   - rabbitmq02.test-cloud.pixelpark.internal:5672
 xymon::check::rabbitmq::password: 'sUTrsaeSKduY33io'
 xymon::check::rabbitmq::user: 'guest'
-
index b05138fa79812e9309186fe0a04de4feec76a007..709e46cb53dee49b9fe864d424c3b5a32edc3e3a 100644 (file)
@@ -2,4 +2,3 @@
 infra::additional_classes:
   - motd
   - tcsh
-
index a709c950c43ecb7e30ded298b5b99fe0a1478f22..e4d293989586306cf6850eb9b1c87e2809ca3ff3 100644 (file)
@@ -2,4 +2,4 @@
 infra::role: base
 accounts::users:
   jenkins:
-    managed: false
\ No newline at end of file
+    managed: false
index 5dddc17d64acb0bd6ad06d72bd38cdc2fe11717c..5d719968567fed6075d4548d3b3b7bf85fc1a08b 100644 (file)
@@ -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
index ad484e4f960547ce7f122f060f1e1997c7b0e44e..60f5748c4405cb257029894dd7b69e45bf7de482 100644 (file)
@@ -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
 
index d73e4952e381705ce0886b1b96fa0cacda4bda83..4893829e0f2493ab137b736c87788a11b952ccba 100644 (file)
@@ -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
index f522476e6b80fc5992fcbf1fd8c5b265b00c69f4..d47a72be5928d1b979d2bfd6ddf8fe4477f55e3b 100644 (file)
@@ -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'
index 3b2d165f5aa448a03f4ce7497b5a4e8cf0f6e368..f246dc0196abded7bae314b7c9dbb5f98d2e7297 100644 (file)
@@ -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
index f2d282cfe6c63a7a95de32f5ab9e1e675f9830b7..cbb571146db7f03e11899ac0f25dfaaf8fc084f5 100644 (file)
@@ -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
index e8b023992dd5d0368f6bc1e731f2a213b719836f..4e4be4bffefcf0984c3370490c1b6a5bb998e819 100644 (file)
@@ -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
index b01e610d348922a1e900f39ae9c5a3e53527efe7..8bcc2d065c3066646ae380d89b6de4f1675fb10b 100644 (file)
@@ -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
-
index 33fa35679e30b1ab108dd46826c209d316e63e03..cb843f73639a68325b822d50a85dbcad493d98ce 100644 (file)
@@ -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]'
index d81d3fef74521311c5cefdaabcf65984d0c7b078..6df7596b62eaeff7c1cc9ae74c4355efcfacb0d0 100644 (file)
@@ -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
index 4fa9a57acc7708a5ff3454d6fcabfb982fa11d8c..3c002ac147a2e1f8fb602ea445c00f67fe0bd126 100644 (file)
@@ -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
index e0d973c396c80f3555dacc2ba59361fed65acbac..f1ed1dde2fcd40e391270ef8f0af41a17ad445e3 100644 (file)
@@ -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==]
-
index 85d068e42c0d361d9c33d1e9c2fab116a3ca3cac..2294b80764bc3833c43877fdbd68f529158799fe 100644 (file)
@@ -4,4 +4,3 @@ accounts::users:
     apply: true
     sudo: true
 bash::package_ensure: latest
-
index e00bd9eb31889c86373a54336dd19c35a0b4520c..1caf5761ce2e6da909f24df88bd4e236a98cff95 100644 (file)
@@ -2,4 +2,4 @@
 accounts::users:
   ivan.prikhodko:
     apply: true
-    sudo: true
\ No newline at end of file
+    sudo: true
index d137b3512337fe943c3a33ef958a89df53a384d7..82785c8891efbb12094a047f778d139a132f8a68 100644 (file)
@@ -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
index 4706e9f0fe38e55c19e5ab11ddca8d6e6714e93f..383edb2493f4009c35fcae3c018c220f83318c0a 100644 (file)
@@ -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'
index 24c57f51eea2928a33a74265ec91491a9952b087..a719fa507e15bba4d1bcdbfadd912cefd474c8f2 100644 (file)
@@ -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]'
index 2a0f3c60385de17e9e9966cfddcc68c6f64baec2..390b442f87357fc6d4e96d74e2cfdef53f5d93da 100644 (file)
@@ -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: '!' }
index ad484e4f960547ce7f122f060f1e1997c7b0e44e..60f5748c4405cb257029894dd7b69e45bf7de482 100644 (file)
@@ -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
 
index c1a952e9835cce2d40f502a9c82aa1940509d12b..fcba6e75223693e0697a7824d208862fd3709530 100644 (file)
@@ -3,4 +3,4 @@ infra::role: base
 accounts::users:
   florian.schade:
     apply: true
-    sudo: true
\ No newline at end of file
+    sudo: true
index 3d55b2d051e7d825b9448ba7a55076ca035cd1b1..4b80367c02dbfd2e622222d608d8701319bb6de5 100644 (file)
@@ -8,4 +8,3 @@ accounts::users:
   ivan.prikhodko:
     apply: true
     sudo: true
-
index c5c94e5802926a7f918633b96004843bf8e0e194..3b04686236370f0e2023d53310e5d1786b4b5738 100644 (file)
@@ -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:
index b189894c27e625871dbc463515d1721faf5e88e7..a61082b83f482d78c518fd173dbe51c2465e66d0 100644 (file)
@@ -3,4 +3,3 @@ infra::role: base
 infra::additional_classes:
   - infra::profile::postfix
   - infra::profile::cron
-
index b189894c27e625871dbc463515d1721faf5e88e7..a61082b83f482d78c518fd173dbe51c2465e66d0 100644 (file)
@@ -3,4 +3,3 @@ infra::role: base
 infra::additional_classes:
   - infra::profile::postfix
   - infra::profile::cron
-
index b189894c27e625871dbc463515d1721faf5e88e7..a61082b83f482d78c518fd173dbe51c2465e66d0 100644 (file)
@@ -3,4 +3,3 @@ infra::role: base
 infra::additional_classes:
   - infra::profile::postfix
   - infra::profile::cron
-
index b189894c27e625871dbc463515d1721faf5e88e7..a61082b83f482d78c518fd173dbe51c2465e66d0 100644 (file)
@@ -3,4 +3,3 @@ infra::role: base
 infra::additional_classes:
   - infra::profile::postfix
   - infra::profile::cron
-
index dc73bb229cafb4a6d8e1832e9250f5b5e4ac9286..00044c2fa7f2d39dc458b8ca55c7657fda3d865d 100644 (file)
@@ -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: '!' }
index 4268ee2790a0ca9dcfb17526cf5981d0d19bbd8c..8afc17f4c5aff942af167c443460bfcbcd77c166 100644 (file)
@@ -8,4 +8,4 @@ accounts::users:
     sudo: true
 # custom-admins
 
-infra::role: base
\ No newline at end of file
+infra::role: base
index 57e0b7d80021843516e26f3e03fbadfe48e8591b..bb362658fff46adc3cf09242bd6d03027f336837 100644 (file)
@@ -2,6 +2,9 @@
 infra::role: base
 
 accounts::users:
+  gregor.naeckel:
+    apply: true
+    sudo: true
   katleen.thiele:
     apply: true
     sudo: true
index da4021c9e38056539a8e42f895f7690b4acac10b..b2a819729c9a375b31cf48abeed0e8a07605cd80 100644 (file)
@@ -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'
index f2d282cfe6c63a7a95de32f5ab9e1e675f9830b7..cbb571146db7f03e11899ac0f25dfaaf8fc084f5 100644 (file)
@@ -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
index f9809122cdc5d279b06e8a25dff9355bb36d96c8..ac92c49efa9b8e3a74a17eb54c8bb41ef9939401 100644 (file)
@@ -5,4 +5,3 @@ accounts::users:
   ivan.prikhodko:
     apply: true
     sudo: true
-
index 74fc3c1fcdb75809cfc3c41f1085c6515b5b264d..ba6d486990c5611222ed83a925970eebe7df48f6 100644 (file)
@@ -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:
index 7d9b23474c8424bf1e2917bc8b9bc01f7fde43fc..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-infra::role: base
\ No newline at end of file
+infra::role: base
index 7d9b23474c8424bf1e2917bc8b9bc01f7fde43fc..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-infra::role: base
\ No newline at end of file
+infra::role: base
index 2b5fecc5b3fb423fedeeb4032305468891c09570..d0ae52bce6309c196866ae4cbb963dd6ad6b92b4 100644 (file)
@@ -24,4 +24,3 @@ accounts::users:
   tim.schroeder:
     apply: true
     shell: bash
-
index 13e2c91d5f234b1b6955822019d7f36c50ceac3d..3afe670c7fa31eaed29b126a848d228b24073434 100644 (file)
@@ -5,7 +5,7 @@ database::postgresqlUser:
   testuser1:
     ensure: "present"
     createdb: true
-    createrole : false
+    createrole: false
     login: true
     password: "mypass"
     superuser: true
index 4cdc959a63a11e1186028f246b4e9646c7e25d4c..0b60c4bdbb7d98bb95994ee2d0613c79bb2c7276 100644 (file)
@@ -1,4 +1,3 @@
 ---
 infra::additional_classes:
   - repo
-
index 4cdc959a63a11e1186028f246b4e9646c7e25d4c..0b60c4bdbb7d98bb95994ee2d0613c79bb2c7276 100644 (file)
@@ -1,4 +1,3 @@
 ---
 infra::additional_classes:
   - repo
-
index 848f9d1758ed428c07ee96019b34444cd6697d66..b18a017377ed3180efaaa004ab48f63dc81fe3bb 100644 (file)
@@ -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
index 4ddfa09ef5076d788bdd82341a04427d6ecb1bf1..4ba3b4a2e23ed53a092f5526ca6cf5b1a4f80c36 100644 (file)
@@ -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"
index 2dea9e3bd0a36e6fb7295fff56d715045958beff..e351526d4a52fb5dfeac33c0c1f6b32b5c84c808 100644 (file)
@@ -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'
-