Merge staging in main (hestiacp#2237)

* Slightly improve error messages api
* Add support for ARM on APT
* Update changelog + version package 
+ Adjust copyright year to 2021
* Update last copyright package
* Add check if /etc/hestiacp/hestia.conf exists
* Fix bug in rebuild web domains
* Fix issue with restart webserver during rebuild
* Improve v-add-lets-encrypt-domain
* Small change in changelog
* Fix bug in v-add-letsencrypt-host
* Manage sieve disabled on default
* Remove sieve reference from default config
Prevent webmail from working propperly
* Add support for cross compile hestia pacakge
* When backend port is missing use $ORIGINAL_PORT instead of $PORT
* Add BACKEND_PORT to hestia.conf
* Update translations
* Add error message when attempting cross compile non hestia package
hestia-nginx and hestia-php doesn't support compiling on amd64 machine for arm64
* Update Changelog
* Update changelog + readme
Adjust version to 1.5.0
* Update version hestia-nginx + hestia-php
* Fix bug in update script where ~rc was not removed 
Adjusted sed command to also match everything behind ~

Author: jaapmarcus

CHANGELOG.md

@@ -1,20 +1,27 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## [DEVELOPMENT] - Development version
+## [1.5.0] - Major Release (Feature / Quality Update)
 
-## Features
+### Breaking changes ###
+- **NOTE:** Changes have been made on how phpmyadmin/phppgadmin config are included in apache2 config. To restore to the old behaviour add `IncludeOptional conf.d/*.inc` below `IncludeOptional conf.d/*.conf` in /etc/apache2/apache2.conf and restart your server. 
+- **NOTE:** Hestia packages for arm64 has been added to atp.hestiacp.com please use the normal install instructions instead! For current ARM installs to enable auto update remove the `#` in /etc/apt/sources.list.d/hestia.list `# deb https://apt.hestiacp.com/ focal main` becomes `deb https://apt.hestiacp.com/ focal main` and then run `apt update && apt upgrade -y` 
+
+### Features
 
-- Add support for Dovecote Sieve #2163 (@2163)
+- Add support for Dovecote Sieve #2163 (@gejobj)
 - Improve HELO based system and use RDNS lookup instead our old system
+- Add support for PHP 8.1 #2233 
 - Set default php version for new installs to PHP 8.0 
+- Add support for ARM64 Processors
+- Disable access phpmyadmin/phppgadmin over ip address in Apache2 #2072
 
 ### Bugfixes
 
-- Disable /reset/ endpoint when POLICY_SYSTEM_PASSWORD_RESET = no
-- Add rate limit forgot password
+- Disable /reset/ endpoint when POLICY_SYSTEM_PASSWORD_RESET = no #2167
+- Add rate limit forgot password #2199
 - Prevent SOA count up after v-change-dns-records with no changes are made
-- Fix #1296 Logrotate does not rotate logs any more on Ubuntu 20.04 and Debian 11
+- Fix #1296 Log rotate does not rotate logs any more on Ubuntu 20.04 and Debian 11
 - Run shellcheck to improve code quality 
 - Improve ssh port detection for filemanager. Allowing users to create /etc/ssh/sshd.conf.d/custom.conf with custom port
 - Fix an bug in v-add-letsencrypt-host due to changes of Lets Encrypt causing issues with rate limiting
@@ -25,16 +32,19 @@ All notable changes to this project will be documented in this file.
 - Update permissions /var/log/roundcube on older installations #2173
 - Update translations
 - Fix Roundcube permissions
-- Add webp to list of media formats that can be cached by the browser 
+- Add .webp to list of media formats that can be cached by the browser 
 - Disable  /list/log/auth when in Demo mode
 - Fix #1139 By force rebuilding webmail config files
+- Fix a bug in rebuild mysql database @depca
+- Fix #1239 Bug in basic auth not working properly
+- Add validation for email address before install server for admin account
+- Fix bug in v-change-domain-owner #2210
+- Improve input validation Add / Edit User package and improve reading config files to prevent security issues.
+
 
 ### Dependencies
 
 - Update Roundcube to 1.5.0 https://roundcube.net/news/2021/10/18/roundcube-1.5.0-released
-
-### Security 
-
 - Update jQuery UI to the last version [CVE-2021-41182](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-41182)
 
 ## [1.4.17] - Service release 

README.md

@@ -2,15 +2,18 @@
 
 [Hestia Control Panel](https://www.hestiacp.com/)
 ==================================================
-**Latest stable release:** Version 1.4.17 | [View Changelog](https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md) | [![Build Status](https://drone.hestiacp.com/api/badges/hestiacp/hestiacp/status.svg?ref=refs/heads/main)](https://drone.hestiacp.com/hestiacp/hestiacp) <br>
+**Latest stable release:** Version 1.5.0 | [View Changelog](https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md) | [![Build Status](https://drone.hestiacp.com/api/badges/hestiacp/hestiacp/status.svg?ref=refs/heads/main)](https://drone.hestiacp.com/hestiacp/hestiacp) <br>
 
 **Web:** [www.hestiacp.com](https://www.hestiacp.com/)<br>
 **Documentation:** [docs.hestiacp.com](https://docs.hestiacp.com/)<br>
 **Forums:** [forum.hestiacp.com](https://forum.hestiacp.com/)<br>
 **Discord:** [Join the discussion](https://discord.gg/nXRUZch)<br />
-<br><br>
-[![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ST87LQH2CHGLA)
 <br>
+[![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ST87LQH2CHGLA)<br /><br />
+Bitcoin : bc1q48jt5wg5jaj8g9zy7c3j03cv57j2m2u5anlutu<br>
+Ethereum : 0xfF3Dd2c889bd0Ff73d8085B84A314FC7c88e5D51<br>
+Binance: bnb1l4ywvw5ejfmsgjdcx8jn5lxj7zsun8ktfu7rh8<br>
+Smart Chain: 0xfF3Dd2c889bd0Ff73d8085B84A314FC7c88e5D51<br>
 
 **Welcome!**
 ---------------------------- 
@@ -21,20 +24,30 @@ Features and Services
 * Apache2 and NGINX with PHP-FPM
 * Multiple PHP versions (5.6 - 8.1, 8.0 as default)
 * DNS Server (Bind) with clustering capabilities
-* POP/IMAP/SMTP mail services with Anti-Virus, Anti-Spam, and Webmail (ClamAV, SpamAssassin, Roundcube, Rainloop)
+* POP/IMAP/SMTP mail services with Anti-Virus, Anti-Spam, and Webmail (ClamAV, SpamAssassin, Sieve, Roundcube, Rainloop)
 * MariaDB and/or PostgreSQL databases
 * Let's Encrypt SSL support with wildcard certificates
 * Firewall with brute-force attack detection and IP lists (iptables, fail2ban, and ipset).
 
 Supported platforms and operating systems
+========================================================
+
+AMD (x86_64 Intel/AMD)
 ----------------------------
-* **CPU Architecture:** AMD64 (x86_64 Intel/AMD)
 * **Debian:** 11, 10 or 9
 * **Ubuntu:** 20.04 LTS or 18.04 LTS
-* **NOTE:** Hestia Control Panel must be installed on top of a fresh operating system installation to ensure proper functionality.
+
+ARM64 (arm64)
+----------------------------
+* **Debian:** 11, 10
+* **Ubuntu:** 20.04 LTS
+* **NOTE:** ARM 64 bit processors only! ARM 32bit (armhf) is currently not supported!
 
 Installing Hestia Control Panel
 ============================
+
+* **NOTE:** Hestia Control Panel must be installed on top of a fresh operating system installation to ensure proper functionality.
+
 While we have taken every effort to make the installation process and the control panel interface as friendly as possible (even for new users), it is assumed that you will have some prior knowledge and understanding in the basics how to set up a Linux server before continuing.
 
 ## Step 1: Log in

bin/v-add-letsencrypt-domain

@@ -505,14 +505,19 @@ fi
 if [ -z "$mail" ]; then
     ssl_home=$(search_objects 'web' 'LETSENCRYPT' 'yes' 'SSL_HOME')
     ssl_enabled="$(get_object_value 'web' 'DOMAIN' "$domain" '$SSL')"
-    ssl_force="$(get_object_value 'web' 'DOMAIN' "$domain" '$SSL_FORCE')"
-    [[ "$ssl_enabled" = "yes" ]] && $BIN/v-delete-web-domain-ssl $user $domain > /dev/null 2>&1
-    $BIN/v-add-web-domain-ssl "$user" "$domain" "$ssl_dir" "$ssl_home" updatessl
-    [[ "$ssl_force" = "yes" ]] && $BIN/v-add-web-domain-ssl-force "$user" "$domain" > /dev/null 2>&1
-else
+    if [ "$ssl_enabled" = "yes" ]; then 
+        $BIN/v-update-web-domain-ssl "$user" "$domain" "$ssl_dir" "$ssl_home" "updatessl" 
+    else
+        $BIN/v-add-web-domain-ssl "$user" "$domain" "$ssl_dir" "$ssl_home" "updatessl" 
+    fi
+ else
+ # TODO replace with v-update-mail-domain-ssl if ssl is enabled
     ssl_enabled="$(get_object_value 'mail' 'DOMAIN' "$root_domain" '$SSL')"
-    [[ "$ssl_enabled" = "yes" ]] && $BIN/v-delete-mail-domain-ssl "$user" "$root_domain" > /dev/null 2>&1
-    $BIN/v-add-mail-domain-ssl "$user" "$root_domain" "$ssl_dir" updatessl
+    if [ "$ssl_enabled" = "yes" ]; then 
+        $BIN/v-update-mail-domain-ssl "$user" "$root_domain" "$ssl_dir" "$ssl_home" "updatessl" 
+    else
+        $BIN/v-add-mail-domain-ssl "$user" "$root_domain" "$ssl_dir" "$ssl_home" "updatessl" 
+    fi
 fi
 
 if [ "$?" -ne '0' ]; then

bin/v-add-web-domain-ssl-force

@@ -1,6 +1,6 @@
 #!/bin/bash
 # info: Adding force SSL for a domain
-# options: USER DOMAIN
+# options: USER DOMAIN [RESTART] [QUIET]
 # labels: hestia web
 #
 # example: v-add-web-domain-ssl-force admin acme.com
@@ -15,8 +15,9 @@
 # Argument definition
 user=$1
 domain=$2
-quiet=$3
-restart="$4"
+restart="$3"
+quiet="$4"
+
 
 # Includes
 # shellcheck source=/etc/hestiacp/hestia.conf

bin/v-add-web-domain-ssl-hsts

@@ -1,6 +1,6 @@
 #!/bin/bash
 # info: Adding hsts to a domain
-# options: USER DOMAIN
+# options: USER DOMAIN [RESTART] [QUIET]
 # labels: hestia
 #
 # The function enables HSTS for the requested domain.
@@ -13,8 +13,8 @@
 # Argument definition
 user=$1
 domain=$2
-quiet=$3
-restart="$4"
+restart="$3"
+quiet="$4"
 
 # Includes
 # shellcheck source=/etc/hestiacp/hestia.conf

bin/v-delete-mail-domain-ssl

@@ -14,6 +14,7 @@
 # Argument definition
 user=$1
 domain=$2
+restart=$3
 
 # Includes
 # shellcheck source=/etc/hestiacp/hestia.conf

bin/v-delete-web-domain-ssl

@@ -65,10 +65,8 @@ if [ -n "$PROXY_SYSTEM" ] && [ -n "$PROXY" ]; then
 fi
 
 # Deleting old certificate
-tmpdir=$(mktemp -p $HOMEDIR/$user/web/$domain/private -d)
 rm -f $HOMEDIR/$user/conf/web/$domain/ssl/$domain.*
-mv $USER_DATA/ssl/$domain.* $tmpdir
-chown -R $user:$user $tmpdir
+rm -f $USER_DATA/ssl/$domain.*
 
 # Deleting force ssl
 $BIN/v-delete-web-domain-ssl-force "$user" "$domain" 'no' 'yes'

bin/v-delete-web-domain-ssl-force

@@ -1,6 +1,6 @@
 #!/bin/bash
 # info: remove ssl force from domain
-# options: USER DOMAIN [RESTART]
+# options: USER DOMAIN [RESTART] [QUIET]
 # labels: hestia web
 #
 # example: v-delete-web-domain-ssl-force admin domain.tld
@@ -15,8 +15,8 @@
 # Argument definition
 user=$1
 domain=$2
-restart=$3
-quiet=$4
+restart="$3"
+quiet="$4"
 
 # Includes
 # shellcheck source=/etc/hestiacp/hestia.conf

bin/v-delete-web-domain-ssl-hsts

@@ -1,6 +1,6 @@
 #!/bin/bash
 # info: remove ssl force from domain
-# options: USER DOMAIN [RESTART]
+# options: USER DOMAIN [RESTART] [QUIET]
 # labels: hestia
 #
 # example: v-delete-web-domain-ssl-hsts user domain.tld

bin/v-rebuild-web-domains

@@ -112,7 +112,7 @@ fi
 for domain in $($BIN/v-list-web-domains $user plain |cut -f 1); do
     if [ -n "$WEB_BACKEND" ]; then
         template=$(get_object_value 'web' 'DOMAIN' "$domain" '$BACKEND');
-        if [ -n "$template" ]; then 
+        if [ -z "$template" ]; then 
             template="default"
             update_object_value 'web' 'DOMAIN' "$domain" '$BACKEND' 'default'  
         fi