|
|
@ -304,7 +304,7 @@ done
|
|
|
|
eval set -- "$args"
|
|
|
|
eval set -- "$args"
|
|
|
|
|
|
|
|
|
|
|
|
# Parsing arguments
|
|
|
|
# Parsing arguments
|
|
|
|
while getopts "u:I:a:w:v:j:k:m:M:g:d:x:z:Z:c:C:t:i:b:r:o:q:l:y:s:e:p:R:fh" Option; do
|
|
|
|
while getopts "u:I:a:w:v:j:k:m:M:g:d:x:z:Z:c:C:t:i:b:r:o:q:l:y:s:e:p:R:f:h" Option; do
|
|
|
|
case $Option in
|
|
|
|
case $Option in
|
|
|
|
a) apache=$OPTARG ;; # Apache
|
|
|
|
a) apache=$OPTARG ;; # Apache
|
|
|
|
w) phpfpm=$OPTARG ;; # PHP-FPM
|
|
|
|
w) phpfpm=$OPTARG ;; # PHP-FPM
|
|
|
@ -335,7 +335,7 @@ while getopts "u:I:a:w:v:j:k:m:M:g:d:x:z:Z:c:C:t:i:b:r:o:q:l:y:s:e:p:R:fh" Optio
|
|
|
|
e) email=$OPTARG ;; # Admin email
|
|
|
|
e) email=$OPTARG ;; # Admin email
|
|
|
|
p) vpass=$OPTARG ;; # Admin password
|
|
|
|
p) vpass=$OPTARG ;; # Admin password
|
|
|
|
R) withrpms=$OPTARG ;; # Hestia rpms path
|
|
|
|
R) withrpms=$OPTARG ;; # Hestia rpms path
|
|
|
|
f) force='yes' ;; # Force install
|
|
|
|
f) force=$OPTARG ;; # Force install
|
|
|
|
h) help ;; # Help
|
|
|
|
h) help ;; # Help
|
|
|
|
I) nopublicip=$OPTARG ;; # NoPublicIP
|
|
|
|
I) nopublicip=$OPTARG ;; # NoPublicIP
|
|
|
|
u) uselocalphp=$OPTARG ;; # UseLocalPHP
|
|
|
|
u) uselocalphp=$OPTARG ;; # UseLocalPHP
|
|
|
@ -377,6 +377,10 @@ set_default_port '8083'
|
|
|
|
set_default_lang 'en'
|
|
|
|
set_default_lang 'en'
|
|
|
|
set_default_value 'uselocalphp' 'no'
|
|
|
|
set_default_value 'uselocalphp' 'no'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if [ "$force" != "yes" ]; then
|
|
|
|
|
|
|
|
force="no"
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
# Checking software conflicts
|
|
|
|
# Checking software conflicts
|
|
|
|
if [ "$proftpd" = 'yes' ]; then
|
|
|
|
if [ "$proftpd" = 'yes' ]; then
|
|
|
|
vsftpd='no'
|
|
|
|
vsftpd='no'
|
|
|
|