Local install should now be possible

This commit is contained in:
Papa Dragon 2023-03-03 09:59:38 +01:00
parent 58288a5b1d
commit 7149200cf7
3 changed files with 25 additions and 4 deletions

View file

@ -344,6 +344,18 @@ function configure_cron_daily {
# START OF PROGRAM
########################################################################
export PATH=/bin:/usr/bin:/sbin:/usr/sbin
for arg in "$@" ; do
shift
case "$arg" in
--local) local_install=yes
print "We're doing a local install, option is $local_install"
;;
*) die "not a valid option"
;;
esac
done
check_sanity
repo_name
print_info "We're installing a website using the $repository repository"

View file

@ -73,12 +73,12 @@ function enter_domain {
enter_domain
fi
else
if [[ "$le_domain" =~ $local_regex ]]
if [[ "$domain_name" =~ $local_regex ]]
then
webserver_check
else
# We change the message in the dialog box if there's no valid input
inputbox_domain="\"$le_domain\" is not a valid local domain for your test install. Please enter one now:"
inputbox_domain="\"$domain_name\" is not a valid local domain for your test install. Please enter one now:"
enter_domain
fi
fi
@ -232,7 +232,12 @@ function db_user_check {
}
function summary {
summary_domain="Website address : https://$domain_name/\n\n"
if [ -z $local_install ]
then
summary_domain="Website address : https://$domain_name/\n\n"
else
summary_domain="Website address : http://$domain_name/\n\n"
fi
summary_db_pass="Website database password : $website_db_pass\n"
summary_db_name="Website database name : $website_db_name\n"
summary_db_user="Website database user : $website_db_user\n"

View file

@ -98,6 +98,11 @@ function select_webserver {
}
function ddns_choice {
# Only useful if we're not doing a local install
if [ ! -z $local_install ]
then
enter_root_db_pass
fi
# We can automatically configure Dynamic DNS (DDNS) with a few providers
# This is of course to be used only with a FQDN of domain name
provider=$(whiptail \
@ -259,4 +264,3 @@ function enter_root_db_pass {
fi
}
enter_email