make linter happy

diff --git a/classes/aem::dispatcher.yaml b/classes/aem::dispatcher.yaml
index d4e00092417e9dc2fb2e8e5b64d84dd972fa6a08..6e65d180f5b319733ce64eaf6e789cea3e5ee3ec 100644 (file)
--- a/classes/aem::dispatcher.yaml
+++ b/classes/aem::dispatcher.yaml
@@ -21,7 +21,7 @@ publish_farm:
       - { type: 'allow', url: '*.woff' }     # enable woff
       - { type: 'allow', url: '*.woff2' }    # enable woff2
       - { type: 'allow', url: '*.eot' }      # enable eot
-      # Enable features 
+      # Enable features
       - { type: 'allow', url: '/libs/cq/personalization/*' }  # enable personalization
       # Deny content grabbing
       - { type: 'deny', url: '*.infinity.json' }
@@ -50,4 +50,4 @@ publish_farm:
       - 'Last-Modified'
       - 'Expires'
       - 'Content-Type'
-      - 'Access-Control-Allow-Origin'
\ No newline at end of file
+      - 'Access-Control-Allow-Origin'

diff --git a/classes/infra::profile::logstash::apache.yaml b/classes/infra::profile::logstash::apache.yaml
index 4dac379484cb0c880df9b4231b11ad08b75d1155..6c228dbc9945d12bd1a70085af129400e0f65610 100644 (file)
--- a/classes/infra::profile::logstash::apache.yaml
+++ b/classes/infra::profile::logstash::apache.yaml
@@ -2,27 +2,27 @@
 infra::profile::logstash::apache::resources:
   apache_access:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/log/httpd/*access*log'
       type: apache-access
-      tags: 
+      tags:
         - "%{customer}"
         - "%{tier}"
   apache_error:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/log/httpd/*error*log'
       type: apache-error
-      tags: 
+      tags:
         - "%{customer}"
         - "%{tier}"
   apache_access_filter:
     condition: 'if [type] == "apache-access"'
     resource: grok
-    order: 40 # Filter
+    order: 40  # Filter
     parameters:
-      match: 
+      match:
         - message
-        - '%%{ich-trickse}{COMBINEDAPACHELOG}'
\ No newline at end of file
+        - '%%{ich-trickse}{COMBINEDAPACHELOG}'

diff --git a/classes/infra::profile::logstash::php_fpm.yaml b/classes/infra::profile::logstash::php_fpm.yaml
index 5d8e4ea4e4d838596276c4376d4f0157f2020742..556ddea2346978eb99a808aac9b06bc1f9dba74c 100644 (file)
--- a/classes/infra::profile::logstash::php_fpm.yaml
+++ b/classes/infra::profile::logstash::php_fpm.yaml
@@ -2,20 +2,20 @@
 infra::profile::logstash::php_fpm::resources:
   php_fpm_error:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/log/php-fpm/*error*log'
       type: php-fpm-error
-      tags: 
+      tags:
         - "%{customer}"
         - "%{tier}"
   php_fpm_slow:
     resource: file
-    order: 11 # Input
+    order: 11  # Input
     parameters:
       path: '/var/log/php-fpm/*slow*log'
       type: php-fpm-slow
-      tags: 
+      tags:
         - "%{customer}"
         - "%{tier}"
       codec:
@@ -26,16 +26,16 @@ infra::profile::logstash::php_fpm::resources:
   php_fpm_error_filter:
     condition: 'if [type] == "php-fpm-error"'
     resource: grok
-    order: 40 # Filter
+    order: 40  # Filter
     parameters:
-      match: 
+      match:
         - message
         - '\[%%{ich-trickse}{MONTHDAY}-%%{ich-trickse}{MONTH}-%%{ich-trickse}{YEAR} %%{ich-trickse}{TIME}%%{ich-trickse}{SPACE}%%{ich-trickse}{GREEDYDATA:timezone}?\] %%{ich-trickse}{LOGLEVEL:loglevel}?[ :]*%%{ich-trickse}{GREEDYDATA:restmessage}'
   php_fpm_slow_filter:
     condition: 'if [type] == "php-fpm-slow"'
     resource: grok
-    order: 41 # Filter
+    order: 41  # Filter
     parameters:
-      match: 
+      match:
         - message
-        - \[%%{ich-trickse}{MONTHDAY}-%%{ich-trickse}{MONTH}-%%{ich-trickse}{YEAR} %%{ich-trickse}{TIME}\]%%{ich-trickse}{SPACE}\[pool %%{ich-trickse}{DATA:pool}] %%{ich-trickse}{GREEDYDATA:restmessage}
\ No newline at end of file
+        - \[%%{ich-trickse}{MONTHDAY}-%%{ich-trickse}{MONTH}-%%{ich-trickse}{YEAR} %%{ich-trickse}{TIME}\]%%{ich-trickse}{SPACE}\[pool %%{ich-trickse}{DATA:pool}] %%{ich-trickse}{GREEDYDATA:restmessage}

diff --git a/classes/infra::profile::mcollective::common.yaml b/classes/infra::profile::mcollective::common.yaml
index 2f71a1ed627640d5c51557af5ea2fb69202fc2de..55321a3622fc524b829c6e64a4086fb0b1b1b8cc 100644 (file)
--- a/classes/infra::profile::mcollective::common.yaml
+++ b/classes/infra::profile::mcollective::common.yaml
@@ -2,7 +2,7 @@
 infra::profile::mcollective::common::server_settings:
   identity:
     value: "%{fqdn}"
-# extra config fro rabbitmq connector
+  # extra config fro rabbitmq connector
   plugin.rabbitmq.heartbeat_interval:
     value: 30
   plugin.rabbitmq.stomp_1_0_fallback:
@@ -11,7 +11,7 @@ infra::profile::mcollective::common::server_settings:
     value: 2
   plugin.rabbitmq.max_hbrlck_fails:
     value: 2
-# extra config for puppet plugin
+  # extra config for puppet plugin
   plugin.puppet.signal_daemon:
     value: false
 
@@ -22,4 +22,4 @@ infra::profile::mcollective::common::plugins:
   service:
     package: true
   package:
-    package: true
\ No newline at end of file
+    package: true

diff --git a/classes/infra::profile::monitoring::mysql.yaml b/classes/infra::profile::monitoring::mysql.yaml
index 8ee14aa60cee44eb503c7ed16960e77a9d92355a..faba47167bcb74bdcd39f32803da9bfb6ebeecc3 100644 (file)
--- a/classes/infra::profile::monitoring::mysql.yaml
+++ b/classes/infra::profile::monitoring::mysql.yaml
@@ -1,3 +1,3 @@
 ---
 # default monitoring Passwort
-infra::profile::monitoring::mysql::monitorpassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAIGr1ESvzfZx4F3HW99qZFf/MkLh1pywxTBCxk5PxFxPCbLY7OT8wNIcxvS6NOvMhr2qkAvmec0qB/1pJf1ZiM99VRoTSF8jByxMFeopYdFhyk3nHtGIyqgykm6xp4hg+hJH2tsg7SYhPN8cV3wDeZgAsvWUhp4TUid6Y/3w7jLzQF+odiUPFCyZ0IbSiQJOe4/E1N5ldx29pfOdjxxRv6Kkf7jNg9CChNYNpLkM8SI5JC41O5avNcrvfaiekiWEJV0mZ59dE1yPqzMF8TstEuq6BJd7KeNj0HN9yGc2cZxTqXhDr1o/HfUsH7Z+beZVHN/qBlqKBbx9fCUbGX8ekQTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA5BffAEhe8IJ8QeKaed4zYgCCGKLxaE3iurFnp+6acicSVCgZMLNoRQqJDZ6CeSY8uGw==]
\ No newline at end of file
+infra::profile::monitoring::mysql::monitorpassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAIGr1ESvzfZx4F3HW99qZFf/MkLh1pywxTBCxk5PxFxPCbLY7OT8wNIcxvS6NOvMhr2qkAvmec0qB/1pJf1ZiM99VRoTSF8jByxMFeopYdFhyk3nHtGIyqgykm6xp4hg+hJH2tsg7SYhPN8cV3wDeZgAsvWUhp4TUid6Y/3w7jLzQF+odiUPFCyZ0IbSiQJOe4/E1N5ldx29pfOdjxxRv6Kkf7jNg9CChNYNpLkM8SI5JC41O5avNcrvfaiekiWEJV0mZ59dE1yPqzMF8TstEuq6BJd7KeNj0HN9yGc2cZxTqXhDr1o/HfUsH7Z+beZVHN/qBlqKBbx9fCUbGX8ekQTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA5BffAEhe8IJ8QeKaed4zYgCCGKLxaE3iurFnp+6acicSVCgZMLNoRQqJDZ6CeSY8uGw==]

diff --git a/classes/infra::profile::symfony.yaml b/classes/infra::profile::symfony.yaml
index fe0948f72d60115e41fae7d05b675d7426695198..9bbb65a4a0a7b1099f38c6c5bb18b8434f97ea85 100644 (file)
--- a/classes/infra::profile::symfony.yaml
+++ b/classes/infra::profile::symfony.yaml
@@ -19,4 +19,4 @@ directories:
       - MultiViews
     allow_override:
       - All
-    directoryindex: 'index.php'
\ No newline at end of file
+    directoryindex: 'index.php'

diff --git a/classes/infra::profile::typo3.yaml b/classes/infra::profile::typo3.yaml
index 29db74621ae78f6579aae918b3454dc630061ca3..16ec100b260d6ff6f28c0dd24dca612c0f268a73 100644 (file)
--- a/classes/infra::profile::typo3.yaml
+++ b/classes/infra::profile::typo3.yaml
@@ -4,14 +4,6 @@ php::extensions:
   opcache: {}
   mysqlnd: {}
   soap: {}
-##### noch keine offizielle Loesung fuer suhosin/php7
-#  suhosin:
-#    settings:
-#      suhosin.request.max_varname_length: 200
-#      suhosin.post.max_name_length: 200
-#      suhosin.get.max_name_length: 200
-#      suhosin.get.max_value_length: 2000
-#      suhosin.executor.include.whitelist: 'phar,vfs'
   mbstring: {}
 
 php::settings:

diff --git a/classes/infra::profile::wordpress.yaml b/classes/infra::profile::wordpress.yaml
index 4871bdf8eb3a5f96002b59d9ab7412890e597088..5c9424340e6b8b718e4b48fefe5aa63e8ebbb5f2 100644 (file)
--- a/classes/infra::profile::wordpress.yaml
+++ b/classes/infra::profile::wordpress.yaml
@@ -1,17 +1,10 @@
 ---
 php::extensions:
   gd: {}
-#  xml: {}
+  # xml: {}
   opcache: {}
   mysqlnd: {}
-# suhosin would be nice
-#  suhosin:
-#    settings:
-#      suhosin.request.max_varname_length: 200
-#      suhosin.post.max_name_length: 200
-#      suhosin.get.max_name_length: 200
-#      suhosin.get.max_value_length: 2000
-#      suhosin.executor.include.whitelist: 'phar,vfs'
+
 
 # Do not use this key in an other location (customer)
 wordpress_project: