nginx: move config to own directory

chatmaild/src/chatmaild/dictproxy.py

@@ -50,7 +50,7 @@ def create_user(db, user, encrypted_password):
     with db.write_transaction() as conn:
         conn.create_user(user, encrypted_password)
     return dict(
-        home=f"/home/vmail/mail/nine.testrun.org/{user}",
+        home=f"/home/vmail/{user}",
         uid="vmail",
         gid="vmail",
         password=encrypted_password,
@@ -63,7 +63,6 @@ def get_user_data(db, user):
     if result:
         result["uid"] = "vmail"
         result["gid"] = "vmail"
-        result["home"] = f"/home/vmail/mail/nine.testrun.org/{user}"
     return result
 
 

deploy-chatmail/src/deploy_chatmail/__init__.py

@@ -202,7 +202,7 @@ def _configure_nginx(domain: str, debug: bool = False) -> bool:
     need_restart = False
 
     main_config = files.template(
-        src=importlib.resources.files(__package__).joinpath("nginx.conf.j2"),
+        src=importlib.resources.files(__package__).joinpath("nginx/nginx.conf.j2"),
         dest="/etc/nginx/nginx.conf",
         user="root",
         group="root",
@@ -212,7 +212,7 @@ def _configure_nginx(domain: str, debug: bool = False) -> bool:
     need_restart |= main_config.changed
 
     autoconfig = files.template(
-        src=importlib.resources.files(__package__).joinpath("autoconfig.xml.j2"),
+        src=importlib.resources.files(__package__).joinpath("nginx/autoconfig.xml.j2"),
         dest="/var/www/html/.well-known/autoconfig/mail/config-v1.1.xml",
         user="root",
         group="root",

deploy-chatmail/src/deploy_chatmail/dovecot/dovecot.conf.j2

@@ -142,18 +142,3 @@ ssl_key = </var/lib/acme/live/{{ config.hostname }}/privkey
 ssl_dh = </usr/share/dovecot/dh.pem
 ssl_min_protocol = TLSv1.2
 ssl_prefer_server_ciphers = yes
-
-service postlogin {
-  executable = script-login -d rawlog
-  unix_listener postlogin {
- }  
-} 
-service imap {
-  executable = imap postlogin 
-} 
-  
-protocol imap { 
-  #rawlog_dir = /tmp/rawlog/%u
-  # if you want to put files into user's homedir, use this, do not use ~
-  rawlog_dir = %h 
-}