mmv

commit e642e3a55b19903a116bf68af13ddf6ba94f76c1
parent c0ccb2c9dd08b9159b32c3fe28c52864e9f056dd
Author: Petar Yotsev <petar@yotsev.xyz>
Date:   Tue, 14 Dec 2021 13:43:55 +0000

Cleanup

Diffstat:
M
files/acme-client.conf
 | 
2
+-
M
files/httpd.conf
 | 
5
+++++
M
files/local.conf
 | 
26
+++++++++++++-------------

3 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/files/acme-client.conf b/files/acme-client.conf
@@ -1,4 +1,3 @@
-
 authority letsencrypt {
         api url "https://acme-v02.api.letsencrypt.org/directory"
         account key "/etc/acme/letsencrypt-privkey.pem"
@@ -9,3 +8,4 @@ domain <maildom> {
 	domain full chain certificate "/etc/ssl/<maildom>.crt"
 	sign with letsencrypt
 }
+
diff --git a/files/httpd.conf b/files/httpd.conf
@@ -1,6 +1,11 @@
 
 server "<maildom>" {
         listen on * port 80
+        listen on * tls port 443
+        tls {
+                certificate "/etc/ssl/<maildom>.crt"
+                key "/etc/ssl/private/<maildom>.key"
+        }
         location "/.well-known/acme-challenge/*" {
                 root "/acme"
                 request strip 2
diff --git a/files/local.conf b/files/local.conf
@@ -50,24 +50,24 @@ namespace inbox {
   subscriptions = yes
 
   mailbox Archive {
-  auto = subscribe
-  special_use = \Archive
+    auto = subscribe
+    special_use = \Archive
   }
   mailbox Drafts {
-  auto = subscribe
-  special_use = \Drafts
+    auto = subscribe
+    special_use = \Drafts
   }
   mailbox Junk {
-  auto = subscribe
-  special_use = \Junk
+    auto = subscribe
+    special_use = \Junk
   }
   mailbox Sent {
-  auto = subscribe
-  special_use = \Sent
+    auto = subscribe
+    special_use = \Sent
   }
   mailbox Trash {
-  auto = subscribe
-  special_use = \Trash
+    auto = subscribe
+    special_use = \Trash
   }
 }
 
@@ -81,7 +81,7 @@ protocols = imap
 
 service imap-login {
   inet_listener imap {
-  port = 0
+    port = 0
   }
 }
 
@@ -109,10 +109,10 @@ plugin {
 
 service managesieve-login {
   inet_listener sieve {
-  port = 4190
+    port = 4190
   }
   inet_listener sieve_deprecated {
-  port = 2000
+    port = 2000
   }
 }