From 4ba65d667605253d7f5d85f31b32957dfbc5592f Mon Sep 17 00:00:00 2001 From: mdecimus Date: Fri, 12 Apr 2024 15:08:51 +0200 Subject: [PATCH] Updated webadmin location + Doc fixes --- .github/ISSUE_TEMPLATE/bug_report.yml | 1 + UPGRADING.md | 4 ++-- crates/common/src/manager/mod.rs | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index c8a18730..bc5101a8 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -31,6 +31,7 @@ body: label: Version description: What version of our software are you running? options: + - v0.7.x - v0.6.x - v0.5.x - v0.4.x diff --git a/UPGRADING.md b/UPGRADING.md index 2c28b8ee..954f8f59 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -6,7 +6,7 @@ Due to these extensive changes, the recommended approach for upgrading is to per ## Pre-Upgrade Steps - Download the `v0.7.0` mail-server and CLI binaries for your platform from the [releases page](https://github.com/stalwartlabs/mail-server/releases/latest/). -- Initialize the setup on a distinct directory using the command `sudo ./stalwart-mail -- init /path/to/new-install`. This command will print the administrator password required to access the web-admin. +- Initialize the setup on a distinct directory using the command `sudo ./stalwart-mail --init /path/to/new-install`. This command will print the administrator password required to access the web-admin. - Create the `bin` directory using `mkdir /path/to/new-install/bin`. - Move the downloaded binaries to the `bin` directory using the command `mv stalwart-mail stalwart-cli /path/to/new-install/bin`. - Open `/path/to/new-install/etc/config.toml` in a text editor and comment out all listeners except the HTTP listener for port `8080`. @@ -25,7 +25,7 @@ Due to these extensive changes, the recommended approach for upgrading is to per - Stop the `v0.6.0` installation using the command `sudo systemctl stop stalwart-mail`. - Move the old `v0.6.0` installation to a backup directory, for example `mv /opt/stalwart-mail /opt/stalwart-mail-backup`. - Move the new `v0.7.0` installation to the old installation directory, for example `mv /path/to/new-install /opt/stalwart-mail`. -- Set the right permissions for the new installation using the command `sudo chown -R stalwart:stalwart /opt/stalwart-mail`. +- Set the right permissions for the new installation using the command `sudo chown -R stalwart-mail:stalwart-mail /opt/stalwart-mail`. - Start the new installation using the command `sudo systemctl start stalwart-mail`. - Import the accounts using the new CLI tool with the command `./stalwart-cli -u http://yourserver.org:8080 -c import account ~/exports/`. - Using the admin tool, reactivate all the necessary listener (SMTP, IMAP, etc.) diff --git a/crates/common/src/manager/mod.rs b/crates/common/src/manager/mod.rs index 466b6ad6..dc7f53e5 100644 --- a/crates/common/src/manager/mod.rs +++ b/crates/common/src/manager/mod.rs @@ -31,7 +31,8 @@ pub mod reload; pub mod webadmin; pub const SPAMFILTER_URL: &str = "https://get.stalw.art/resources/config/spamfilter.toml"; -pub const WEBADMIN_URL: &str = "https://get.stalw.art/resources/webadmin.zip"; +pub const WEBADMIN_URL: &str = + "https://github.com/stalwartlabs/webadmin/releases/latest/download/webadmin.zip"; pub const WEBADMIN_KEY: &[u8] = "STALWART_WEBADMIN".as_bytes(); async fn download_resource(url: &str) -> Result, String> {