]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
projects / pixelpark / hiera.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: de1eded)
fix lint for mbvd-odt
authorRobert Waffen <robert.waffen@pixelpark.com>
Fri, 14 Sep 2018 15:06:10 +0000 (17:06 +0200)
committerFrank Brehm <frank.brehm@pixelpark.com>
Tue, 18 Sep 2018 14:21:50 +0000 (16:21 +0200)
customer/mbvd-odt/cms-odt-daimler-com.pixelpark.net.yaml patch | blob | history
customer/mbvd-odt/db-odt-daimler-com.pixelpark.net.yaml patch | blob | history
customer/mbvd-odt/int-cms-odt-daimler-com.pixelpark.net.yaml patch | blob | history
customer/mbvd-odt/int-odt-daimler-com.pixelpark.net.yaml patch | blob | history
customer/mbvd-odt/int-tmp-cms-odt-daimler-com.pixelpark.net.yaml patch | blob | history
customer/mbvd-odt/int-tmp-odt-daimler-com.pixelpark.net.yaml patch | blob | history
customer/mbvd-odt/tmp-cms-odt-daimler-com.pixelpark.net.yaml patch | blob | history
customer/mbvd-odt/tmp-db-odt-daimler-com.pixelpark.net.yaml patch | blob | history
customer/mbvd-odt/tmp-odt-daimler-com.pixelpark.net.yaml patch | blob | history

diff --git a/customer/mbvd-odt/cms-odt-daimler-com.pixelpark.net.yaml b/customer/mbvd-odt/cms-odt-daimler-com.pixelpark.net.yaml
index 2c32089467a479b0122fd54179f2e38abc2ae6b1..9c29ac59254694ef230919406f4ef1c0b42a065c 100644 (file)
--- a/customer/mbvd-odt/cms-odt-daimler-com.pixelpark.net.yaml
+++ b/customer/mbvd-odt/cms-odt-daimler-com.pixelpark.net.yaml
@@ -19,7 +19,7 @@ logstash::drop_grokparsefailure: false
 logstash::generic_resource:
   catalina:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/lib/tomcat/catalina/odt-cms/logs/catalina.out'
       type: tomcat
@@ -34,7 +34,7 @@ logstash::generic_resource:
         negate: true
   opencms:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/lib/tomcat/catalina/odt-cms/webapps/ROOT/WEB-INF/logs/opencms.log'
       type: opencms
@@ -49,7 +49,7 @@ logstash::generic_resource:
         negate: true
   tomcat_access:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/lib/tomcat/catalina/odt-cms/logs/localhost_access_log.*'
       type: tomcat-access
diff --git a/customer/mbvd-odt/db-odt-daimler-com.pixelpark.net.yaml b/customer/mbvd-odt/db-odt-daimler-com.pixelpark.net.yaml
index ff8d455cd742660cde77e465223d6630bc41a7dc..344ca7061c6156d8ae18f92ad621fd0561185b92 100644 (file)
--- a/customer/mbvd-odt/db-odt-daimler-com.pixelpark.net.yaml
+++ b/customer/mbvd-odt/db-odt-daimler-com.pixelpark.net.yaml
@@ -1,5 +1,5 @@
 ---
-infra::role: base_for_old_systems # because we don't need xymon
+infra::role: base_for_old_systems  # because we don't need xymon
 infra::additional_classes:
   - infra::profile::pg_server
   - infra::profile::mongodb_server
diff --git a/customer/mbvd-odt/int-cms-odt-daimler-com.pixelpark.net.yaml b/customer/mbvd-odt/int-cms-odt-daimler-com.pixelpark.net.yaml
index 7dc9dc554844bf74ea66d316ad9e409bcf4a36d3..14bcdc492efa26a099f1c424f81a340f2b67cc72 100644 (file)
--- a/customer/mbvd-odt/int-cms-odt-daimler-com.pixelpark.net.yaml
+++ b/customer/mbvd-odt/int-cms-odt-daimler-com.pixelpark.net.yaml
@@ -35,7 +35,7 @@ infra::profile::apache::pp_vhosts:
       - opencms_to_slash_http:
         comment: '/opencms to /'
         rewrite_rule:
-           - '^/opencms/(.*)$ http://localhost:8080/opencms/$1 [P,L]'
+          - '^/opencms/(.*)$ http://localhost:8080/opencms/$1 [P,L]'
       - https:
         comment: 'all to https'
         rewrite_rule:
@@ -59,7 +59,7 @@ infra::profile::apache::pp_vhosts:
       - opencms_to_slash_https:
         comment: '/opencms to /'
         rewrite_rule:
-           - '^/opencms/(.*)$ http://localhost:8081/opencms/$1 [P,L]'
+          - '^/opencms/(.*)$ http://localhost:8081/opencms/$1 [P,L]'
       - proxy_https:
         rewrite_cond:
           - '%%{ich-trickse}{REQUEST_URI} !^/(opencms|resources|export|skins|genImages|genImagesTemp|fonts)'
diff --git a/customer/mbvd-odt/int-odt-daimler-com.pixelpark.net.yaml b/customer/mbvd-odt/int-odt-daimler-com.pixelpark.net.yaml
index 3ff17906defd40f856f2c34ece4e2185f6ee0d1e..a9c7f33ea46ae4a484310e671d79d8a4e2273223 100644 (file)
--- a/customer/mbvd-odt/int-odt-daimler-com.pixelpark.net.yaml
+++ b/customer/mbvd-odt/int-odt-daimler-com.pixelpark.net.yaml
@@ -35,7 +35,7 @@ infra::profile::apache::pp_vhosts:
           - '%%{ich-trickse}{REQUEST_URI} !^/.\.html'
         rewrite_rule:
           - '^(.*)$ https://int-odt-daimler-com.pixelpark.net$1 [L,R=301]'
-    #rewrites_ssl:
+    # rewrites_ssl:
     #  - check_auth:
     #    comment: 'show error if denied'
     #    rewrite_cond:
@@ -66,30 +66,30 @@ infra::profile::apache::pp_vhosts:
         provider: location
         path: '/newsletterservice'
         require:
-            - ip 217.66.51.0/24
-            - ip 217.66.50.0/24
-            - ip 217.66.56.0/24
-            - ip 213.61.96.226
-            - ip 176.28.25.242
-            - ip 37.120.57.39
-            - ip 46.30.59.148
-            - ip 82.165.141.125
-            - ip 37.120.103.75
-            - ip 83.125.19.254
-            - ip 192.168.170.49
-            - ip 192.168.170.53
-            - ip 192.168.170.52
-            - ip 54.205.87.231
-            - ip 86.56.52.27
-            - ip 37.202.1.232
-            - ip 46.30.60.116
-            - ip 192.168.170.102
-            - ip 192.168.170.103
-            - ip 85.236.207.96
-            - ip 37.201.4.175
-            - ip 192.168.170.129
-            - ip 92.79.46.246
-            - ip 88.217.140.58
+          - ip 217.66.51.0/24
+          - ip 217.66.50.0/24
+          - ip 217.66.56.0/24
+          - ip 213.61.96.226
+          - ip 176.28.25.242
+          - ip 37.120.57.39
+          - ip 46.30.59.148
+          - ip 82.165.141.125
+          - ip 37.120.103.75
+          - ip 83.125.19.254
+          - ip 192.168.170.49
+          - ip 192.168.170.53
+          - ip 192.168.170.52
+          - ip 54.205.87.231
+          - ip 86.56.52.27
+          - ip 37.202.1.232
+          - ip 46.30.60.116
+          - ip 192.168.170.102
+          - ip 192.168.170.103
+          - ip 85.236.207.96
+          - ip 37.201.4.175
+          - ip 192.168.170.129
+          - ip 92.79.46.246
+          - ip 88.217.140.58
 
 infra::profile::cron::cronjobs:
   fetchcrl:
diff --git a/customer/mbvd-odt/int-tmp-cms-odt-daimler-com.pixelpark.net.yaml b/customer/mbvd-odt/int-tmp-cms-odt-daimler-com.pixelpark.net.yaml
index 7421a98e39c1bbf049e0282e46b83c6cb41b03b9..9b438659e33b98f8cf6acb870abb88223b8853d5 100644 (file)
--- a/customer/mbvd-odt/int-tmp-cms-odt-daimler-com.pixelpark.net.yaml
+++ b/customer/mbvd-odt/int-tmp-cms-odt-daimler-com.pixelpark.net.yaml
@@ -45,7 +45,7 @@ infra::profile::apache::pp_vhosts:
       - opencms_to_slash_http:
         comment: '/opencms to /'
         rewrite_rule:
-           - '^/opencms/(.*)$ http://localhost:8080/opencms/$1 [P,L]'
+          - '^/opencms/(.*)$ http://localhost:8080/opencms/$1 [P,L]'
       - https:
         comment: 'all to https'
         rewrite_rule:
@@ -69,7 +69,7 @@ infra::profile::apache::pp_vhosts:
       - opencms_to_slash_https:
         comment: '/opencms to /'
         rewrite_rule:
-           - '^/opencms/(.*)$ http://localhost:8081/opencms/$1 [P,L]'
+          - '^/opencms/(.*)$ http://localhost:8081/opencms/$1 [P,L]'
       - proxy_https:
         rewrite_cond:
           - '%%{ich-trickse}{REQUEST_URI} !^/(opencms|resources|export|skins|genImages|genImagesTemp|fonts)'
diff --git a/customer/mbvd-odt/int-tmp-odt-daimler-com.pixelpark.net.yaml b/customer/mbvd-odt/int-tmp-odt-daimler-com.pixelpark.net.yaml
index 88f4c226ef1e4365b36dbd91aecdff582176171c..ac78d9e7cb90af746e5c4f080e5449bcbf23fac0 100644 (file)
--- a/customer/mbvd-odt/int-tmp-odt-daimler-com.pixelpark.net.yaml
+++ b/customer/mbvd-odt/int-tmp-odt-daimler-com.pixelpark.net.yaml
@@ -1,9 +1,4 @@
 ---
-accounts::users:
-  jenkins:
-    apply: true
-    sudo: true
-
 infra::role: base
 infra::additional_classes:
   - infra::profile::apache
@@ -79,7 +74,7 @@ infra::profile::apache::pp_vhosts:
           - '%%{ich-trickse}{REQUEST_URI} !^/.\.html'
         rewrite_rule:
           - '^(.*)$ https://int-odt-daimler-com.pixelpark.net$1 [L,R=301]'
-    #rewrites_ssl:
+    # rewrites_ssl:
     #  - check_auth:
     #    comment: 'show error if denied'
     #    rewrite_cond:
@@ -111,28 +106,28 @@ infra::profile::apache::pp_vhosts:
         provider: location
         path: '/newsletterservice'
         require:
-            - ip 217.66.51.0/24
-            - ip 217.66.50.0/24
-            - ip 217.66.56.0/24
-            - ip 213.61.96.226
-            - ip 176.28.25.242
-            - ip 37.120.57.39
-            - ip 46.30.59.148
-            - ip 82.165.141.125
-            - ip 37.120.103.75
-            - ip 83.125.19.254
-            - ip 192.168.170.49
-            - ip 192.168.170.53
-            - ip 192.168.170.52
-            - ip 54.205.87.231
-            - ip 86.56.52.27
-            - ip 37.202.1.232
-            - ip 46.30.60.116
-            - ip 192.168.170.102
-            - ip 192.168.170.103
-            - ip 37.201.4.175
-            - ip 85.236.207.96
-            - ip 192.168.170.129
+          - ip 217.66.51.0/24
+          - ip 217.66.50.0/24
+          - ip 217.66.56.0/24
+          - ip 213.61.96.226
+          - ip 176.28.25.242
+          - ip 37.120.57.39
+          - ip 46.30.59.148
+          - ip 82.165.141.125
+          - ip 37.120.103.75
+          - ip 83.125.19.254
+          - ip 192.168.170.49
+          - ip 192.168.170.53
+          - ip 192.168.170.52
+          - ip 54.205.87.231
+          - ip 86.56.52.27
+          - ip 37.202.1.232
+          - ip 46.30.60.116
+          - ip 192.168.170.102
+          - ip 192.168.170.103
+          - ip 37.201.4.175
+          - ip 85.236.207.96
+          - ip 192.168.170.129
 
 infra::profile::cron::cronjobs:
   fetchcrl:
diff --git a/customer/mbvd-odt/tmp-cms-odt-daimler-com.pixelpark.net.yaml b/customer/mbvd-odt/tmp-cms-odt-daimler-com.pixelpark.net.yaml
index e8886a5187460861f2e4014af42a53c36ee0d5dc..a1fcc33c1c134209bafd2f7210bfdbca0ce2bb6a 100644 (file)
--- a/customer/mbvd-odt/tmp-cms-odt-daimler-com.pixelpark.net.yaml
+++ b/customer/mbvd-odt/tmp-cms-odt-daimler-com.pixelpark.net.yaml
@@ -1,5 +1,5 @@
 ---
-infra::role: base_for_old_systems # because we can't install xymon
+infra::role: base_for_old_systems  # because we can't install xymon
 infra::additional_classes:
   - accounts
   - infra::profile::apache
@@ -12,7 +12,7 @@ logstash::drop_grokparsefailure: false
 logstash::generic_resource:
   catalina:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/lib/tomcat/catalina/odt-cms/logs/catalina.out'
       type: tomcat
@@ -27,7 +27,7 @@ logstash::generic_resource:
         negate: true
   opencms:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/lib/tomcat/catalina/odt-cms/webapps/ROOT/WEB-INF/logs/opencms.log'
       type: opencms
@@ -42,7 +42,7 @@ logstash::generic_resource:
         negate: true
   tomcat_access:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/lib/tomcat/catalina/odt-cms/logs/localhost_access_log.*'
       type: tomcat-access
diff --git a/customer/mbvd-odt/tmp-db-odt-daimler-com.pixelpark.net.yaml b/customer/mbvd-odt/tmp-db-odt-daimler-com.pixelpark.net.yaml
index 838e6759a57e8107ad0a4107a8aa6ce253616785..3a7ead2d63b46a11775e8566243436fb5c0adb62 100644 (file)
--- a/customer/mbvd-odt/tmp-db-odt-daimler-com.pixelpark.net.yaml
+++ b/customer/mbvd-odt/tmp-db-odt-daimler-com.pixelpark.net.yaml
@@ -1,5 +1,5 @@
 ---
-infra::role: base # because we don't need xymon
+infra::role: base  # because we don't need xymon
 infra::additional_classes:
   - infra::profile::pg_server
   - infra::profile::mongodb_server
@@ -24,9 +24,9 @@ postgresql::server::ipv4acls:
   - 'host openemm openemm 77.74.234.111/32 md5'
   - 'host opencms opencms 10.90.13.0/24 md5'
   - 'host opencms opencms 10.90.14.0/24 md5'
-  - 'host opencms opencms 93.188.107.192/26 md5' # temporary 'till migration
-  - 'host openemm openemm 93.188.107.192/26 md5' # temporary 'till migration
-  - 'host openemm_cms openemm 93.188.107.192/26 md5' # temporary 'till migration
+  - 'host opencms opencms 93.188.107.192/26 md5'  # temporary 'till migration
+  - 'host openemm openemm 93.188.107.192/26 md5'  # temporary 'till migration
+  - 'host openemm_cms openemm 93.188.107.192/26 md5'  # temporary 'till migration
 
 infra::profile::pg_server::pgpw: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAkFafa2YcmiQDm4Ke++iIWS5cxwg3MGeVhiFZkrz4o7mwk05R2wXDIQdsP+2qQQgKJje2PTZqyICXNIhv8fraJYvRBkpNY730jdlFzaUIJjwBgdJTHxsqiU+IDReC+DMuqEyl9otu8NUkYVErWHPOR1dWYjBGF7BcyaYXOb4fCZD+tw4Y9EfkGJ2ZIQVIRDAp4mGFYAG9AHNJods2WIOnskTvzD/beXj2BxnN6nXTnJobFymw/L/HttaDza3qW8d1yeVdYqGXhjWrlqK1d/3nxuyfJNSfBe6Cbl40c7UaGeH73/E3WuzTNcv7H5o7tyberOC6jI2AbOzQ1kFz+r27IzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBqEuxyHaOpRI67UG1wBtE6gCCV8Kzjc0vmC/ax42U9rBQow5KGBDwN1qiO1m+4iMJJUQ==]
 infra::profile::pg_server::dbs:
diff --git a/customer/mbvd-odt/tmp-odt-daimler-com.pixelpark.net.yaml b/customer/mbvd-odt/tmp-odt-daimler-com.pixelpark.net.yaml
index c84dba6587634c92aaccb277cca441bfed7b0578..8dc56c3c9c00b7936ac63ba90095d277ab3b5c26 100644 (file)
--- a/customer/mbvd-odt/tmp-odt-daimler-com.pixelpark.net.yaml
+++ b/customer/mbvd-odt/tmp-odt-daimler-com.pixelpark.net.yaml
@@ -1,5 +1,5 @@
 ---
-infra::role: base_for_old_systems # because we can't install xymon
+infra::role: base_for_old_systems  # because we can't install xymon
 infra::additional_classes:
   - accounts
   - infra::profile::apache
@@ -82,14 +82,14 @@ infra::profile::apache::pp_vhosts:
           # enabled until merge of 71e4c530d286b8f11863d16ee94bc2f28f800cce
           SSLRequire %%{ich-trickse}{SSL_CLIENT_I_DN_O} eq "ODT"
           SSLVerifyClient require
-      #- webservice:
+      # - webservice:
       #  provider: location
       #  path: '/emm_webservice'
       #  require:
       #    - 'ip 93.188.107.192/26'
       #    - 'ip 217.66.50.0/24'
       #    - 'ip 217.66.51.0/24'
-      #- newsletterservice:
+      # - newsletterservice:
       #  provider: location
       #  path: '/newsletterservice'
       #  require:
Unnamed repository; edit this file 'description' to name the repository.