From ef33da7e84b38c3866442d23c4e761b69066292f Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt Date: Tue, 31 Oct 2023 11:21:54 -0700 Subject: [PATCH] (cluster/*-ccs) change {ls,cp} smtp relay to exch-ls.lsst.org --- hieradata/cluster/auxtel-ccs.yaml | 4 ++-- hieradata/cluster/comcam-ccs.yaml | 4 ++-- hieradata/cluster/lsstcam-ccs.yaml | 4 ++-- hieradata/site/tu/cluster/auxtel-ccs.yaml | 3 +++ hieradata/site/tu/cluster/comcam-ccs.yaml | 3 +++ 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/hieradata/cluster/auxtel-ccs.yaml b/hieradata/cluster/auxtel-ccs.yaml index 46ff0f912f..ca63446c3c 100644 --- a/hieradata/cluster/auxtel-ccs.yaml +++ b/hieradata/cluster/auxtel-ccs.yaml @@ -4,7 +4,7 @@ postfix::inet_protocols: "ipv4" postfix::manage_root_alias: false postfix::inet_interfaces: "localhost" postfix::mydestination: "$myhostname, localhost.$mydomain, localhost" -postfix::relayhost: "[mail.lsst.org]:submission" +postfix::relayhost: "[exch-ls.lsst.org]:submission" postfix::mta: true postfix::configs: smtp_sasl_auth_enable: @@ -34,7 +34,7 @@ clustershell::groupmembers: all: {group: "all", member: "@misc,@hcu"} -ccs_monit::mailhost: "mail.lsst.org" +ccs_monit::mailhost: "exch-ls.lsst.org" ccs_monit::alert: - "auxtel-ccs-alerts-aaaadjkgtdl6pb2omvdi732xci@lsstc.slack.com" diff --git a/hieradata/cluster/comcam-ccs.yaml b/hieradata/cluster/comcam-ccs.yaml index c00b4dcb80..aed39c39db 100644 --- a/hieradata/cluster/comcam-ccs.yaml +++ b/hieradata/cluster/comcam-ccs.yaml @@ -7,7 +7,7 @@ postfix::manage_root_alias: false postfix::inet_protocols: "ipv4" postfix::inet_interfaces: "localhost" postfix::mydestination: "$myhostname, localhost.$mydomain, localhost" -postfix::relayhost: "[mail.lsst.org]:submission" +postfix::relayhost: "[exch-ls.lsst.org]:submission" postfix::mta: true postfix::configs: smtp_sasl_auth_enable: @@ -63,7 +63,7 @@ ccs_software::global_properties: ## comcam-alerts ccs_software::service_email: "x7z0x9c0t2k4r1n1@lsstc.slack.com" -ccs_monit::mailhost: "mail.lsst.org" +ccs_monit::mailhost: "exch-ls.lsst.org" ccs_monit::alert: ## comcam-alerts - "x7z0x9c0t2k4r1n1@lsstc.slack.com" diff --git a/hieradata/cluster/lsstcam-ccs.yaml b/hieradata/cluster/lsstcam-ccs.yaml index 9f9584b185..27c56287a7 100644 --- a/hieradata/cluster/lsstcam-ccs.yaml +++ b/hieradata/cluster/lsstcam-ccs.yaml @@ -3,7 +3,7 @@ postfix::manage_root_alias: false postfix::inet_protocols: "ipv4" postfix::inet_interfaces: "localhost" postfix::mydestination: "$myhostname, localhost.$mydomain, localhost" -postfix::relayhost: "[mail.lsst.org]:submission" +postfix::relayhost: "[exch-ls.lsst.org]:submission" postfix::mta: true postfix::configs: smtp_sasl_auth_enable: @@ -48,7 +48,7 @@ ccs_software::global_properties: ## lsstcam-alerts ccs_software::service_email: "lsstcam-alerts-aaaah4qfu4lhjnjpl4wmbjyx2y@lsstc.slack.com" -ccs_monit::mailhost: "mail.lsst.org" +ccs_monit::mailhost: "exch-ls.lsst.org" ccs_monit::alert: ## lsstcam-alerts - "lsstcam-alerts-aaaah4qfu4lhjnjpl4wmbjyx2y@lsstc.slack.com" diff --git a/hieradata/site/tu/cluster/auxtel-ccs.yaml b/hieradata/site/tu/cluster/auxtel-ccs.yaml index e147190628..8d23ba8650 100644 --- a/hieradata/site/tu/cluster/auxtel-ccs.yaml +++ b/hieradata/site/tu/cluster/auxtel-ccs.yaml @@ -10,3 +10,6 @@ ccs_monit::alert: clustershell::groupmembers: all: {group: "all", member: "auxtel-fp01,auxtel-mcm"} + +postfix::relayhost: "[mail.lsst.org]:submission" +ccs_monit::mailhost: "mail.lsst.org" diff --git a/hieradata/site/tu/cluster/comcam-ccs.yaml b/hieradata/site/tu/cluster/comcam-ccs.yaml index 07cc598925..ca820b4c06 100644 --- a/hieradata/site/tu/cluster/comcam-ccs.yaml +++ b/hieradata/site/tu/cluster/comcam-ccs.yaml @@ -13,3 +13,6 @@ clustershell::groupmembers: java_artisanal::set_alternatives: false java_artisanal::java17::set_alternatives: true + +postfix::relayhost: "[mail.lsst.org]:submission" +ccs_monit::mailhost: "mail.lsst.org"