From: Philipp Dallig Date: Mon, 15 May 2017 12:17:03 +0000 (+0200) Subject: Add Yaml-Linter X-Git-Tag: v0.1.0~3006 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=dae8657a77ce8a08da47359d100c6db081bfa378;p=pixelpark%2Fhiera.git Add Yaml-Linter --- diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 00000000..97424ba3 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,9 @@ +stage 'Yaml-Linter' + +node("mesos") { + deleteDir() + git credentialsId: 'd1d6ad59-8d5a-45b4-acfb-64a36d7fd8cd', url: 'git@git.pixelpark.com:puppet/hiera.git', branch: "${BRANCH_NAME}" + sh '/bin/yum install yamllint' + sh '/usr/local/rvm/wrappers/default/bundle install --path vendor --without system_tests' + sh '/usr/bin/yamllint -c yamllint.config .' +} diff --git a/customer/buschjaeger/db01-buschjaeger-de.pixelpark.net.yaml b/customer/buschjaeger/db01-buschjaeger-de.pixelpark.net.yaml index a0aeb7cd..403da05e 100644 --- a/customer/buschjaeger/db01-buschjaeger-de.pixelpark.net.yaml +++ b/customer/buschjaeger/db01-buschjaeger-de.pixelpark.net.yaml @@ -18,4 +18,3 @@ mysql::server::override_options: log-bin: 'binlog' binlog-format: 'MIXED' binlog-ignore-db: 'performance_schema, information_schema' - diff --git a/customer/pfizer/web01-pfizer-de.pixelpark.net.yaml b/customer/pfizer/web01-pfizer-de.pixelpark.net.yaml index 56b35950..5bb9365e 100644 --- a/customer/pfizer/web01-pfizer-de.pixelpark.net.yaml +++ b/customer/pfizer/web01-pfizer-de.pixelpark.net.yaml @@ -80,7 +80,7 @@ infra::profile::drupal::projects: ssl_cert: /etc/pki/tls/certs/www.pfizer.de-cert.pem ssl_chain: /etc/pki/tls/certs/www.pfizer.de-cert.pem ssl_key: /etc/pki/tls/private/www.pfizer.de-key.pem - #SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0 + # SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0 php_admin_value: memory_limit: 512M upload_max_filesize: 100M @@ -907,7 +907,7 @@ infra::profile::typo3::projects: - '%%{ich-trickse}{HTTP_HOST} ueberaktive-blase.de' rewrite_rule: - '^(.*)$ https://www.pfizer.de [L,R=301]' -# Seo Projekt Start + # Seo Projekt Start - PFIZ-4372: comment: https://jira.pixelpark.com/jira/browse/PFIZ-4372 rewrite_cond: @@ -1332,7 +1332,7 @@ infra::profile::apache::pp_vhosts: - '%%{ich-trickse}{HTTP_HOST} ^www.impf2-ab-60.de$ [OR]' - '%%{ich-trickse}{HTTP_HOST} ^www.impf2ab60.de$' rewrite_rule: - - ^(.*)$ http://www.impf2.de$1 [R=301,L] + - '^(.*)$ http://www.impf2.de$1 [R=301,L]' wegweiser-psoriasis: servername: www.wegweiser-psoriasis.de docroot: '/srv/www/www.wegweiser-rheuma-psoriasis.de/current' diff --git a/yamllint.config b/yamllint.config new file mode 100644 index 00000000..57180a12 --- /dev/null +++ b/yamllint.config @@ -0,0 +1,48 @@ +--- + +rules: + braces: + min-spaces-inside: 0 + max-spaces-inside: 1 + min-spaces-inside-empty: 0 + max-spaces-inside-empty: 1 + brackets: + min-spaces-inside: 0 + max-spaces-inside: 1 + min-spaces-inside-empty: 0 + max-spaces-inside-empty: 1 + colons: + max-spaces-before: 0 + max-spaces-after: 1 + commas: + max-spaces-before: 1 + min-spaces-after: 1 + max-spaces-after: 1 + comments: + level: warning + require-starting-space: true + min-spaces-from-content: 2 + comments-indentation: + level: warning + document-end: disable + document-start: + level: warning + present: true + empty-lines: + max: 2 + max-start: 0 + max-end: 0 + hyphens: + max-spaces-after: 1 + indentation: + spaces: consistent + indent-sequences: true + check-multi-line-strings: false + key-duplicates: enable + line-length: disable + new-line-at-end-of-file: enable + new-lines: + type: unix + trailing-spaces: enable + truthy: + level: warning