summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chaos-at-home/ch-testvm-prometheus.yml1
-rw-r--r--inventory/host_vars/ch-testvm-prometheus.yml20
2 files changed, 3 insertions, 18 deletions
diff --git a/chaos-at-home/ch-testvm-prometheus.yml b/chaos-at-home/ch-testvm-prometheus.yml
index a63dcc71..10388bda 100644
--- a/chaos-at-home/ch-testvm-prometheus.yml
+++ b/chaos-at-home/ch-testvm-prometheus.yml
@@ -14,5 +14,4 @@
- role: x509/static-ca/base
- role: mail/opendkim
- role: mail/postfix/base
- - role: mail/postfix/relay
- role: mail/postfix/submission
diff --git a/inventory/host_vars/ch-testvm-prometheus.yml b/inventory/host_vars/ch-testvm-prometheus.yml
index 1c9bcfab..ce56456b 100644
--- a/inventory/host_vars/ch-testvm-prometheus.yml
+++ b/inventory/host_vars/ch-testvm-prometheus.yml
@@ -44,8 +44,8 @@ sshd_allowusers_host: "{{ normal_users_host | union(admin_users_host) | union(['
opendkim_admin_mail: postmaster@chaox.org
opendkim_internal_hosts:
- 127.0.0.1
- - "{{ network_zones.lan.prefix }}"
- - "{{ network_zones.svc.prefix }}"
+# - "{{ network_zones.lan.prefix }}"
+# - "{{ network_zones.svc.prefix }}"
opendkim_domains:
chaox.org:
@@ -58,13 +58,12 @@ postfix_base_mynetworks:
- "127.0.0.0/8"
- "[::ffff:127.0.0.0]/104"
- "[::1]/128"
- - "{{ network_zones.svc.prefix }}"
- - "{{ network_zones.lan.prefix }}"
postfix_base_mydestination:
- "$myhostname"
- "{{ host_name }}.{{ host_domain }}"
- "localhost"
+ - mx0.chaox.org
- mailrelay.chaox.org
postfix_base_inet_interfaces:
@@ -73,19 +72,6 @@ postfix_base_inet_interfaces:
postfix_base_relayhost: 192.168.28.250
-postfix_relay_sender_canonical_maps:
- rewrite_chaox_subdomains:
- type: regexp
- content: |
- /^(.+)@(.+)\.chaox\.org$/i ${1}%${2}@chaox.org
-
-postfix_relay_local_header_rewrite_clients:
- - "permit_inet_interfaces"
- - "permit_mynetworks"
-
-postfix_relay_dkim_signer: "opendkim"
-
-
postfix_submission_hostname: mailrelay.chaox.org
postfix_submission_tls: