From 799e54cd36c820bb846537d3340851c9757e7dd3 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Tue, 11 Jul 2017 14:43:29 +0200 Subject: [PATCH] Enabling special Postfix transport map in all FBB test and production environments --- customer/fbb-db/production.yaml | 2 ++ customer/fbb-db/test.yaml | 2 ++ customer/fbb-ws/production.yaml | 1 + customer/fbb-ws/test.yaml | 2 ++ customer/fbb-ws/tst-ws01-fbb.pixelpark.net.yaml | 2 -- customer/fbb-www/production.yaml | 2 ++ customer/fbb-www/test.yaml | 2 ++ 7 files changed, 11 insertions(+), 2 deletions(-) diff --git a/customer/fbb-db/production.yaml b/customer/fbb-db/production.yaml index 5b0c7a38..49eb1d7f 100644 --- a/customer/fbb-db/production.yaml +++ b/customer/fbb-db/production.yaml @@ -26,6 +26,8 @@ accounts::users: apply: true sudo: false +infra::profile::postfix::transport_maps_source: 'maps/transport-fbb' + galera::repo::yum_mariadb_baseurl: "http://repo.pixelpark.com/Linux/yum/mariadb/10.2/centos/%{operatingsystemmajrelease}/%{architecture}/" galera::vendor_version: '10.2' diff --git a/customer/fbb-db/test.yaml b/customer/fbb-db/test.yaml index 2210797a..d8927c17 100644 --- a/customer/fbb-db/test.yaml +++ b/customer/fbb-db/test.yaml @@ -27,6 +27,8 @@ accounts::users: apply: true sudo: false +infra::profile::postfix::transport_maps_source: 'maps/transport-fbb' + galera::repo::yum_mariadb_baseurl: "http://repo.pixelpark.com/Linux/yum/mariadb/10.2/centos/%{operatingsystemmajrelease}/%{architecture}/" galera::vendor_version: '10.2' diff --git a/customer/fbb-ws/production.yaml b/customer/fbb-ws/production.yaml index de15d98d..970de358 100644 --- a/customer/fbb-ws/production.yaml +++ b/customer/fbb-ws/production.yaml @@ -55,6 +55,7 @@ infra::profile::cron::cronjobs: - 'PATH="/usr/bin:/bin"' description: 'CDM-Webservice-Push' +infra::profile::postfix::transport_maps_source: 'maps/transport-fbb' repo::remi_php71: true diff --git a/customer/fbb-ws/test.yaml b/customer/fbb-ws/test.yaml index e9e4fd65..57fa9c88 100644 --- a/customer/fbb-ws/test.yaml +++ b/customer/fbb-ws/test.yaml @@ -80,6 +80,8 @@ infra::profile::cron::cronjobs: - 'PATH="/usr/bin:/bin"' description: 'CDM-Webservice-Push' +infra::profile::postfix::transport_maps_source: 'maps/transport-fbb' + repo::remi_php71: true php::fpm::pools: diff --git a/customer/fbb-ws/tst-ws01-fbb.pixelpark.net.yaml b/customer/fbb-ws/tst-ws01-fbb.pixelpark.net.yaml index 30650313..cc1c6517 100644 --- a/customer/fbb-ws/tst-ws01-fbb.pixelpark.net.yaml +++ b/customer/fbb-ws/tst-ws01-fbb.pixelpark.net.yaml @@ -1,7 +1,5 @@ --- -infra::profile::postfix::transport_maps_source: 'maps/transport-fbb' - infra::profile::cron::cronjobs: vbb-import: minute: '0-59/2' diff --git a/customer/fbb-www/production.yaml b/customer/fbb-www/production.yaml index 10268eca..fd3a1085 100644 --- a/customer/fbb-www/production.yaml +++ b/customer/fbb-www/production.yaml @@ -110,6 +110,8 @@ sudo::configs: florian.dorrer ALL=(web) NOPASSWD: ALL felix.maier ALL=(web) NOPASSWD: ALL +infra::profile::postfix::transport_maps_source: 'maps/transport-fbb' + repo::remi_php71: true php::fpm::pools: diff --git a/customer/fbb-www/test.yaml b/customer/fbb-www/test.yaml index cba1b455..867db87d 100644 --- a/customer/fbb-www/test.yaml +++ b/customer/fbb-www/test.yaml @@ -181,6 +181,8 @@ infra::profile::cron::cronjobs: # Other scripts for cron # /opt/app/web/dialogforumRSS/import.sh +infra::profile::postfix::transport_maps_source: 'maps/transport-fbb' + repo::remi_php71: true php::fpm::pools: -- 2.39.5