]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
fix lint for fbb-ws
authorRobert Waffen <robert.waffen@pixelpark.com>
Fri, 14 Sep 2018 15:06:07 +0000 (17:06 +0200)
committerFrank Brehm <frank.brehm@pixelpark.com>
Tue, 18 Sep 2018 13:54:56 +0000 (15:54 +0200)
customer/fbb-ws/common.yaml
customer/fbb-ws/dev-ws-fbb.pixelpark.net.yaml
customer/fbb-ws/production.yaml
customer/fbb-ws/test.yaml

index ab160de4ee9367cc1a1305283a5a8a3e6e896b46..761a4044f6eb7915de1e91a4590f39fb09d1b11c 100644 (file)
@@ -115,7 +115,7 @@ postfix::myorigin: "pixelpark.net"
 
 # Default values for PP Postfix module
 infra::profile::postfix::myorigin: "%{hiera('postfix::myorigin')}"
-#infra::profile::postfix::transport_maps_source: 'maps/transport-fbb'
+# infra::profile::postfix::transport_maps_source: 'maps/transport-fbb'
 infra::profile::postfix::virtual_aliases_source: 'maps/virtual-nullclient-fbb'
 
 infra::additional_packages:
index 2c27854bbf4702688c4ee27b47cfd3e4a83d8ab0..bf68aa5cd702b53031401b67d60b8635f2e2aeb8 100644 (file)
@@ -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:
   - accounts
   - infra::profile::apache_php
@@ -9,7 +9,7 @@ infra::additional_classes:
   - apache::mod::dav_fs
 
 accounts::users:
-  #Pixelpark
+  # Pixelpark
   christian.schoenherr:
     apply: true
     sudo: true
@@ -79,7 +79,7 @@ infra::profile::cron::cronjobs:
     #  - 'MAILTO=root'
       - 'PATH="/usr/bin:/bin"'
     description: 'CDM-Webservice-Push'
-  #wird benötigt weil auf dev keine Importer läuft
+  # wird benötigt weil auf dev keine Importer läuft
   lastimported-update:
     command: 'touch /var/data/flugimport_cron/lastupdated'
     minute: '*'
@@ -117,8 +117,6 @@ infra::profile::cron::cronjobs:
       - 'PATH="/usr/bin:/bin"'
     description: 'Webservice-Notification'
 
-
-
 repo::remi_php71: true
 
 php::fpm::pools:
@@ -192,7 +190,7 @@ infra::profile::apache::pp_vhosts:
         auth_digest_provider: file
         auth_user_file: '/etc/httpd/htdigest'
         auth_require: 'valid-user'
-        #BERFBB-3838
+        # BERFBB-3838
       - provider: directory
         options:
           - FollowSymLinks
@@ -250,7 +248,7 @@ infra::profile::apache::pp_vhosts:
         auth_digest_provider: file
         auth_user_file: '/etc/httpd/htdigest'
         auth_require: 'valid-user'
-        #BERFBB-3838
+        # BERFBB-3838
       - provider: directory
         options:
           - FollowSymLinks
index b1693d07adfe2264cc7696986a87205a7565c303..20239b4301c07a7ea567ca67751887aed2169c94 100644 (file)
@@ -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:
   - accounts
   - infra::profile::apache_php
@@ -9,7 +9,7 @@ infra::additional_classes:
 logstash::generic_resource:
   webservice:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/log/fbb_webservice/*.*'
       type: webservice
@@ -19,7 +19,7 @@ logstash::generic_resource:
         - "%{environment}"
   cdm_webservice:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/log/fbb_cdm_webservice/*.*'
       type: cdm_webservice
@@ -114,7 +114,7 @@ infra::profile::apache_php::fpm_pool:
   webservice:
     listen_owner: apache
     listen_group: apache
-    #wegen db problemen
+    # wegen db problemen
     pm_max_children: 20
   cdm-webservice:
     listen_owner: apache
index e9a1c376cb4b69c42e393de48ada22f2bebeac9d..70770b5b9b692512b72ca6d0783ab0908f58a488 100644 (file)
@@ -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:
   - accounts
   - infra::profile::apache_php
@@ -8,18 +8,18 @@ infra::additional_classes:
   - logstash
 
 accounts::users:
-  #pixelpark
+  # pixelpark
   christian.schoenherr:
     apply: true
     sudo: false
   markus.baumann:
     apply: true
     sudo: true
-    #disable before live
+    # disable before live
   harry.teuber:
     apply: true
     sudo: true
-    #disable before live
+    # disable before live
   jenkins:
     apply: true
     sudo: false
@@ -27,7 +27,7 @@ accounts::users:
 logstash::generic_resource:
   webservice:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/log/fbb_webservice/*.*'
       type: webservice
@@ -37,7 +37,7 @@ logstash::generic_resource:
         - "%{environment}"
   cdm_webservice:
     resource: file
-    order: 10 # Input
+    order: 10  # Input
     parameters:
       path: '/var/log/fbb_cdm_webservice/*.*'
       type: cdm_webservice
@@ -226,8 +226,6 @@ infra::profile::apache::pp_vhosts:
         rewrite_rule:
           - '^/webservices/payment/getProductTicketListForCustomerId.php(.*)$ https://%{literal("%")}{HTTP_HOST}/webservices/payment/getProductTicketList.php$1'
 
-
-
   cdm-webservice:
     docroot: '/var/www/cdm-webservice/web'
     servername: tst-cdmws-fbb.pixelpark.net