From: Robert Waffen Date: Fri, 14 Sep 2018 15:06:07 +0000 (+0200) Subject: fix lint for fbb-ws X-Git-Tag: v0.1.0~99 X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=93c0b3480ab3a89c8b6bd2ffaf6006bdf1147787;p=pixelpark%2Fhiera.git fix lint for fbb-ws --- diff --git a/customer/fbb-ws/common.yaml b/customer/fbb-ws/common.yaml index ab160de4..761a4044 100644 --- a/customer/fbb-ws/common.yaml +++ b/customer/fbb-ws/common.yaml @@ -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: diff --git a/customer/fbb-ws/dev-ws-fbb.pixelpark.net.yaml b/customer/fbb-ws/dev-ws-fbb.pixelpark.net.yaml index 2c27854b..bf68aa5c 100644 --- a/customer/fbb-ws/dev-ws-fbb.pixelpark.net.yaml +++ b/customer/fbb-ws/dev-ws-fbb.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: - 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 diff --git a/customer/fbb-ws/production.yaml b/customer/fbb-ws/production.yaml index b1693d07..20239b43 100644 --- a/customer/fbb-ws/production.yaml +++ b/customer/fbb-ws/production.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: - 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 diff --git a/customer/fbb-ws/test.yaml b/customer/fbb-ws/test.yaml index e9a1c376..70770b5b 100644 --- a/customer/fbb-ws/test.yaml +++ b/customer/fbb-ws/test.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: - 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