summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Löthberg <johannes@kyriasis.com>2019-01-02 21:03:54 +0100
committerJohannes Löthberg <johannes@kyriasis.com>2019-01-02 21:03:54 +0100
commit804f6bd76330f1e8ad29ff412a8f86b954ae4e20 (patch)
treed6df5620820f3e96273468fff4c541d44c29b0c5
parente0e448c91b057d17bde614c5c008c09ae70e215a (diff)
downloadfile-804f6bd76330f1e8ad29ff412a8f86b954ae4e20.tar.xz
certs/theos: Move smtpd over to copide certs
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
-rw-r--r--theos/certs/theos_kyriasis_com.sls24
1 files changed, 15 insertions, 9 deletions
diff --git a/theos/certs/theos_kyriasis_com.sls b/theos/certs/theos_kyriasis_com.sls
index 127caeb..a822ce0 100644
--- a/theos/certs/theos_kyriasis_com.sls
+++ b/theos/certs/theos_kyriasis_com.sls
@@ -13,15 +13,21 @@ theos.kyriasis.com:
- require_in:
- service: nginx_service
-smtpd-access-theos:
- acl.present:
- - name: /etc/letsencrypt/archive/theos.kyriasis.com/
- - acl_type: user
- - acl_name: smtpd
- - perms: r-x
- - recurse: True
- - require_in:
- - acme: theos.kyriasis.com
+
+/etc/smtpd/certs/fullchain.pem:
+ file.managed:
+ - source: /etc/letsencrypt/live/matrix.kyriasis.com/fullchain.pem
+ - user: smtpd
+ - group: smtpd
+ - mode: 600
+
+/etc/smtpd/certs/privkey.pem:
+ file.managed:
+ - source: /etc/letsencrypt/live/matrix.kyriasis.com/privkey.pem
+ - user: smtpd
+ - group: smtpd
+ - mode: 600
+
ldap-access-theos:
acl.present: