fix lint for mhk

diff --git a/customer/mhk/common.yaml b/customer/mhk/common.yaml
index 09d08f43b28e127c884e5f05109b7b02a25e414b..36e98347c91f21bc2e02723ca4f4a87d74bd8425 100644 (file)
--- a/customer/mhk/common.yaml
+++ b/customer/mhk/common.yaml
@@ -1,3 +1,4 @@
+---
 accounts::users:
   benedikt.schlueter:
     apply: true

diff --git a/customer/mhk/mls-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/mls-mhk-kueche-de.pixelpark.net.yaml
index 6c92ee62c446ad70e3fdfdd981701c15671a118e..052ae1dd466963d7207370b2959b6156307967a4 100644 (file)
--- a/customer/mhk/mls-mhk-kueche-de.pixelpark.net.yaml
+++ b/customer/mhk/mls-mhk-kueche-de.pixelpark.net.yaml
@@ -26,4 +26,4 @@ mysql::server::override_options:
     innodb_file_per_table: 1
     table_open_cache: 512
     innodb_log_file_size: 256M
-    performance_schema: ON
+    performance_schema: true

diff --git a/customer/mhk/red-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/red-mhk-kueche-de.pixelpark.net.yaml
index 30760e7b72298285649fc2cb4c577daa8e73749d..4de0cbae3a3c92a9da7ab146bbed11241032d588 100644 (file)
--- a/customer/mhk/red-mhk-kueche-de.pixelpark.net.yaml
+++ b/customer/mhk/red-mhk-kueche-de.pixelpark.net.yaml
@@ -32,7 +32,7 @@ mysql::server::override_options:
     innodb_file_per_table: 1
     table_open_cache: 512
     innodb_log_file_size: 256M
-    performance_schema: ON
+    performance_schema: true
 
 apache::default_vhost: false
 
@@ -40,7 +40,7 @@ apache::mod::deflate::types:
   - 'text/css'
   - 'application/x-javascript application/javascript application/ecmascript'
   - 'application/rss+xml'
-  - 'image/svg+xml' # new
+  - 'image/svg+xml'  # new
 
 infra::profile::apache::pp_vhosts:
   red:
@@ -165,7 +165,7 @@ infra::profile::apache::pp_vhosts:
 logstash::generic_resource:
   preview:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/log/coremedia/cm7-studio-tomcat/blueprint.log'
       type: webapp
@@ -181,7 +181,7 @@ logstash::generic_resource:
         negate: true
   studio:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/log/coremedia/cm7-studio-tomcat/CoreMedia-Studio.log'
       type: webapp

diff --git a/customer/mhk/rls01-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/rls01-mhk-kueche-de.pixelpark.net.yaml
index a556befe309b07e86eff248c9ffc410f2465336f..c36e0f1fad99651f212980a4433d9b84887057fa 100644 (file)
--- a/customer/mhk/rls01-mhk-kueche-de.pixelpark.net.yaml
+++ b/customer/mhk/rls01-mhk-kueche-de.pixelpark.net.yaml
@@ -23,4 +23,4 @@ mysql::server::override_options:
     innodb_file_per_table: 1
     table_open_cache: 512
     innodb_log_file_size: 256M
-    performance_schema: ON
+    performance_schema: true

diff --git a/customer/mhk/rls02-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/rls02-mhk-kueche-de.pixelpark.net.yaml
index 9f98ac67c11d8067fa95a28cbde7149fe16d2dd6..e6ac50dda376a76113de08fadbaa6dc49e728140 100644 (file)
--- a/customer/mhk/rls02-mhk-kueche-de.pixelpark.net.yaml
+++ b/customer/mhk/rls02-mhk-kueche-de.pixelpark.net.yaml
@@ -23,4 +23,4 @@ mysql::server::override_options:
     innodb_file_per_table: 1
     table_open_cache: 512
     innodb_log_file_size: 256M
-    performance_schema: ON
+    performance_schema: true

diff --git a/customer/mhk/stage-mls-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/stage-mls-mhk-kueche-de.pixelpark.net.yaml
index 36af6b62c70eb6e6b8ca220654417ccaf2b6d11a..7d2407ff4cb1d4726fa7743941974c6c6cc6d985 100644 (file)
--- a/customer/mhk/stage-mls-mhk-kueche-de.pixelpark.net.yaml
+++ b/customer/mhk/stage-mls-mhk-kueche-de.pixelpark.net.yaml
@@ -27,12 +27,12 @@ mysql::server::override_options:
     innodb_file_per_table: 1
     table_open_cache: 512
     innodb_log_file_size: 256M
-    performance_schema: ON
+    performance_schema: true
 
 logstash::generic_resource:
   mls:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/log/coremedia/cm7-mls-tomcat/coremedia.log'
       type: webapp
@@ -47,7 +47,7 @@ logstash::generic_resource:
         negate: true
   mls-caefeeder:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/log/coremedia/cm7-caefeeder-live-tomcat/caefeeder.log'
       type: webapp

diff --git a/customer/mhk/stage-red-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/stage-red-mhk-kueche-de.pixelpark.net.yaml
index e51343962a6f4295d034f5ec5df98988ea48fa6b..9569e15d5332a0499af3e2e83c46de4b8a26ce25 100644 (file)
--- a/customer/mhk/stage-red-mhk-kueche-de.pixelpark.net.yaml
+++ b/customer/mhk/stage-red-mhk-kueche-de.pixelpark.net.yaml
@@ -28,14 +28,14 @@ mysql::server::override_options:
     innodb_file_per_table: 1
     table_open_cache: 512
     innodb_log_file_size: 256M
-    performance_schema: ON
+    performance_schema: true
 
 
 apache::mod::deflate::types:
   - 'text/css'
   - 'application/x-javascript application/javascript application/ecmascript'
   - 'application/rss+xml'
-  - 'image/svg+xml' # new
+  - 'image/svg+xml'  # new
 
 apache::default_vhost: false
 
@@ -136,7 +136,7 @@ infra::profile::apache::pp_vhosts:
 logstash::generic_resource:
   preview:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/log/coremedia/cm7-studio-tomcat/blueprint.log'
       type: webapp
@@ -152,7 +152,7 @@ logstash::generic_resource:
         negate: true
   studio:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/log/coremedia/cm7-studio-tomcat/CoreMedia-Studio.log'
       type: webapp
@@ -168,7 +168,7 @@ logstash::generic_resource:
         negate: true
   wfs:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/log/coremedia/cm7-wfs-tomcat/workflow.log'
       type: webapp
@@ -184,7 +184,7 @@ logstash::generic_resource:
         negate: true
   contentfeeder:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/log/coremedia/cm7-cms-tomcat/contentfeeder.log'
       type: webapp
@@ -200,7 +200,7 @@ logstash::generic_resource:
         negate: true
   cms:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/log/coremedia/cm7-cms-tomcat/coremedia.log'
       type: webapp
@@ -216,7 +216,7 @@ logstash::generic_resource:
         negate: true
   cms-uc:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/log/coremedia/cm7-cms-tomcat/user-changes.log'
       type: webapp
@@ -232,7 +232,7 @@ logstash::generic_resource:
         negate: true
   caefeeder:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/log/coremedia/cm7-cms-tomcat/user-changes.log'
       type: webapp

diff --git a/customer/mhk/stage-rls01-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/stage-rls01-mhk-kueche-de.pixelpark.net.yaml
index b4b8da175a77ff96d7412021bdd835cc165fd794..a7fb1213bf7368c3bd080bf1b2edffcb9c59d5fb 100644 (file)
--- a/customer/mhk/stage-rls01-mhk-kueche-de.pixelpark.net.yaml
+++ b/customer/mhk/stage-rls01-mhk-kueche-de.pixelpark.net.yaml
@@ -23,4 +23,4 @@ mysql::server::override_options:
     innodb_file_per_table: 1
     table_open_cache: 512
     innodb_log_file_size: 256M
-    performance_schema: ON
+    performance_schema: true

diff --git a/customer/mhk/stage-rls02-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/stage-rls02-mhk-kueche-de.pixelpark.net.yaml
index 45a79ef1d758e220a717dd8ef67cff24e4031d8a..c3818addf1345b9dce54f1b09fa6201f7916b08a 100644 (file)
--- a/customer/mhk/stage-rls02-mhk-kueche-de.pixelpark.net.yaml
+++ b/customer/mhk/stage-rls02-mhk-kueche-de.pixelpark.net.yaml
@@ -23,4 +23,4 @@ mysql::server::override_options:
     innodb_file_per_table: 1
     table_open_cache: 512
     innodb_log_file_size: 256M
-    performance_schema: ON
+    performance_schema: true

diff --git a/customer/mhk/stage-www01-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/stage-www01-mhk-kueche-de.pixelpark.net.yaml
index d4d18d749c3eedbb0872e1e988cf9ebf462c2a87..f471891faa856500784e4be6682261c21125119b 100644 (file)
--- a/customer/mhk/stage-www01-mhk-kueche-de.pixelpark.net.yaml
+++ b/customer/mhk/stage-www01-mhk-kueche-de.pixelpark.net.yaml
@@ -106,7 +106,7 @@ infra::profile::apache::pp_vhosts:
           - '^/connect/(.*) /blueprint/servlet/connect/$1 [PT,L]'
           - '^/mhk/(.*) /blueprint/servlet/mhk/$1 [PT,L]'
           - '^/static-image/(.*) /blueprint/servlet/static-image/$1 [PT,L]'
-          #- '^/de-DE(/)?$ / [R,L]'
+          # - '^/de-DE(/)?$ / [R,L]'
           - '^/de-DE(/)?$ /blueprint/servlet/page/de-DE [PT,L]'
           - '^/blueprint/de-DE$ /blueprint/servlet/page/de-DE [PT,L]'
           - '^/blueprint/servlet/sitemap-generation$ - [F,PT,L]'
@@ -170,7 +170,7 @@ infra::profile::apache::pp_vhosts:
 logstash::generic_resource:
   webapp:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/log/coremedia/cm7-delivery-tomcat/blueprint.log'
       type: webapp

diff --git a/customer/mhk/stage-www02-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/stage-www02-mhk-kueche-de.pixelpark.net.yaml
index 0ab1c1e6e79854d96d5e67904faaaf53890ce572..3432c919504570d4fc2e965a4f582183c1000dea 100644 (file)
--- a/customer/mhk/stage-www02-mhk-kueche-de.pixelpark.net.yaml
+++ b/customer/mhk/stage-www02-mhk-kueche-de.pixelpark.net.yaml
@@ -106,7 +106,7 @@ infra::profile::apache::pp_vhosts:
           - '^/connect/(.*) /blueprint/servlet/connect/$1 [PT,L]'
           - '^/mhk/(.*) /blueprint/servlet/mhk/$1 [PT,L]'
           - '^/static-image/(.*) /blueprint/servlet/static-image/$1 [PT,L]'
-          #- '^/de-DE(/)?$ / [R,L]'
+          # - '^/de-DE(/)?$ / [R,L]'
           - '^/de-DE(/)?$ /blueprint/servlet/page/de-DE [PT,L]'
           - '^/blueprint/de-DE$ /blueprint/servlet/page/de-DE [PT,L]'
           - '^/blueprint/servlet/sitemap-generation$ - [F,PT,L]'
@@ -170,7 +170,7 @@ infra::profile::apache::pp_vhosts:
 logstash::generic_resource:
   webapp:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/log/coremedia/cm7-delivery-tomcat/blueprint.log'
       type: webapp

diff --git a/customer/mhk/stage-www03-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/stage-www03-mhk-kueche-de.pixelpark.net.yaml
index bb32f2f5b41e0a80cf35d4cc1f708cc011295db7..98acc713b8d6d3c31cff33335f1cd726f47b4a5c 100644 (file)
--- a/customer/mhk/stage-www03-mhk-kueche-de.pixelpark.net.yaml
+++ b/customer/mhk/stage-www03-mhk-kueche-de.pixelpark.net.yaml
@@ -106,7 +106,7 @@ infra::profile::apache::pp_vhosts:
           - '^/connect/(.*) /blueprint/servlet/connect/$1 [PT,L]'
           - '^/mhk/(.*) /blueprint/servlet/mhk/$1 [PT,L]'
           - '^/static-image/(.*) /blueprint/servlet/static-image/$1 [PT,L]'
-          #- '^/de-DE(/)?$ / [R,L]'
+          # - '^/de-DE(/)?$ / [R,L]'
           - '^/de-DE(/)?$ /blueprint/servlet/page/de-DE [PT,L]'
           - '^/blueprint/de-DE$ /blueprint/servlet/page/de-DE [PT,L]'
           - '^/blueprint/servlet/sitemap-generation$ - [F,PT,L]'
