]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
Add Yaml-Linter
authorPhilipp Dallig <philipp.dallig@pixelpark.com>
Mon, 15 May 2017 12:17:03 +0000 (14:17 +0200)
committerPhilipp Dallig <philipp.dallig@pixelpark.com>
Mon, 15 May 2017 12:17:03 +0000 (14:17 +0200)
Jenkinsfile [new file with mode: 0644]
customer/buschjaeger/db01-buschjaeger-de.pixelpark.net.yaml
customer/pfizer/web01-pfizer-de.pixelpark.net.yaml
yamllint.config [new file with mode: 0644]

diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644 (file)
index 0000000..97424ba
--- /dev/null
@@ -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 .'
+}
index a0aeb7cd4df6ffd45e596c566e6fe0328d793d58..403da05e0040e246a02985bf98946a8445a80214 100644 (file)
@@ -18,4 +18,3 @@ mysql::server::override_options:
     log-bin: 'binlog'
     binlog-format: 'MIXED'
     binlog-ignore-db: 'performance_schema, information_schema'
-
index 56b35950c588e14affad4d04702c99ec1a886d9a..5bb9365e80b853283e0fa689932f6f716c43087c 100644 (file)
@@ -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 (file)
index 0000000..57180a1
--- /dev/null
@@ -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