From: Philipp Dallig <philipp.dallig@pixelpark.com>
Date: Fri, 31 Mar 2017 13:27:38 +0000 (+0200)
Subject: fbb-werbung - correct mailserver
X-Git-Tag: v0.1.0~3341^2~1
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=3cebb591a6b0b0cb793aa65ea958f84214f5b88c;p=pixelpark%2Fhiera.git

fbb-werbung - correct mailserver
---

diff --git a/customer/fbb-werbung/dev-red-werbung-berlin-airport-de.pixelpark.net.yaml b/customer/fbb-werbung/dev-red-werbung-berlin-airport-de.pixelpark.net.yaml
index fcc90131..0a03bf54 100644
--- a/customer/fbb-werbung/dev-red-werbung-berlin-airport-de.pixelpark.net.yaml
+++ b/customer/fbb-werbung/dev-red-werbung-berlin-airport-de.pixelpark.net.yaml
@@ -20,8 +20,6 @@ sudo::configs:
       jenkins ALL=(tomcat) NOPASSWD: ALL
 
 # Postfix Config
-postfix::myorigin: 'pixelpark.com'
-postfix::relayhost: 'mx.pixelpark.net'
 site::profile::postfix::hashes:
   '/etc/postfix/virtual':
     ensure: present
@@ -36,6 +34,10 @@ site::profile::postfix::configs:
     value: 'hash:/etc/postfix/generic'
   recipient_delimiter:
     value: '+'
+  relayhost:
+    value: 'mx.pixelpark.net'
+  myorigin:
+    value: 'pixelpark.com'
 site::profile::postfix::virtuals:
   'root':
     destination: 8x5@pixelpark.com
diff --git a/customer/fbb-werbung/production.yaml b/customer/fbb-werbung/production.yaml
index 7883e48c..333f29da 100644
--- a/customer/fbb-werbung/production.yaml
+++ b/customer/fbb-werbung/production.yaml
@@ -5,8 +5,6 @@ site::profile::apache::htdigest:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEApd3XY8Y18JlpntryRoUPeVGb8dXR03sbpun8krG637yUVAfDlhdoh9GNyPEutCft2/xQRAf6nnm7nkLSwSicLomLv0goXAmB9r9+VZmYQEdj04DXKE/n33ipUlIXwWcX5hsfn/KqgJHfwL1+caNkSLIF3FHKwpEFB8AZ2/zPLkXCMWS6tj5d8clpJeuwhW5IfX2YWEzchK2ULXHz0zLkiqNOuh2FarA8hKnzXHB5UyIfc3IbSOFbsR6juzM33g3cSmgsGiXClMiuHkNrnxhlQZuPPcsfHzaXbn5GQvPRCRBHKti7E4dBUwU1ks8iFOFHTttSm6quVAsJxnQN56DFnjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBOQAgfiJWessbP5B1KX0HMgCAxqQwDwxo1Etm+Ncr82DGHQ653WuA3p0tGGId+gCBpOg==]
 
 # Postfix Config
-postfix::myorigin: 'pixelpark.com'
-postfix::relayhost: 'mx.pixelpark.net'
 site::profile::postfix::hashes:
   '/etc/postfix/virtual':
     ensure: present
@@ -22,7 +20,10 @@ site::profile::postfix::configs:
     value: 'hash:/etc/postfix/generic'
   recipient_delimiter:
     value: '+'
-  
+  relayhost:
+    value: 'mx.pixelpark.net'
+  myorigin:
+    value: 'pixelpark.com'
 site::profile::postfix::virtuals:
   'root':
     destination: 8x5@pixelpark.com
diff --git a/customer/fbb-werbung/test.yaml b/customer/fbb-werbung/test.yaml
index 07654f1f..26e7f9fe 100644
--- a/customer/fbb-werbung/test.yaml
+++ b/customer/fbb-werbung/test.yaml
@@ -13,8 +13,6 @@ sudo::configs:
       jenkins ALL=(tomcat) NOPASSWD: ALL
 
 # Postfix Config
-postfix::myorigin: 'pixelpark.com'
-postfix::relayhost: 'mx.pixelpark.net'
 site::profile::postfix::hashes:
   '/etc/postfix/virtual':
     ensure: present
@@ -29,6 +27,10 @@ site::profile::postfix::configs:
     value: 'hash:/etc/postfix/generic'
   recipient_delimiter:
     value: '+'
+  relayhost:
+    value: 'mx.pixelpark.net'
+  myorigin:
+    value: 'pixelpark.com'
 site::profile::postfix::virtuals:
   'root':
     destination: 8x5@pixelpark.com