From ff2cbeaab7817b789a1fa5d33811970767346f7a Mon Sep 17 00:00:00 2001 From: Philipp Dallig Date: Fri, 31 Mar 2017 15:20:26 +0200 Subject: [PATCH] fbb-werbung - rollout mailserver --- ...rbung-berlin-airport-de.pixelpark.net.yaml | 6 +++-- customer/fbb-werbung/production.yaml | 25 +++++++++++++++++++ ...rbung-berlin-airport-de.pixelpark.net.yaml | 1 + customer/fbb-werbung/test.yaml | 7 +++--- ...rbung-berlin-airport-de.pixelpark.net.yaml | 1 + 5 files changed, 35 insertions(+), 5 deletions(-) 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 4ed0d722..fcc90131 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 @@ -19,6 +19,9 @@ sudo::configs: jenkins ALL=(root) NOPASSWD: ALL 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 @@ -26,7 +29,6 @@ site::profile::postfix::hashes: ensure: present content: | root root+%{hostname} - site::profile::postfix::configs: virtual_alias_maps: value: 'pcre:/etc/postfix/virtual_pcre hash:/etc/postfix/virtual' @@ -36,7 +38,7 @@ site::profile::postfix::configs: value: '+' site::profile::postfix::virtuals: 'root': - destination: philipp.dallig@pixelpark.com + destination: 8x5@pixelpark.com 'httpd': destination: root site::profile::postfix::files: diff --git a/customer/fbb-werbung/production.yaml b/customer/fbb-werbung/production.yaml index d4891c96..7883e48c 100644 --- a/customer/fbb-werbung/production.yaml +++ b/customer/fbb-werbung/production.yaml @@ -3,3 +3,28 @@ site::profile::apache::htdigest: server: 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 + '/etc/postfix/generic': + ensure: present + content: | + root root+%{hostname} + +site::profile::postfix::configs: + virtual_alias_maps: + value: 'hash:/etc/postfix/virtual' + smtp_generic_maps: + value: 'hash:/etc/postfix/generic' + recipient_delimiter: + value: '+' + +site::profile::postfix::virtuals: + 'root': + destination: 8x5@pixelpark.com + 'httpd': + destination: root \ No newline at end of file diff --git a/customer/fbb-werbung/red-werbung-berlin-airport-de.pixelpark.net.yaml b/customer/fbb-werbung/red-werbung-berlin-airport-de.pixelpark.net.yaml index 873d3948..a5c6a4d6 100644 --- a/customer/fbb-werbung/red-werbung-berlin-airport-de.pixelpark.net.yaml +++ b/customer/fbb-werbung/red-werbung-berlin-airport-de.pixelpark.net.yaml @@ -4,6 +4,7 @@ site::additional_classes: - site::profile::pg_server - java - site::profile::apache + - site::profile::postfix site::profile::pg_server::pgpw: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAJQUEpJnnHdTpk4lRjoeaH3w/uBY34HFRQu3gD6Y/6EPjul+c+hDKQqR1cW6Wa2vewKqb4MYexpVyEEQBNgGIYVcfDGr81YxaiD+qLs0ctGxo0+NRiPDDYFW14z1IO31pYgfg47wMPXr3dXeKm13RKApVpitkR9YCVnSoDqGH1hp1eGWVZC0kUYDf4WVVRJCMe5jjqdNbKSRRRxeFOE2OZ3JpgJpvbxAMIlik80jiHrmskXgdYvzV+np5tj5fkF311v9U2C79eeyNFWHo4ojpcYhvUF3eRB9kdLhFLNWB6Nv/MLgdUtjFoOb21DZRrhwE8qMd6K1SDfWhFVufpcMLPjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAux+VBUel7fXZo/yf5tGb+gCBBWz4G2wIs00AuGK6YkQq6n9ARUZORV2/h9YWtBo5GJA==] diff --git a/customer/fbb-werbung/test.yaml b/customer/fbb-werbung/test.yaml index 8aa6e5fb..07654f1f 100644 --- a/customer/fbb-werbung/test.yaml +++ b/customer/fbb-werbung/test.yaml @@ -12,7 +12,9 @@ sudo::configs: jenkins ALL=(root) NOPASSWD: ALL 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 @@ -20,7 +22,6 @@ site::profile::postfix::hashes: ensure: present content: | root root+%{hostname} - site::profile::postfix::configs: virtual_alias_maps: value: 'pcre:/etc/postfix/virtual_pcre hash:/etc/postfix/virtual' @@ -30,7 +31,7 @@ site::profile::postfix::configs: value: '+' site::profile::postfix::virtuals: 'root': - destination: philipp.dallig@pixelpark.com + destination: 8x5@pixelpark.com 'httpd': destination: root site::profile::postfix::files: diff --git a/customer/fbb-werbung/werbung-berlin-airport-de.pixelpark.net.yaml b/customer/fbb-werbung/werbung-berlin-airport-de.pixelpark.net.yaml index b70a1032..577b64f5 100644 --- a/customer/fbb-werbung/werbung-berlin-airport-de.pixelpark.net.yaml +++ b/customer/fbb-werbung/werbung-berlin-airport-de.pixelpark.net.yaml @@ -4,6 +4,7 @@ site::additional_classes: - site::profile::pg_server - java - site::profile::apache + - site::profile::postfix site::profile::pg_server::pgpw: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAosbQqGuJj3xvFXbWBLlSA6uRKv/RVaCGmd4gT55yjhWZc0iMXBK3hdJWwhP9oZ3AZoEjQUr0I3PS6Amb85lDfR6xNeUnU3rfiGsI0FshNh2nHGru4WPXwD2p39R0thTpA+zyq+j93KeSc23ETEch+xeqD6BcUO+/JGXf/T1aIWlmyNJ1BDfok0N7uWM5+djLoWrFeqXkTc0o5zaTUtmD69U71nNxR99Xn0Ke+0RCC1ZUxq55nS3ycHd5LK8rXYK42ikuh7lIbGRYcO2rWWOQ934ybXDR+TKTv3l0Fggai1UfZ7kc6eqGRnljjZ/pf0SPs72n9qfGw4euri5VID42eDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDqcEY2c3OwWKyWS3VHEFpggCAzYWP1Kjkp1eLGPDuxOFqJXSzvoYJwAYJy2ofXWLUV/Q==] -- 2.39.5