@@ -170,7 +170,7 @@ infra::profile::apache::pp_vhosts:
 logstash::generic_resource:
   webapp:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/log/coremedia/cm7-delivery-tomcat/blueprint.log'
       type: webapp

diff --git a/customer/mhk/test.yaml b/customer/mhk/test.yaml
index 583ce2b90bf4e48e9ca7a21465194f344537bad4..8f9fa7ce6c889d91242c77306e33b03c90dba32a 100644 (file)
--- a/customer/mhk/test.yaml
+++ b/customer/mhk/test.yaml
@@ -1,3 +1,4 @@
+---
 accounts::users:
   jenkins:
     apply: true

diff --git a/customer/mhk/www01-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/www01-mhk-kueche-de.pixelpark.net.yaml
index e268e03c80bab1f91aaceae7b2bac4c62b8149f4..9034010f26992fbc8d6a9bec159557c3d46f0c19 100644 (file)
--- a/customer/mhk/www01-mhk-kueche-de.pixelpark.net.yaml
+++ b/customer/mhk/www01-mhk-kueche-de.pixelpark.net.yaml
@@ -26,32 +26,32 @@ apache::mod::deflate::types:
   - 'image/svg+xml'
 
 infra::profile::apache::pp_vhosts:
-  #baustellenseite:
-  #  docroot: '/var/www/mhk/kueche.de'
-  #  servername: kueche.de
-  #  serveraliases:
-  #    - www.kueche.de
-  #  ssl: false
-  #  setenvif:
-  #    - 'HTTPS on HTTPS=on'
-  #  access_log_format: remote_combined
-  #  rewrites:
-  #    - nonwww:
-  #      rewrite_cond:
-  #        - '%%{ich-trickse}{HTTP_HOST} !^kueche.de$ [NC]'
-  #      rewrite_rule:
-  #        - '^(.*)$ http://kueche.de$1 [R=301,L]'
-  #    - to_ssl:
-  #      comment: 'all to https'
-  #      rewrite_cond:
-  #        - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
-  #      rewrite_rule:
-  #        - '^(.*)$ https://kueche.de$1 [R=301,L]'
-  #  headers:
-  #    - 'set X-Frame-Options: sameorigin'
-  #    - 'set X-XSS-Protection: "1; mode=block"'
-  #    - 'set X-Content-Type-Options: nosniff'
-  #    - 'set Strict-Transport-Security: max-age=31536000 env=HTTPS'
+  # baustellenseite:
+  #   docroot: '/var/www/mhk/kueche.de'
+  #   servername: kueche.de
+  #   serveraliases:
+  #     - www.kueche.de
+  #   ssl: false
+  #   setenvif:
+  #     - 'HTTPS on HTTPS=on'
+  #   access_log_format: remote_combined
+  #   rewrites:
+  #     - nonwww:
+  #       rewrite_cond:
+  #         - '%%{ich-trickse}{HTTP_HOST} !^kueche.de$ [NC]'
+  #       rewrite_rule:
+  #         - '^(.*)$ http://kueche.de$1 [R=301,L]'
+  #     - to_ssl:
+  #       comment: 'all to https'
+  #       rewrite_cond:
+  #         - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
+  #       rewrite_rule:
+  #         - '^(.*)$ https://kueche.de$1 [R=301,L]'
+  #   headers:
+  #     - 'set X-Frame-Options: sameorigin'
+  #     - 'set X-XSS-Protection: "1; mode=block"'
+  #     - 'set X-Content-Type-Options: nosniff'
+  #     - 'set Strict-Transport-Security: max-age=31536000 env=HTTPS'
   www:
     docroot: '/var/www/mhk'
     servername: kueche.de
@@ -160,7 +160,7 @@ infra::profile::apache::pp_vhosts:
           - '^/connect/(.*) /blueprint/servlet/connect/$1 [PT,L]'
           - '^/mhk/(.*) /blueprint/servlet/mhk/$1 [PT,L]'
           - '^/static-image/(.*) /blueprint/servlet/static-image/$1 [PT,L]'
