github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-19 13:01:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1799 from cmstew/auto-hostname-ssl

Browse source 
Setting lets encrypt hostname ssl auto-renewal during install
This commit is contained in:
Anton Reutov 2021-08-13 21:09:20 +03:00 • committed by GitHub
commit 14a9fa4f8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 124 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

13
install/vst-install-amazon.sh
View file

@ -54,6 +54,7 @@ help() {
-l, --lang Default language default: en -l, --lang Default language default: en
-y, --interactive Interactive install [yes|no] default: yes -y, --interactive Interactive install [yes|no] default: yes
-s, --hostname Set hostname -s, --hostname Set hostname
-u, --ssl Add LE SSL for hostname [yes|no] default: no
-e, --email Set admin email -e, --email Set admin email
-p, --password Set admin password -p, --password Set admin password
-f, --force Force installation -f, --force Force installation
@ -141,6 +142,7 @@ for arg; do
--lang) args="${args}-l " ;; --lang) args="${args}-l " ;;
--interactive) args="${args}-y " ;; --interactive) args="${args}-y " ;;
--hostname) args="${args}-s " ;; --hostname) args="${args}-s " ;;
--ssl) args="${args}-u " ;;
--email) args="${args}-e " ;; --email) args="${args}-e " ;;
--password) args="${args}-p " ;; --password) args="${args}-p " ;;
--force) args="${args}-f " ;; --force) args="${args}-f " ;;
@ -152,7 +154,7 @@ done
eval set -- "$args" eval set -- "$args"
# Parsing arguments # Parsing arguments
while getopts "a:n:w:v:j:k:m:g:d:x:z:c:t:i:b:r:o:q:l:y:s:e:p:fh" Option; do while getopts "a:n:w:v:j:k:m:g:d:x:z:c:t:i:b:r:o:q:l:y:s:u:e:p:fh" Option; do
case $Option in case $Option in
a) apache=$OPTARG ;; # Apache a) apache=$OPTARG ;; # Apache
n) nginx=$OPTARG ;; # Nginx n) nginx=$OPTARG ;; # Nginx
@ -175,6 +177,7 @@ while getopts "a:n:w:v:j:k:m:g:d:x:z:c:t:i:b:r:o:q:l:y:s:e:p:fh" Option; do
l) lang=$OPTARG ;; # Language l) lang=$OPTARG ;; # Language
y) interactive=$OPTARG ;; # Interactive install y) interactive=$OPTARG ;; # Interactive install
s) servername=$OPTARG ;; # Hostname s) servername=$OPTARG ;; # Hostname
u) ssl=$OPTARG ;; # Add Let's Encrypt SSL for hostname
e) email=$OPTARG ;; # Admin email e) email=$OPTARG ;; # Admin email
p) vpass=$OPTARG ;; # Admin password p) vpass=$OPTARG ;; # Admin password
f) force='yes' ;; # Force install f) force='yes' ;; # Force install
@ -208,6 +211,7 @@ set_default_value 'remi' 'yes'
set_default_value 'softaculous' 'yes' set_default_value 'softaculous' 'yes'
set_default_value 'quota' 'no' set_default_value 'quota' 'no'
set_default_value 'interactive' 'yes' set_default_value 'interactive' 'yes'
set_default_value 'ssl' 'no'
set_default_lang 'en' set_default_lang 'en'
# Checking software conflicts # Checking software conflicts
@ -1332,6 +1336,13 @@ $VESTA/upd/add_notifications.sh
# Adding cronjob for autoupdates # Adding cronjob for autoupdates
$VESTA/bin/v-add-cron-vesta-autoupdate $VESTA/bin/v-add-cron-vesta-autoupdate
# Add Let's Encrypt SSL for hostname and enable auto-renew
if [ "$ssl" = 'yes' ]; then
$VESTA/bin/v-add-letsencrypt-domain 'admin' $servername '' 'yes'
$VESTA/bin/v-update-host-certificate admin $servername
echo "UPDATE_HOSTNAME_SSL='yes'" >> $VESTA/conf/vesta.conf
fi
#----------------------------------------------------------# #----------------------------------------------------------#
# Vesta Access Info # # Vesta Access Info #

14
install/vst-install-debian.sh
View file

