Merge pull request hestiacp#2 from hestiacp/master

Sync with official master

Author: ifaist0s

CHANGELOG.md

@@ -11,12 +11,12 @@ All notable changes to this project will be documented in this file.
 - Refactored MultiPHP functionality. MultiPHP will be enabled by default on new installations.
 - Allowed admin user to add or remove PHP versions from webui (edit/server->"Web Server" page).
 - Extended v-extract-fs-archive to allow archive testing and extracting only specific paths (for tar)
-- Added file manager (Tiny File Manager).
 - Allow renaming of existing packages from console (v-rename-package).
 - Webmail IP address is now inherited from web domain when using multiple IPs.
 - Exim now uses the web domain IP if it exists.
 - Public IP is now used when updating webmail DNS record.
 - Added PHP 7.4 to MultiPHP.
+- Add Support for Debian 10 (Buster).
 
 ### Bugfixes
 - Added a detection of web root for add .well-known ACME challenge.
@@ -61,6 +61,14 @@ All notable changes to this project will be documented in this file.
 - Re-Enable force ssl function on let's encrypt certification renew.
 - Added official postgresql repository to be up to date.
 - Hardening MySQL configuration, prevent local infile.
+- Fixed lograte bug and cleans up the messed up nginx/apache2 log permissions.
+- Fixed IfModule mpm_itk.c for apache2 templates.
+- Added mpm_itk for Deb10 single php installation only.
+- Hardening nginx configuration, drop TLSv1.1 support.
+- Fixed excluding folders named "logs" from restore backup, thanks to @davidgolsen.
+- Fixed typo in delete psql database part, thanks to @joshbmarshall.
+- Split long txt records to 255 chunks to prevent bind issues, thanks to @setiseta.
+- Fixed missing restart routine for vsftp on v-add-letsencrypt-host.
 
 ## [1.0.6] - 2019-09-24 - Hotfix
 ### Bugfixes

ISSUE_TEMPLATE.md

@@ -1,18 +1,23 @@
-### The content below is simply a template. Please delete any unnecessary sections from your issue reports.
+### The content below is simply a template. 
+
+**To better assist in troubleshooting and aid with our debugging processes, we ask that you please delete any unnecessary sections below when filling out your issue report.**
+
+**Important: Please DO NOT include any personal or sensitive information in your issue reports, including usernames, passwords, or email addresses.**
 
 ### In a few words, please describe the issue that you're experiencing:
-Please enter your response here (e.g. When I click on the Web tab, a blank page is displayed).
+Please enter your response here (e.g. When I try adding a web domain, an error message appeared stating that the php-fpm pool did not exist).
 
 ### What steps did you take when the issue occured? 
 1. Ex.: Log into the Hestia Control Panel using Firefox
 2. Ex.: Click on the Web tab
-3. ...
+3. Ex.: Click on Add Web Domain
+4. Ex.: Attempted to add a domain and received an error.
 
 ### Expected behavior:
-Please enter your response here (e.g. A list of hosted web domains should appear).
+Please enter your response here (e.g. the web domain should have been added successfully).
 
 ### Operating system distribution and release:
-Please enter your response here (e.g. Ubuntu 18.04.2 LTS)
+Please enter your response here (e.g. Ubuntu 18.04.3 LTS)
 
 ### Which version of Hestia Control Panel is currently installed?
 You can find this information in $HESTIA/conf/hestia.conf by running the following command:

README.md

@@ -3,9 +3,17 @@
 **Current stable release:** Version 1.0.6, released on September 26th, 2019.<br>
 **Current development release:** Version 1.1.0, release date yet to be determined.
 
-**We're looking for some extra hands on deck!**
+**Welcome!**
 ---------------------------- 
-Are you a software developer, tester, or have experience in writing documentation or guides? Do you have some spare time to contribute and want to help further the development of Hestia Control Panel?<br><br>Please send an email to info@hestiacp.com with a quick outline of your previous experience in any of these areas or where you think you could help on the project and we'll reach out to discuss with you further. 
+Hestia Control Panel offers easy to use web and command line interfaces, enabling web server administrators to quickly deploy and manage web domains, mail accounts, and DNS zones from one central location without the hassle of manually deploying and configuring individual components. 
+
+While we have taken every effort to make the 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 and managing web applications.
+
+**We cannot provide support for requests that do not describe in detail the troubleshooting that has already been performed, or for third-party applications which do not directly relate to Hestia Control Panel. Please make sure that you fill in the necessary details in your issue reports, and remove any sections that do not apply to your issue or use case.**
+
+Interested in helping shape the future of Hestia Control Panel?
+---------------------------- 
+Are you a software developer, tester, or have experience in writing documentation or guides and have some time to contibute to the project?<br><br>Please send an email to info@hestiacp.com with a quick outline of your previous experience in any of these areas or where you think you could help on the project and we'll reach out to discuss the next steps.
 
 As always we welcome all feedback and contributions!
 
