From cc58bb88763f9c44eca517dcf27c13920b884270 Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Nov 07 2021 23:57:24 +0000
Subject: Merge branch 'bugfix/saltify-mx' into 'production'


Bugfix/saltify mx

See merge request infra/salt!514
---

diff --git a/salt/profile/mailserver/files/cron/dhprimes b/salt/profile/mailserver/files/cron/dhprimes
index 34b5cfa..233c187 100644
--- a/salt/profile/mailserver/files/cron/dhprimes
+++ b/salt/profile/mailserver/files/cron/dhprimes
@@ -1,4 +1,4 @@
-/etc/cron.d/dhprimes
+# /etc/cron.d/dhprimes
 SHELL=/bin/sh
 PATH=/usr/bin:/usr/sbin:/sbin:/bin:/usr/local/bin/
 MAILTO=admin-auto@opensuse.org
diff --git a/salt/profile/mailserver/files/cron/member_aliases b/salt/profile/mailserver/files/cron/member_aliases
index f6f2d48..cef388e 100644
--- a/salt/profile/mailserver/files/cron/member_aliases
+++ b/salt/profile/mailserver/files/cron/member_aliases
@@ -1,4 +1,4 @@
-# cat /etc/cron.d/member_aliases
+# /etc/cron.d/member_aliases
 SHELL=/bin/sh
 PATH=/usr/bin:/usr/sbin:/sbin:/bin:/usr/local/bin/
 MAILTO=admin-auto@opensuse.org
diff --git a/salt/profile/mailserver/init.sls b/salt/profile/mailserver/init.sls
index 1dc36cf..5459168 100644
--- a/salt/profile/mailserver/init.sls
+++ b/salt/profile/mailserver/init.sls
@@ -11,6 +11,17 @@
     - watch_in:
       - service: postfix
 
+{% for crt in [
+  'star_opensuse_org_ecdsa_letsencrypt.crt',
+  'star_opensuse_org_ecdsa_letsencrypt_key.pem',
+  'star_opensuse_org_rsa_letsencrypt.crt',
+  'star_opensuse_org_rsa_letsencrypt_key.pem',
+  'LetsEncryptCA_chain.crt'
+] %}
+/etc/postfix/{{crt}}:
+  file.exists
+{% endfor %}
+
 {% for file in [
   'handling_special_recipients',
   'no-internal-tls',
@@ -136,7 +147,7 @@ spampd-out:
 
 postsrsd:
   host.present:
-    - ip: 127.0.0.91
+    - ip: 127.0.0.1
 
 # MAYBE: remove override for clamd, seems to be standard now?
 {% for svc in ['clamd', 'spampd'] %}
@@ -171,7 +182,7 @@ service {{svc}}:
     - source: salt://profile/mailserver/files/cron/{{file}}
     - user: root
     - group: root
-    - mode: 0644
+    - mode: {{ '0755' if dir.endswith('/bin') else '0644' }}
     - replace: True
 {% endfor %}