@ -76,11 +76,13 @@ help() {
-t, --spamassassin Install SpamAssassin [yes|no] default: yes -t, --spamassassin Install SpamAssassin [yes|no] default: yes
-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
-r, --remi Install Remi repo [yes|no] default: yes
-o, --softaculous Install Softaculous [yes|no] default: yes -o, --softaculous Install Softaculous [yes|no] default: yes
-q, --quota Filesystem Quota [yes|no] default: no -q, --quota Filesystem Quota [yes|no] default: no
-l, --lang Default language default: en -l, --lang Default language default: en
-y, --interactive Interactive install [yes|no] default: yes -y, --interactive Interactive install [yes|no] default: yes
-s, --hostname Set hostname -s, --hostname Set hostname
-u, --ssl Add LE SSL for hostname [yes|no] default: no
-e, --email Set admin email -e, --email Set admin email
-p, --password Set admin password -p, --password Set admin password
-f, --force Force installation -f, --force Force installation
@ -169,6 +171,7 @@ for arg; do
--lang) args="${args}-l " ;; --lang) args="${args}-l " ;;
--interactive) args="${args}-y " ;; --interactive) args="${args}-y " ;;
--hostname) args="${args}-s " ;; --hostname) args="${args}-s " ;;
--ssl) args="${args}-u " ;;
--email) args="${args}-e " ;; --email) args="${args}-e " ;;
--password) args="${args}-p " ;; --password) args="${args}-p " ;;
--force) args="${args}-f " ;; --force) args="${args}-f " ;;
@ -180,7 +183,7 @@ done
eval set -- "$args" eval set -- "$args"
# Parsing arguments # Parsing arguments
while getopts "a:n:w:v:j:k:m:g:d:x:z:c:t:i:b:r:o:q:l:y:s:e:p:fh" Option; do while getopts "a:n:w:v:j:k:m:g:d:x:z:c:t:i:b:r:o:q:l:y:s:u:e:p:fh" Option; do
case $Option in case $Option in
a) apache=$OPTARG ;; # Apache a) apache=$OPTARG ;; # Apache
n) nginx=$OPTARG ;; # Nginx n) nginx=$OPTARG ;; # Nginx
@ -203,6 +206,7 @@ while getopts "a:n:w:v:j:k:m:g:d:x:z:c:t:i:b:r:o:q:l:y:s:e:p:fh" Option; do
l) lang=$OPTARG ;; # Language l) lang=$OPTARG ;; # Language
y) interactive=$OPTARG ;; # Interactive install y) interactive=$OPTARG ;; # Interactive install
s) servername=$OPTARG ;; # Hostname s) servername=$OPTARG ;; # Hostname
u) ssl=$OPTARG ;; # Add Let's Encrypt SSL for hostname
e) email=$OPTARG ;; # Admin email e) email=$OPTARG ;; # Admin email
p) vpass=$OPTARG ;; # Admin password p) vpass=$OPTARG ;; # Admin password
f) force='yes' ;; # Force install f) force='yes' ;; # Force install
@ -235,6 +239,7 @@ set_default_value 'fail2ban' 'yes'
set_default_value 'softaculous' 'yes' set_default_value 'softaculous' 'yes'
set_default_value 'quota' 'no' set_default_value 'quota' 'no'
set_default_value 'interactive' 'yes' set_default_value 'interactive' 'yes'
set_default_value 'ssl' 'no'
set_default_lang 'en' set_default_lang 'en'
# Checking software conflicts # Checking software conflicts
@ -1362,6 +1367,13 @@ $VESTA/upd/add_notifications.sh
# Adding cronjob for autoupdates # Adding cronjob for autoupdates
$VESTA/bin/v-add-cron-vesta-autoupdate $VESTA/bin/v-add-cron-vesta-autoupdate
# Add Let's Encrypt SSL for hostname and enable auto-renew
if [ "$ssl" = 'yes' ]; then
$VESTA/bin/v-add-letsencrypt-domain 'admin' $servername '' 'yes'
$VESTA/bin/v-update-host-certificate admin $servername
echo "UPDATE_HOSTNAME_SSL='yes'" >> $VESTA/conf/vesta.conf
fi
#----------------------------------------------------------# #----------------------------------------------------------#
# Vesta Access Info # # Vesta Access Info #

14
install/vst-install-rhel.sh
View file