@@ -67,7 +75,7 @@ You may specify a number of various flags during installation to only install th
 ```bash
 bash hst-install.sh -h
 ```
-Alternatively, @gabizz has made available a command-line script generator at https://gabizz.github.io/hestiacp-scriptline-generator/ which allows you to easily generate the installation command via GUI.
+Alternatively, @gabizz has made available a command-line script generator at https://gabizz.github.io/hestiacp-scriptline-generator/ which allows you to easily generate the installation command via GUI. (Please note that this generator still references the master branch, which is not intended for production use - see development builds below.)
 
 Installing & testing development builds
 =============================
@@ -107,4 +115,4 @@ If you would like to help our developers cover their time and infrastucture cost
 
 License
 =============================
-Hestia Control Panel is licensed under [GPL v3](https://github.com/hestiacp/hestiacp/blob/master/LICENSE) license, and is based on the [VestaCP](https://www.vestacp.com/) project.<br>
+Hestia Control Panel is licensed under [GPL v3](https://github.com/hestiacp/hestiacp/blob/master/LICENSE) license, and is based on the [VestaCP](https://www.vestacp.com/) project.<br>

bin/v-add-letsencrypt-host

@@ -68,14 +68,15 @@ fi
 if [ "$add_ssl" = "yes" ]; then
     # Add let's encrypt ssl
     $BIN/v-add-letsencrypt-domain $user $domain
+    check_result $? "Let's Encrypt SSL creation failed"  $E_UPDATE
 fi
 
 # Add certificate to backend
 $BIN/v-update-host-certificate $user $domain
 
 # Enable automatic ssl forward and hsts
-$BIN/v-add-web-domain-ssl-force $user $domain
-$BIN/v-add-web-domain-ssl-hsts $user $domain
+$BIN/v-add-web-domain-ssl-force $user $domain > /dev/null 2>&1
+$BIN/v-add-web-domain-ssl-hsts $user $domain > /dev/null 2>&1
 
 
 #----------------------------------------------------------#

bin/v-add-mail-account

@@ -62,7 +62,7 @@ if [[ "$MAIL_SYSTEM" =~ exim ]]; then
     if [ "$quota" = 'unlimited' ]; then
         quota='0'
     fi
-    str="$account:$md5:$user:mail::$HOMEDIR/$user:$quota"
+    str="$account:$md5:$user:mail::$HOMEDIR/$user::userdb_quota_rule=*:storage=${quota}M"
     echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd
 fi
 

bin/v-add-sys-sftp-jail

@@ -73,7 +73,7 @@ done
 
 # Add v-add-sys-sftp-jail to startup
 if [ ! -e "/etc/cron.d/hestia-sftp" ]; then
-    echo "@reboot admin /usr/local/hestia/bin/v-add-sys-sftp-jail" > /etc/cron.d/hestia-sftp
+    echo "@reboot root /usr/local/hestia/bin/v-add-sys-sftp-jail" > /etc/cron.d/hestia-sftp
 fi
 
 #----------------------------------------------------------#

bin/v-add-user

@@ -99,12 +99,14 @@ fi
 
 # Create default writeable folders
 mkdir $HOMEDIR/$user/.config \
+      $HOMEDIR/$user/.cache \
       $HOMEDIR/$user/.local \
       $HOMEDIR/$user/.composer \
       $HOMEDIR/$user/.ssh
 
 chown $user:$user \
       $HOMEDIR/$user/.config \
+      $HOMEDIR/$user/.cache \
       $HOMEDIR/$user/.local \
       $HOMEDIR/$user/.composer \
       $HOMEDIR/$user/.ssh

bin/v-add-web-php

@@ -44,6 +44,10 @@ if [ ! -f "$HESTIA_INSTALL_DIR/multiphp/$WEB_SYSTEM/PHP-${version//.}.sh" ]; the
     exit
 fi
 
+# Perform verification if read-only mode is enabled
+check_hestia_demo_mode
+
+
 #----------------------------------------------------------#
 #                       Action                             #
 #----------------------------------------------------------#

bin/v-change-mail-account-password

@@ -56,7 +56,7 @@ md5="{MD5}$($BIN/v-generate-password-hash md5 $salt <<<$password)"
 
 if [[ "$MAIL_SYSTEM" =~ exim ]]; then
     sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd
-    str="$account:$md5:$user:mail::$HOMEDIR/$user:$quota"
+    str="$account:$md5:$user:mail::$HOMEDIR/$user::userdb_quota_rule=*:storage=${quota}M"
     echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd
 fi
 

bin/v-change-mail-account-quota

@@ -58,7 +58,7 @@ if [[ "$MAIL_SYSTEM" =~ exim ]]; then
         quota=0
     fi
     sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd
-    str="$account:$md5:$user:mail::$HOMEDIR/$user:$quota"
+    str="$account:$md5:$user:mail::$HOMEDIR/$user::userdb_quota_rule=*:storage=${quota}M"
     echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd
 fi