Deactivating special transport mapping for FBB hosts

diff --git a/customer/fbb-db/common.yaml b/customer/fbb-db/common.yaml
index 5ef99bbd4f6eb2b80e71a3143086e117b0935092..0e5cd8d9c841e6663888fd2220ffe0995ed589b3 100644 (file)
--- 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 89b0870386735fe4ef76125a1283a22fbbe84b58..f67b10ca7abefac27a616bcb6a59af0a2f3cbfaf 100644 (file)
--- 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 9c874a13645448bb14c2eda57946895108c3a6c8..66c239c7aecdf5aec4d00d11c041cd808781887c 100644 (file)
--- 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'