From d68ee4db4ce46308388ce36755dad54f9b44889b Mon Sep 17 00:00:00 2001 From: Philipp Dallig Date: Mon, 15 May 2017 15:16:22 +0200 Subject: [PATCH] make linter happy --- classes/aem::dispatcher.yaml | 4 ++-- classes/infra::profile::logstash::apache.yaml | 14 +++++++------- classes/infra::profile::logstash::php_fpm.yaml | 18 +++++++++--------- .../infra::profile::mcollective::common.yaml | 6 +++--- classes/infra::profile::monitoring::mysql.yaml | 2 +- classes/infra::profile::symfony.yaml | 2 +- classes/infra::profile::typo3.yaml | 8 -------- classes/infra::profile::wordpress.yaml | 11 ++--------- 8 files changed, 25 insertions(+), 40 deletions(-) diff --git a/classes/aem::dispatcher.yaml b/classes/aem::dispatcher.yaml index d4e00092..6e65d180 100644 --- 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 4dac3794..6c228dbc 100644 --- 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 5d8e4ea4..556ddea2 100644 --- 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 2f71a1ed..55321a36 100644 --- 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 8ee14aa6..faba4716 100644 --- 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 fe0948f7..9bbb65a4 100644 --- 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 29db7462..16ec100b 100644 --- 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 4871bdf8..5c942434 100644 --- 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: -- 2.39.5