@ -63,6 +63,7 @@ help() {
-l, --lang Default language default: en -l, --lang Default language default: en
-y, --interactive Interactive install [yes|no] default: yes -y, --interactive Interactive install [yes|no] default: yes
-s, --hostname Set hostname -s, --hostname Set hostname
-u, --ssl Add LE SSL for hostname [yes|no] default: no
-e, --email Set admin email -e, --email Set admin email
-p, --password Set admin password -p, --password Set admin password
-f, --force Force installation -f, --force Force installation
@ -147,6 +148,7 @@ for arg; do
--lang) args="${args}-l " ;; --lang) args="${args}-l " ;;
--interactive) args="${args}-y " ;; --interactive) args="${args}-y " ;;
--hostname) args="${args}-s " ;; --hostname) args="${args}-s " ;;
--ssl) args="${args}-u " ;;
--email) args="${args}-e " ;; --email) args="${args}-e " ;;
--password) args="${args}-p " ;; --password) args="${args}-p " ;;
--force) args="${args}-f " ;; --force) args="${args}-f " ;;
@ -158,7 +160,7 @@ done
eval set -- "$args" eval set -- "$args"
# Parsing arguments # Parsing arguments
while getopts "a:n:w:v:j:k:m:g:d:x:z:c:t:i:b:r:o:q:l:y:s:e:p:fh" Option; do while getopts "a:n:w:v:j:k:m:g:d:x:z:c:t:i:b:r:o:q:l:y:s:u:e:p:fh" Option; do
case $Option in case $Option in
a) apache=$OPTARG ;; # Apache a) apache=$OPTARG ;; # Apache
n) nginx=$OPTARG ;; # Nginx n) nginx=$OPTARG ;; # Nginx
@ -181,6 +183,7 @@ while getopts "a:n:w:v:j:k:m:g:d:x:z:c:t:i:b:r:o:q:l:y:s:e:p:fh" Option; do
l) lang=$OPTARG ;; # Language l) lang=$OPTARG ;; # Language
y) interactive=$OPTARG ;; # Interactive install y) interactive=$OPTARG ;; # Interactive install
s) servername=$OPTARG ;; # Hostname s) servername=$OPTARG ;; # Hostname
u) ssl=$OPTARG ;; # Add Let's Encrypt SSL for hostname
e) email=$OPTARG ;; # Admin email e) email=$OPTARG ;; # Admin email
p) vpass=$OPTARG ;; # Admin password p) vpass=$OPTARG ;; # Admin password
f) force='yes' ;; # Force install f) force='yes' ;; # Force install
@ -214,6 +217,7 @@ set_default_value 'remi' 'yes'
set_default_value 'softaculous' 'yes' set_default_value 'softaculous' 'yes'
set_default_value 'quota' 'no' set_default_value 'quota' 'no'
set_default_value 'interactive' 'yes' set_default_value 'interactive' 'yes'
set_default_value 'ssl' 'no'
set_default_lang 'en' set_default_lang 'en'
# Checking software conflicts # Checking software conflicts
@ -860,7 +864,6 @@ chown root:mail $VESTA/ssl/*
chmod 660 $VESTA/ssl/* chmod 660 $VESTA/ssl/*
rm /tmp/vst.pem rm /tmp/vst.pem
#----------------------------------------------------------# #----------------------------------------------------------#
# Configure Nginx # # Configure Nginx #
#----------------------------------------------------------# #----------------------------------------------------------#
@ -1360,6 +1363,13 @@ $VESTA/upd/add_notifications.sh
# Adding cronjob for autoupdates # Adding cronjob for autoupdates
$VESTA/bin/v-add-cron-vesta-autoupdate $VESTA/bin/v-add-cron-vesta-autoupdate
# Add Let's Encrypt SSL for hostname and enable auto-renew
if [ "$ssl" = 'yes' ]; then
$VESTA/bin/v-add-letsencrypt-domain 'admin' $servername '' 'yes'
$VESTA/bin/v-update-host-certificate admin $servername
echo "UPDATE_HOSTNAME_SSL='yes'" >> $VESTA/conf/vesta.conf
fi
#----------------------------------------------------------# #----------------------------------------------------------#
# Vesta Access Info # # Vesta Access Info #

14
install/vst-install-ubuntu.sh
View file

@ -56,11 +56,13 @@ help() {
-t, --spamassassin Install SpamAssassin [yes|no] default: yes -t, --spamassassin Install SpamAssassin [yes|no] default: yes
-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
-r, --remi Install Remi repo [yes|no] default: yes
-o, --softaculous Install Softaculous [yes|no] default: yes -o, --softaculous Install Softaculous [yes|no] default: yes
-q, --quota Filesystem Quota [yes|no] default: no -q, --quota Filesystem Quota [yes|no] default: no
-l, --lang Default language default: en -l, --lang Default language default: en
-y, --interactive Interactive install [yes|no] default: yes -y, --interactive Interactive install [yes|no] default: yes
-s, --hostname Set hostname -s, --hostname Set hostname
-u, --ssl Add LE SSL for hostname [yes|no] default: no
-e, --email Set admin email -e, --email Set admin email
-p, --password Set admin password -p, --password Set admin password
-f, --force Force installation -f, --force Force installation
@ -149,6 +151,7 @@ for arg; do
--lang) args="${args}-l " ;; --lang) args="${args}-l " ;;
--interactive) args="${args}-y " ;; --interactive) args="${args}-y " ;;
--hostname) args="${args}-s " ;; --hostname) args="${args}-s " ;;
--ssl) args="${args}-u " ;;
--email) args="${args}-e " ;; --email) args="${args}-e " ;;
--password) args="${args}-p " ;; --password) args="${args}-p " ;;
--force) args="${args}-f " ;; --force) args="${args}-f " ;;
@ -160,7 +163,7 @@ done
eval set -- "$args" eval set -- "$args"
# Parsing arguments # Parsing arguments
while getopts "a:n:w:v:j:k:m:g:d:x:z:c:t:i:b:r:o:q:l:y:s:e:p:fh" Option; do while getopts "a:n:w:v:j:k:m:g:d:x:z:c:t:i:b:r:o:q:l:y:s:u:e:p:fh" Option; do
case $Option in case $Option in
a) apache=$OPTARG ;; # Apache a) apache=$OPTARG ;; # Apache
n) nginx=$OPTARG ;; # Nginx n) nginx=$OPTARG ;; # Nginx
@ -183,6 +186,7 @@ while getopts "a:n:w:v:j:k:m:g:d:x:z:c:t:i:b:r:o:q:l:y:s:e:p:fh" Option; do
l) lang=$OPTARG ;; # Language l) lang=$OPTARG ;; # Language
y) interactive=$OPTARG ;; # Interactive install y) interactive=$OPTARG ;; # Interactive install
s) servername=$OPTARG ;; # Hostname s) servername=$OPTARG ;; # Hostname
u) ssl=$OPTARG ;; # Add Let's Encrypt SSL for hostname
e) email=$OPTARG ;; # Admin email e) email=$OPTARG ;; # Admin email
p) vpass=$OPTARG ;; # Admin password p) vpass=$OPTARG ;; # Admin password
f) force='yes' ;; # Force install f) force='yes' ;; # Force install
@ -215,6 +219,7 @@ set_default_value 'fail2ban' 'yes'
set_default_value 'softaculous' 'yes' set_default_value 'softaculous' 'yes'
set_default_value 'quota' 'no' set_default_value 'quota' 'no'
set_default_value 'interactive' 'yes' set_default_value 'interactive' 'yes'
set_default_value 'ssl' 'no'
set_default_lang 'en' set_default_lang 'en'
# Checking software conflicts # Checking software conflicts
@ -1332,6 +1337,13 @@ $VESTA/upd/add_notifications.sh
# Adding cronjob for autoupdates # Adding cronjob for autoupdates
$VESTA/bin/v-add-cron-vesta-autoupdate $VESTA/bin/v-add-cron-vesta-autoupdate
# Add Let's Encrypt SSL for hostname and enable auto-renew
if [ "$ssl" = 'yes' ]; then
$VESTA/bin/v-add-letsencrypt-domain 'admin' $servername '' 'yes'
$VESTA/bin/v-update-host-certificate admin $servername
echo "UPDATE_HOSTNAME_SSL='yes'" >> $VESTA/conf/vesta.conf
fi
#----------------------------------------------------------# #----------------------------------------------------------#
# Vesta Access Info # # Vesta Access Info #