Browse Source

Update hst-install-ubuntu.sh

Add RESOURCES_LIMIT to ubuntu installation script
A.O 2 years ago
parent
commit
f2c5a6d6ec
1 changed files with 39 additions and 33 deletions
  1. 39 33
      install/hst-install-ubuntu.sh

+ 39 - 33
install/hst-install-ubuntu.sh

@@ -75,7 +75,7 @@ help() {
   -i, --iptables          Install iptables      [yes|no]  default: yes
   -i, --iptables          Install iptables      [yes|no]  default: yes
   -b, --fail2ban          Install Fail2Ban      [yes|no]  default: yes
   -b, --fail2ban          Install Fail2Ban      [yes|no]  default: yes
   -q, --quota             Filesystem Quota      [yes|no]  default: no
   -q, --quota             Filesystem Quota      [yes|no]  default: no
-  -L, --resourcelimit     Resource limitation   [yes|no]  default: no
+  -L, --resourcelimit     Resource Limitation   [yes|no]  default: no
   -W, --webterminal       Web Terminal          [yes|no]  default: no
   -W, --webterminal       Web Terminal          [yes|no]  default: no
   -d, --api               Activate API          [yes|no]  default: yes
   -d, --api               Activate API          [yes|no]  default: yes
   -r, --port              Change Backend Port             default: 8083
   -r, --port              Change Backend Port             default: 8083
@@ -284,37 +284,37 @@ eval set -- "$args"
 # Parsing arguments
 # Parsing arguments
 while getopts "a:w:v:j:k:m:M:g:d:x:z:Z:c:t:i:b:r:o:q:l:y:s:u:e:p:W:D:fh" Option; do
 while getopts "a:w:v:j:k:m:M:g:d:x:z:Z:c:t:i:b:r:o:q:l:y:s:u:e:p:W:D:fh" Option; do
 	case $Option in
 	case $Option in
-		a) apache=$OPTARG ;;      # Apache
-		w) phpfpm=$OPTARG ;;      # PHP-FPM
-		o) multiphp=$OPTARG ;;    # Multi-PHP
-		v) vsftpd=$OPTARG ;;      # Vsftpd
-		j) proftpd=$OPTARG ;;     # Proftpd
-		k) named=$OPTARG ;;       # Named
-		m) mysql=$OPTARG ;;       # MariaDB
-		M) mysql8=$OPTARG ;;      # MySQL
-		g) postgresql=$OPTARG ;;  # PostgreSQL
-		x) exim=$OPTARG ;;        # Exim
-		z) dovecot=$OPTARG ;;     # Dovecot
-		Z) sieve=$OPTARG ;;       # Sieve
-		c) clamd=$OPTARG ;;       # ClamAV
-		t) spamd=$OPTARG ;;       # SpamAssassin
-		i) iptables=$OPTARG ;;    # Iptables
-		b) fail2ban=$OPTARG ;;    # Fail2ban
-		q) quota=$OPTARG ;;       # FS Quota
-		L) resourcelimit=$OPTARG ;;	# Resource Limitation
-		W) webterminal=$OPTARG ;; # Web Terminal
-		r) port=$OPTARG ;;        # Backend Port
-		l) lang=$OPTARG ;;        # Language
-		d) api=$OPTARG ;;         # Activate API
-		y) interactive=$OPTARG ;; # Interactive install
-		s) servername=$OPTARG ;;  # Hostname
-		e) email=$OPTARG ;;       # Admin email
-		u) username=$OPTARG ;;    # Admin username
-		p) vpass=$OPTARG ;;       # Admin password
-		D) withdebs=$OPTARG ;;    # Hestia debs path
-		f) force='yes' ;;         # Force install
-		h) help ;;                # Help
-		*) help ;;                # Print help (default)
+		a) apache=$OPTARG ;;      	# Apache
+		w) phpfpm=$OPTARG ;;      	# PHP-FPM
+		o) multiphp=$OPTARG ;;    	# Multi-PHP
+		v) vsftpd=$OPTARG ;;      	# Vsftpd
+		j) proftpd=$OPTARG ;;     	# Proftpd
+		k) named=$OPTARG ;;       	# Named
+		m) mysql=$OPTARG ;;       	# MariaDB
+		M) mysql8=$OPTARG ;;      	# MySQL
+		g) postgresql=$OPTARG ;;  	# PostgreSQL
+		x) exim=$OPTARG ;;        	# Exim
+		z) dovecot=$OPTARG ;;     	# Dovecot
+		Z) sieve=$OPTARG ;;       	# Sieve
+		c) clamd=$OPTARG ;;       	# ClamAV
+		t) spamd=$OPTARG ;;       	# SpamAssassin
+		i) iptables=$OPTARG ;;    	# Iptables
+		b) fail2ban=$OPTARG ;;   	# Fail2ban
+		q) quota=$OPTARG ;;       	# FS Quota
+		L) resourcelimit=$OPTARG ;; # Resource Limitation
+		W) webterminal=$OPTARG ;; 	# Web Terminal
+		r) port=$OPTARG ;;        	# Backend Port
+		l) lang=$OPTARG ;;        	# Language
+		d) api=$OPTARG ;;         	# Activate API
+		y) interactive=$OPTARG ;; 	# Interactive install
+		s) servername=$OPTARG ;;  	# Hostname
+		e) email=$OPTARG ;;       	# Admin email
+		u) username=$OPTARG ;;    	# Admin username
+		p) vpass=$OPTARG ;;       	# Admin password
+		D) withdebs=$OPTARG ;;    	# Hestia debs path
+		f) force='yes' ;;         	# Force install
+		h) help ;;                	# Help
+		*) help ;;                	# Print help (default)
 	esac
 	esac
 done
 done
 
 
@@ -2433,4 +2433,10 @@ $HESTIA/bin/v-add-user-notification "$username" 'Welcome to Hestia Control Panel
 sort_config_file
 sort_config_file
 
 
 if [ "$interactive" = 'yes' ]; then
 if [ "$interactive" = 'yes' ]; then
-	echo "[ ! ] IMPORTANT: The sys
+	echo "[ ! ] IMPORTANT: The system will now reboot to complete the installation process."
+	read -n 1 -s -r -p "Press any key to continue"
+	reboot
+else
+	echo "[ ! ] IMPORTANT: You must restart the system before continuing!"
+fi
+# EOF