Matrix should use server_name cert

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>

3 files changed, 14 insertions, 31 deletions

diff --git a/theos/certs/init.sls b/theos/certs/init.sls
index 211392c..af7542b 100644
--- a/theos/certs/init.sls
+++ b/theos/certs/init.sls
@@ -3,7 +3,6 @@ include:
   - .theos_kyriasis_com
   - .xan_kyriasis_com
   - .git_kyriasis_com
-  - .matrix_kyriasis_com
   - .riot_kyriasis_com
   - .taskd_kyriasis_com
   - .miniflux_kyriasis_com
diff --git a/theos/certs/kyriasis_com.sls b/theos/certs/kyriasis_com.sls
index 6ce0fe9..68bb7ab 100644
--- a/theos/certs/kyriasis_com.sls
+++ b/theos/certs/kyriasis_com.sls
@@ -13,4 +13,18 @@ kyriasis.com:
     - require_in:
       - service: nginx_service
 
+/etc/synapse/ssl/fullchain.pem:
+  file.managed:
+    - source: /etc/letsencrypt/live/kyriasis.com/fullchain.pem
+    - user: synapse
+    - group: synapse
+    - mode: 600
+
+/etc/synapse/ssl/privkey.pem:
+  file.managed:
+    - source: /etc/letsencrypt/live/kyriasis.com/privkey.pem
+    - user: synapse
+    - group: synapse
+    - mode: 600
+
 # vim: set ft=yaml et:
diff --git a/theos/certs/matrix_kyriasis_com.sls b/theos/certs/matrix_kyriasis_com.sls
deleted file mode 100644
index e908883..0000000
--- a/theos/certs/matrix_kyriasis_com.sls
+++ /dev/null
@@ -1,30 +0,0 @@
-include:
-  - nginx
-
-matrix.kyriasis.com:
-  acme.cert:
-    - email: johannes@kyriasis.com
-    - webroot: /srv/http/
-    - keysize: 4096
-    - renew: 30
-
-    - watch_in:
-      - service: nginx_service
-    - require_in:
-      - service: nginx_service
-
-/etc/synapse/ssl/fullchain.pem:
-  file.managed:
-    - source: /etc/letsencrypt/live/matrix.kyriasis.com/fullchain.pem
-    - user: synapse
-    - group: synapse
-    - mode: 600
-
-/etc/synapse/ssl/privkey.pem:
-  file.managed:
-    - source: /etc/letsencrypt/live/matrix.kyriasis.com/privkey.pem
-    - user: synapse
-    - group: synapse
-    - mode: 600
-
-# vim: set ft=yaml et: