Updated install script

resources/docker/download.sh

@@ -1,13 +1,12 @@
 #!/usr/bin/env sh
 # shellcheck shell=dash
 
-# Stalwart Mail install script -- based on the rustup installation script.
+# Stalwart Mail Server install script -- based on the rustup installation script.
 
 set -e
 set -u
 
 readonly BASE_URL="https://github.com/stalwartlabs/mail-server/releases/latest/download"
-readonly BIN_DIR="/usr/local/bin"
 
 main() {
     downloader --check
@@ -35,37 +34,23 @@ main() {
         _account="_stalwart-mail"
     fi
 
-    # Start configuration mode
-    if [ "$#" -eq 1 ] && [ "$1" = "--download" ]  ; then
-        # Detect platform architecture
-        get_architecture || return 1
-        local _arch="$RETVAL"
-        assert_nz "$_arch" "arch"
+    # Default component setting
+    local _component="stalwart-mail"
+    local _dir="/usr/local/bin"
 
-        # Download binaries
-        say "⏳ Downloading Stalwart binary for ${_arch}..."
-        local _file="${BIN_DIR}/stalwart-install.tar.gz"
-        local _url="https://github.com/stalwartlabs/__R__/releases/latest/download/stalwart-__N__-${_arch}.tar.gz"
-        ensure downloader "$_url" "$_file" "$_arch"
-        ensure tar zxvf "$_file" -C "$BIN_DIR"
-        ignore rm "$_file"
+    # Detect platform architecture
+    get_architecture || return 1
+    local _arch="$RETVAL"
+    assert_nz "$_arch" "arch"
 
-        say "⏳ Downloading configure tool for ${_arch}..."
-        local _file="${BIN_DIR}/stalwart-install.tar.gz"
-        local _url="${BASE_URL}/stalwart-install-${_arch}.tar.gz"
-        ensure downloader "$_url" "$_file" "$_arch"
-        ensure tar zxvf "$_file" -C "$BIN_DIR"
-        ignore rm "$_file"
-
-        say "⏳ Downloading CLI tool for ${_arch}..."
-        local _file="${BIN_DIR}/stalwart-cli.tar.gz"
-        local _url="${BASE_URL}/stalwart-cli-${_arch}.tar.gz"
-        ensure downloader "$_url" "$_file" "$_arch"
-        ensure tar zxvf "$_file" -C "$BIN_DIR"
-        ignore rm "$_file"
-    else
-        ignore $BIN_DIR/stalwart-install -c __C__ -p /opt/stalwart-mail -d
-    fi
+    # Download latest binary
+    say "⏳ Downloading ${_component} for ${_arch}..."
+    local _file="${_dir}/stalwart-mail.tar.gz"
+    local _url="${BASE_URL}/${_component}-${_arch}.tar.gz"
+    ensure downloader "$_url" "$_file" "$_arch"
+    ensure tar zxvf "$_file" -C "$_dir"
+    ignore chmod +x "$_dir/stalwart-mail"
+    ignore rm "$_file"
 
     return 0
 }
@@ -343,7 +328,7 @@ get_endianness() {
 }
 
 say() {
-    printf 'stalwart-mail: %s\n' "$1"
+    printf '%s\n' "$1"
 }
 
 err() {

resources/docker/entrypoint.sh

@@ -1,10 +1,10 @@
 #!/usr/bin/env sh
 # shellcheck shell=dash
 
-# If the configuration file does not exist wait until it does.
-while [ ! -f /opt/stalwart-mail/etc/config.toml ] || grep -q "__CERT_PATH__" /opt/stalwart-mail/etc/common/tls.toml; do
-    sleep 1
-done
+# If the configuration file does not exist initialize it.
+if [ ! -f /opt/stalwart-mail/etc/config.toml ]; then
+    /usr/local/bin/stalwart-mail --init /opt/stalwart-mail
+fi
 
 # If the configuration file exists, start the server.
-exec /usr/local/bin/__B__ --config /opt/stalwart-mail/etc/config.toml
+exec /usr/local/bin/stalwart-mail --config /opt/stalwart-mail/etc/config.toml

resources/systemd/stalwart-mail.service

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

resources/systemd/stalwart.mail.plist

@@ -4,12 +4,12 @@
 <plist version="1.0">
     <dict>
         <key>Label</key>
-        <string>stalwart.__NAME__</string>
+        <string>stalwart.mail</string>
         <key>ServiceDescription</key>
-        <string>Stalwart __TITLE__ Server</string>
+        <string>Stalwart Mail Server</string>
         <key>ProgramArguments</key>
         <array>
-            <string>__PATH__/bin/stalwart-__NAME__</string>
+            <string>__PATH__/bin/stalwart-mail</string>
             <string>--config=__PATH__/etc/config.toml</string>
         </array>
         <key>RunAtLoad</key>