-          #- '^/de-DE(/)?$ / [R,L]'
+          # - '^/de-DE(/)?$ / [R,L]'
           - '^/de-DE(/)?$ /blueprint/servlet/page/de-DE [PT,L]'
           - '^/blueprint/de-DE$ /blueprint/servlet/page/de-DE [PT,L]'
           - '^/blueprint/servlet/sitemap-generation$ - [F,PT,L]'
@@ -226,7 +226,7 @@ infra::profile::apache::pp_vhosts:
 logstash::generic_resource:
   webapp:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/log/coremedia/cm7-delivery-tomcat/blueprint.log'
       type: webapp

diff --git a/customer/mhk/www02-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/www02-mhk-kueche-de.pixelpark.net.yaml
index e935b4eea1d55240b7f26dd304e3d4da1fb123b1..c10d3d6341c47cac2ce2bce4c3ae5468b35bc30c 100644 (file)
--- a/customer/mhk/www02-mhk-kueche-de.pixelpark.net.yaml
+++ b/customer/mhk/www02-mhk-kueche-de.pixelpark.net.yaml
@@ -26,32 +26,32 @@ apache::mod::deflate::types:
   - 'image/svg+xml'
 
 infra::profile::apache::pp_vhosts:
-  #baustellenseite:
-  #  docroot: '/var/www/mhk/kueche.de'
-  #  servername: kueche.de
-  #  serveraliases:
-  #    - www.kueche.de
-  #  ssl: false
-  #  setenvif:
-  #    - 'HTTPS on HTTPS=on'
-  #  access_log_format: remote_combined
-  #  rewrites:
-  #    - nonwww:
-  #      rewrite_cond:
-  #        - '%%{ich-trickse}{HTTP_HOST} !^kueche.de$ [NC]'
-  #      rewrite_rule:
-  #        - '^(.*)$ http://kueche.de$1 [R=301,L]'
-  #    - to_ssl:
-  #      comment: 'all to https'
-  #      rewrite_cond:
-  #        - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
-  #      rewrite_rule:
-  #        - '^(.*)$ https://kueche.de$1 [R=301,L]'
-  #  headers:
-  #    - 'set X-Frame-Options: sameorigin'
-  #    - 'set X-XSS-Protection: "1; mode=block"'
-  #    - 'set X-Content-Type-Options: nosniff'
-  #    - 'set Strict-Transport-Security: max-age=31536000 env=HTTPS'
+  # baustellenseite:
+  #   docroot: '/var/www/mhk/kueche.de'
+  #   servername: kueche.de
+  #   serveraliases:
+  #     - www.kueche.de
+  #   ssl: false
+  #   setenvif:
+  #     - 'HTTPS on HTTPS=on'
+  #   access_log_format: remote_combined
+  #   rewrites:
+  #     - nonwww:
+  #       rewrite_cond:
+  #         - '%%{ich-trickse}{HTTP_HOST} !^kueche.de$ [NC]'
+  #       rewrite_rule:
+  #         - '^(.*)$ http://kueche.de$1 [R=301,L]'
+  #     - to_ssl:
+  #       comment: 'all to https'
+  #       rewrite_cond:
+  #         - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
+  #       rewrite_rule:
+  #         - '^(.*)$ https://kueche.de$1 [R=301,L]'
+  #   headers:
+  #     - 'set X-Frame-Options: sameorigin'
+  #     - 'set X-XSS-Protection: "1; mode=block"'
+  #     - 'set X-Content-Type-Options: nosniff'
+  #     - 'set Strict-Transport-Security: max-age=31536000 env=HTTPS'
   www:
     docroot: '/var/www/mhk'
     servername: kueche.de
@@ -160,7 +160,7 @@ infra::profile::apache::pp_vhosts:
           - '^/connect/(.*) /blueprint/servlet/connect/$1 [PT,L]'
           - '^/mhk/(.*) /blueprint/servlet/mhk/$1 [PT,L]'
           - '^/static-image/(.*) /blueprint/servlet/static-image/$1 [PT,L]'
-          #- '^/de-DE(/)?$ / [R,L]'
+          # - '^/de-DE(/)?$ / [R,L]'
           - '^/de-DE(/)?$ /blueprint/servlet/page/de-DE [PT,L]'
           - '^/blueprint/de-DE$ /blueprint/servlet/page/de-DE [PT,L]'
           - '^/blueprint/servlet/sitemap-generation$ - [F,PT,L]'
