From 072420eca73d1f48a88490c43dbb791e3d27b9cb Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Mon, 10 Jul 2017 17:33:33 +0200
Subject: [PATCH] Deactivating special transport mapping for FBB hosts
---
customer/fbb-db/common.yaml | 4 ++--
customer/fbb-ws/common.yaml | 4 ++--
customer/fbb-www/common.yaml | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/customer/fbb-db/common.yaml b/customer/fbb-db/common.yaml
index 5ef99bbd..0e5cd8d9 100644
--- a/customer/fbb-db/common.yaml
+++ b/customer/fbb-db/common.yaml
@@ -11,7 +11,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'
#####################################################
@@ -67,4 +67,4 @@ logstash::generic_resource:
parameters:
match:
- message
- - '%%{ich-trickse}{TIMESTAMP_ISO8601:time} *%%{ich-trickse}{INT:threadid}? *\[%%{ich-trickse}{WORD:loglevel}\] *%%{ich-trickse}{GREEDYDATA:restmessage}'
\ No newline at end of file
+ - '%%{ich-trickse}{TIMESTAMP_ISO8601:time} *%%{ich-trickse}{INT:threadid}? *\[%%{ich-trickse}{WORD:loglevel}\] *%%{ich-trickse}{GREEDYDATA:restmessage}'
diff --git a/customer/fbb-ws/common.yaml b/customer/fbb-ws/common.yaml
index 89b08703..f67b10ca 100644
--- a/customer/fbb-ws/common.yaml
+++ b/customer/fbb-ws/common.yaml
@@ -112,7 +112,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:
@@ -283,4 +283,4 @@ infra::additional_files:
mode: '0775'
'/www/data':
ensure: 'link'
- target: '/var/data'
\ No newline at end of file
+ target: '/var/data'
diff --git a/customer/fbb-www/common.yaml b/customer/fbb-www/common.yaml
index 9c874a13..66c239c7 100644
--- a/customer/fbb-www/common.yaml
+++ b/customer/fbb-www/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'
apache::mod::expires::expires_by_type:
@@ -311,4 +311,4 @@ infra::additional_files:
target: '/var/data'
'/var/www/berlin-airport':
ensure: 'link'
- target: '/var/data/fiona/web/online/docs'
\ No newline at end of file
+ target: '/var/data/fiona/web/online/docs'
--
2.39.5