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 fcc90131d633d5e709d01980d48ea43370d11f50..0a03bf54de538a3f13c3d2a1d40d40e042972d06 100644 (file)
--- 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 7883e48c72f52d9d5ea7396b5b0ff4f80217da4f..333f29da6fc408427540c8073a88b522b358202c 100644 (file)
--- 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 07654f1f86148fc0c538ae31ec93532e291fef76..26e7f9fe0f166c09a76f537295f2444ba91e49ed 100644 (file)
--- 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