@@ -226,7 +226,7 @@ infra::profile::apache::pp_vhosts:
 logstash::generic_resource:
   webapp:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/log/coremedia/cm7-delivery-tomcat/blueprint.log'
       type: webapp

diff --git a/customer/mhk/www03-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/www03-mhk-kueche-de.pixelpark.net.yaml
index 6ebbdbfcf5327f568a28687925316e91da557084..2dcd7cb73e033f5a8cc07bc126b7ea068848c88b 100644 (file)
--- a/customer/mhk/www03-mhk-kueche-de.pixelpark.net.yaml
+++ b/customer/mhk/www03-mhk-kueche-de.pixelpark.net.yaml
@@ -26,32 +26,32 @@ apache::mod::deflate::types:
   - 'image/svg+xml'
 
 infra::profile::apache::pp_vhosts:
-  #baustellenseite:
-  #  docroot: '/var/www/mhk/kueche.de'
-  #  servername: kueche.de
-  #  serveraliases:
-  #    - www.kueche.de
-  #  ssl: false
-  #  setenvif:
-  #    - 'HTTPS on HTTPS=on'
-  #  access_log_format: remote_combined
-  #  rewrites:
-  #    - nonwww:
-  #      rewrite_cond:
-  #        - '%%{ich-trickse}{HTTP_HOST} !^kueche.de$ [NC]'
-  #      rewrite_rule:
-  #        - '^(.*)$ http://kueche.de$1 [R=301,L]'
-  #    - to_ssl:
-  #      comment: 'all to https'
-  #      rewrite_cond:
-  #        - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
-  #      rewrite_rule:
-  #        - '^(.*)$ https://kueche.de$1 [R=301,L]'
-  #  headers:
-  #    - 'set X-Frame-Options: sameorigin'
-  #    - 'set X-XSS-Protection: "1; mode=block"'
-  #    - 'set X-Content-Type-Options: nosniff'
-  #    - 'set Strict-Transport-Security: max-age=31536000 env=HTTPS'
+  # baustellenseite:
+  #   docroot: '/var/www/mhk/kueche.de'
+  #   servername: kueche.de
+  #   serveraliases:
+  #     - www.kueche.de
+  #   ssl: false
+  #   setenvif:
+  #     - 'HTTPS on HTTPS=on'
+  #   access_log_format: remote_combined
+  #   rewrites:
+  #     - nonwww:
+  #       rewrite_cond:
+  #         - '%%{ich-trickse}{HTTP_HOST} !^kueche.de$ [NC]'
+  #       rewrite_rule:
+  #         - '^(.*)$ http://kueche.de$1 [R=301,L]'
+  #     - to_ssl:
+  #       comment: 'all to https'
+  #       rewrite_cond:
+  #         - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
+  #       rewrite_rule:
+  #         - '^(.*)$ https://kueche.de$1 [R=301,L]'
+  #   headers:
+  #     - 'set X-Frame-Options: sameorigin'
+  #     - 'set X-XSS-Protection: "1; mode=block"'
+  #     - 'set X-Content-Type-Options: nosniff'
+  #     - 'set Strict-Transport-Security: max-age=31536000 env=HTTPS'
   www:
     docroot: '/var/www/mhk'
     servername: kueche.de
@@ -160,7 +160,7 @@ infra::profile::apache::pp_vhosts:
           - '^/connect/(.*) /blueprint/servlet/connect/$1 [PT,L]'
           - '^/mhk/(.*) /blueprint/servlet/mhk/$1 [PT,L]'
           - '^/static-image/(.*) /blueprint/servlet/static-image/$1 [PT,L]'
-          #- '^/de-DE(/)?$ / [R,L]'
+          # - '^/de-DE(/)?$ / [R,L]'
           - '^/de-DE(/)?$ /blueprint/servlet/page/de-DE [PT,L]'
           - '^/blueprint/de-DE$ /blueprint/servlet/page/de-DE [PT,L]'
           - '^/blueprint/servlet/sitemap-generation$ - [F,PT,L]'
@@ -226,7 +226,7 @@ infra::profile::apache::pp_vhosts:
 logstash::generic_resource:
   webapp:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/log/coremedia/cm7-delivery-tomcat/blueprint.log'
       type: webapp