CI/CD tweaks.

resources/config/common.toml

@@ -48,7 +48,7 @@ shared-map = {shard = 32, capacity = 10}
 [global.tracing]
 method = "log"
 path = "__PATH__/logs"
-prefix = "smtp.log"
+prefix = "stalwart.log"
 rotate = "daily"
 level = "info"
 

resources/config/smtp.toml

@@ -72,8 +72,7 @@ wait = "5s"
 relay = [ { if = "authenticated-as", ne = "", then = true }, 
           { else = false } ]
 max-recipients = 25
-directory = [ { if = "authenticated-as", ne = "", then = "__SMTP_DIRECTORY__" }, 
-         { else = false } ]
+directory = "__SMTP_DIRECTORY__"
 
 [session.rcpt.cache]
 entries = 1000

resources/systemd/stalwart-mail.service

@@ -1,7 +1,7 @@
 [Unit]
-Description=Stalwart SMTP
+Description=Stalwart __TITLE__ Server
 Conflicts=postfix.service sendmail.service exim4.service
-ConditionPathExists=/usr/local/stalwart-smtp/etc/config.toml
+ConditionPathExists=__PATH__/etc/config.toml
 After=network-online.target
  
 [Service]
@@ -11,11 +11,11 @@ KillMode=process
 KillSignal=SIGINT
 Restart=on-failure
 RestartSec=5
-ExecStart=/usr/local/stalwart-smtp/bin/stalwart-smtp --config=/usr/local/stalwart-smtp/etc/config.toml
+ExecStart=__PATH__/bin/stalwart-__NAME__ --config=__PATH__/etc/config.toml
 PermissionsStartOnly=true
 StandardOutput=syslog
 StandardError=syslog
-SyslogIdentifier=stalwart-smtp
+SyslogIdentifier=stalwart-__NAME__
  
 [Install]
 WantedBy=multi-user.target

resources/systemd/stalwart.mail.plist

@@ -4,13 +4,13 @@
 <plist version="1.0">
     <dict>
         <key>Label</key>
-        <string>stalwart.smtp</string>
+        <string>stalwart.__NAME__</string>
         <key>ServiceDescription</key>
-        <string>Stalwart SMTP Server</string>
+        <string>Stalwart __TITLE__ Server</string>
         <key>ProgramArguments</key>
         <array>
-            <string>/usr/local/stalwart-smtp/bin/stalwart-smtp</string>
-            <string>--config=/usr/local/stalwart-smtp/etc/config.toml</string>
+            <string>__PATH__/bin/stalwart-__NAME__</string>
+            <string>--config=__PATH__/etc/config.toml</string>
         </array>
         <key>RunAtLoad</key>
         <true/>