copr: use smtp-auth-relay for all hosts

2026-03-20 03:57:02 +08:00 · 2023-06-19 11:07:53 +02:00
parent bee7b64fe5
commit 21be6fd294
11 changed files with 6 additions and 19 deletions
--- a/inventory/group_vars/copr_all_instances_aws
+++ b/inventory/group_vars/copr_all_instances_aws
@@ -1,7 +1,9 @@
 # Put here configuration for all copr instances (production, devel, ...)
 ---

-# TODO: tamplatize main.cf
+postfix_group: copr
+postfix_maincf: postfix/main.cf/main.cf.copr_smtp_auth_relay
+#TODO: tamplatize main.cf
 smtp_auth_relay_host: smtp-auth-cc-rdu01.fedoraproject.org
 smtp_auth_relay_user: copr@fedoraproject.org
 smtp_auth_relay_password: "{{ copr_smtp_password }}"
--- a/inventory/group_vars/copr_aws
+++ b/inventory/group_vars/copr_aws
@@ -67,7 +67,6 @@ devel: false
 dist_git_base_url: "copr-dist-git.fedorainfracloud.org"
 frontend_base_url: "https://copr.fedorainfracloud.org"
 keygen_host: "54.83.48.73"
-postfix_group: copr
 rpm_vendor_copr_name: Fedora Copr
 services_disabled: false
 root_auth_users: msuchy frostyx praiskup nikromen
--- a/inventory/group_vars/copr_back_dev_aws
+++ b/inventory/group_vars/copr_back_dev_aws
@@ -56,6 +56,3 @@ copr_backend_data_raid10_volumes:
  - nvme-Amazon_Elastic_Block_Store_vol01d7d16e5e447b3c4-part1
  - nvme-Amazon_Elastic_Block_Store_vol0860700f1b82314b5-part1
  - nvme-Amazon_Elastic_Block_Store_vol0ea433a88aef9c644-part1
-
-postfix_group: copr
-postfix_maincf: postfix/main.cf/main.cf.copr_smtp_auth_relay
--- a/inventory/group_vars/copr_dist_git_dev_aws
+++ b/inventory/group_vars/copr_dist_git_dev_aws
@@ -18,6 +18,3 @@ tcp_ports: [22, 80, 443,
 services_disabled: false

 aws_ipv6_addr: "2600:1f18:8ee:ae00:691b:4103:dbcd:a64a/128"
-
-postfix_group: copr
-postfix_maincf: postfix/main.cf/main.cf.copr_smtp_auth_relay
--- a/inventory/group_vars/copr_front_dev_aws
+++ b/inventory/group_vars/copr_front_dev_aws
@@ -36,5 +36,3 @@ tcp_ports: [22, 80, 443,
 services_disabled: false

 aws_ipv6_addr: "2600:1f18:8ee:ae00:66a:fd15:3f16:4092/128"
-
-postfix_group: copr
--- a/inventory/group_vars/copr_keygen_dev_aws
+++ b/inventory/group_vars/copr_keygen_dev_aws
@@ -15,6 +15,3 @@ tcp_ports: [22,
 services_disabled: false

 aws_ipv6_addr: "2600:1f18:8ee:ae00:3cbb:7920:d83:e607/128"
-
-postfix_group: copr
-postfix_maincf: postfix/main.cf/main.cf.copr_smtp_auth_relay
--- a/inventory/group_vars/copr_pulp_dev_aws
+++ b/inventory/group_vars/copr_pulp_dev_aws
@@ -1,6 +1,3 @@
 ---
 services_disabled: false
 aws_ipv6_addr: "2600:1f18:8ee:ae00:c4b7:de1a:4d13:e5a4"
-
-postfix_group: copr
-postfix_maincf: postfix/main.cf/main.cf.copr_smtp_auth_relay
--- a/playbooks/groups/copr-backend.yml
+++ b/playbooks/groups/copr-backend.yml
@@ -57,7 +57,6 @@
  # Roles are run first, before tasks, regardless of where you place them here.
  roles:
  - base
-  - smtp-auth-relay
  - nagios_client
  - copr/copr-devel-server
  - copr/backend
--- a/playbooks/groups/copr-dist-git.yml
+++ b/playbooks/groups/copr-dist-git.yml
@@ -51,7 +51,6 @@

  roles:
  - base
-  - smtp-auth-relay
  - nagios_client
  - copr/copr-devel-server
  - copr/dist_git
--- a/playbooks/groups/copr-keygen.yml
+++ b/playbooks/groups/copr-keygen.yml
@@ -54,7 +54,6 @@

  roles:
  - base
-  - smtp-auth-relay
  - nagios_client
  - copr/copr-devel-server
  - copr/keygen
--- a/roles/copr/base/meta/main.yml
+++ b/roles/copr/base/meta/main.yml
@@ -0,0 +1,3 @@
+---
+dependencies:
+  - role: smtp-auth-relay