From 6689e5c839dd72abe7d8ddc7ed6c97503818aa11 Mon Sep 17 00:00:00 2001 From: cmstew Date: Mon, 31 Dec 2018 15:42:01 -0700 Subject: [PATCH 01/11] Update vst-install-rhel.sh - Added to help function for ssl - Added argument for enabling Let's Encrypt SSL - Added set_default_value 'ssl' 'no' - Install Let's Encrypt on hostname, update certificate, and enable auto-renew if 'ssl' argument is 'yes' --- install/vst-install-rhel.sh | 52 ++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/install/vst-install-rhel.sh b/install/vst-install-rhel.sh index b7c2839e0..c5fd17006 100755 --- a/install/vst-install-rhel.sh +++ b/install/vst-install-rhel.sh @@ -42,27 +42,28 @@ fi # Defining help function help() { echo "Usage: $0 [OPTIONS] - -a, --apache Install Apache [yes|no] default: yes - -n, --nginx Install Nginx [yes|no] default: yes - -w, --phpfpm Install PHP-FPM [yes|no] default: no - -v, --vsftpd Install Vsftpd [yes|no] default: yes - -j, --proftpd Install ProFTPD [yes|no] default: no - -k, --named Install Bind [yes|no] default: yes - -m, --mysql Install MySQL [yes|no] default: yes - -g, --postgresql Install PostgreSQL [yes|no] default: no - -d, --mongodb Install MongoDB [yes|no] unsupported - -x, --exim Install Exim [yes|no] default: yes - -z, --dovecot Install Dovecot [yes|no] default: yes - -c, --clamav Install ClamAV [yes|no] default: yes - -t, --spamassassin Install SpamAssassin [yes|no] default: yes - -i, --iptables Install Iptables [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 - -q, --quota Filesystem Quota [yes|no] default: no + -a, --apache Install Apache [yes|no] default: yes + -n, --nginx Install Nginx [yes|no] default: yes + -w, --phpfpm Install PHP-FPM [yes|no] default: no + -v, --vsftpd Install Vsftpd [yes|no] default: yes + -j, --proftpd Install ProFTPD [yes|no] default: no + -k, --named Install Bind [yes|no] default: yes + -m, --mysql Install MySQL [yes|no] default: yes + -g, --postgresql Install PostgreSQL [yes|no] default: no + -d, --mongodb Install MongoDB [yes|no] unsupported + -x, --exim Install Exim [yes|no] default: yes + -z, --dovecot Install Dovecot [yes|no] default: yes + -c, --clamav Install ClamAV [yes|no] default: yes + -t, --spamassassin Install SpamAssassin [yes|no] default: yes + -i, --iptables Install Iptables [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 + -q, --quota Filesystem Quota [yes|no] default: no -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 + -u, --ssl Add LE SSL for hostname [yes|no] default: no -e, --email Set admin email -p, --password Set admin password -f, --force Force installation @@ -147,6 +148,7 @@ for arg; do --lang) args="${args}-l " ;; --interactive) args="${args}-y " ;; --hostname) args="${args}-s " ;; + --ssl) args="${args}-u " ;; --email) args="${args}-e " ;; --password) args="${args}-p " ;; --force) args="${args}-f " ;; @@ -158,7 +160,7 @@ done eval set -- "$args" # 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 a) apache=$OPTARG ;; # Apache 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 y) interactive=$OPTARG ;; # Interactive install s) servername=$OPTARG ;; # Hostname + u) ssl=$OPTARG ;; # Add Let's Encrypt SSL for hostname e) email=$OPTARG ;; # Admin email p) vpass=$OPTARG ;; # Admin password f) force='yes' ;; # Force install @@ -214,6 +217,7 @@ set_default_value 'remi' 'yes' set_default_value 'softaculous' 'yes' set_default_value 'quota' 'no' set_default_value 'interactive' 'yes' +set_default_value 'ssl' 'no' set_default_lang 'en' # Checking software conflicts @@ -860,7 +864,6 @@ chown root:mail $VESTA/ssl/* chmod 660 $VESTA/ssl/* rm /tmp/vst.pem - #----------------------------------------------------------# # Configure Nginx # #----------------------------------------------------------# @@ -1353,6 +1356,13 @@ $VESTA/upd/add_notifications.sh # Adding cronjob for autoupdates $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' $(hostname) '' 'yes' + $VESTA/bin/v-update-host-certificate admin $(hostname) + echo "UPDATE_HOSTNAME_SSL='yes'" >> $VESTA/conf/vesta.conf +fi + #----------------------------------------------------------# # Vesta Access Info # From 1dae236693d24d5b31b779dabbfa562669088087 Mon Sep 17 00:00:00 2001 From: cmstew Date: Mon, 31 Dec 2018 15:48:18 -0700 Subject: [PATCH 02/11] Update vst-install-amazon.sh - Added to help function for ssl - Added argument for enabling Let's Encrypt SSL - Added set_default_value 'ssl' 'no' - Install Let's Encrypt on hostname, update certificate, and enable auto-renew if 'ssl' argument is 'yes' --- install/vst-install-amazon.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/install/vst-install-amazon.sh b/install/vst-install-amazon.sh index 8dbdaa143..ce94edcde 100644 --- a/install/vst-install-amazon.sh +++ b/install/vst-install-amazon.sh @@ -54,6 +54,7 @@ help() { -l, --lang Default language default: en -y, --interactive Interactive install [yes|no] default: yes -s, --hostname Set hostname + -u, --ssl Add LE SSL for hostname [yes|no] default: no -e, --email Set admin email -p, --password Set admin password -f, --force Force installation @@ -138,6 +139,7 @@ for arg; do --lang) args="${args}-l " ;; --interactive) args="${args}-y " ;; --hostname) args="${args}-s " ;; + --ssl) args="${args}-u " ;; --email) args="${args}-e " ;; --password) args="${args}-p " ;; --force) args="${args}-f " ;; @@ -172,6 +174,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 y) interactive=$OPTARG ;; # Interactive install s) servername=$OPTARG ;; # Hostname + u) ssl=$OPTARG ;; # Add Let's Encrypt SSL for hostname e) email=$OPTARG ;; # Admin email p) vpass=$OPTARG ;; # Admin password f) force='yes' ;; # Force install @@ -205,6 +208,7 @@ set_default_value 'remi' 'yes' set_default_value 'softaculous' 'yes' set_default_value 'quota' 'no' set_default_value 'interactive' 'yes' +set_default_value 'ssl' 'no' set_default_lang 'en' # Checking software conflicts @@ -1329,6 +1333,13 @@ $VESTA/upd/add_notifications.sh # Adding cronjob for autoupdates $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' $(hostname) '' 'yes' + $VESTA/bin/v-update-host-certificate admin $(hostname) + echo "UPDATE_HOSTNAME_SSL='yes'" >> $VESTA/conf/vesta.conf +fi + #----------------------------------------------------------# # Vesta Access Info # From 7c9afbca32c65f48dbe51cc12c9c9b26f34a8df8 Mon Sep 17 00:00:00 2001 From: cmstew Date: Mon, 31 Dec 2018 15:48:25 -0700 Subject: [PATCH 03/11] Update vst-install-debian.sh - Added to help function for ssl - Added argument for enabling Let's Encrypt SSL - Added set_default_value 'ssl' 'no' - Install Let's Encrypt on hostname, update certificate, and enable auto-renew if 'ssl' argument is 'yes' --- install/vst-install-debian.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh index 87edd88b8..3e1e59405 100644 --- a/install/vst-install-debian.sh +++ b/install/vst-install-debian.sh @@ -81,6 +81,7 @@ help() { -l, --lang Default language default: en -y, --interactive Interactive install [yes|no] default: yes -s, --hostname Set hostname + -u, --ssl Add LE SSL for hostname [yes|no] default: no -e, --email Set admin email -p, --password Set admin password -f, --force Force installation @@ -169,6 +170,7 @@ for arg; do --lang) args="${args}-l " ;; --interactive) args="${args}-y " ;; --hostname) args="${args}-s " ;; + --ssl) args="${args}-u " ;; --email) args="${args}-e " ;; --password) args="${args}-p " ;; --force) args="${args}-f " ;; @@ -203,6 +205,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 y) interactive=$OPTARG ;; # Interactive install s) servername=$OPTARG ;; # Hostname + u) ssl=$OPTARG ;; # Add Let's Encrypt SSL for hostname e) email=$OPTARG ;; # Admin email p) vpass=$OPTARG ;; # Admin password f) force='yes' ;; # Force install @@ -235,6 +238,7 @@ set_default_value 'fail2ban' 'yes' set_default_value 'softaculous' 'yes' set_default_value 'quota' 'no' set_default_value 'interactive' 'yes' +set_default_value 'ssl' 'no' set_default_lang 'en' # Checking software conflicts @@ -1352,6 +1356,13 @@ $VESTA/upd/add_notifications.sh # Adding cronjob for autoupdates $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' $(hostname) '' 'yes' + $VESTA/bin/v-update-host-certificate admin $(hostname) + echo "UPDATE_HOSTNAME_SSL='yes'" >> $VESTA/conf/vesta.conf +fi + #----------------------------------------------------------# # Vesta Access Info # From f8734d15e9392d0f0232c825867361b1b119a951 Mon Sep 17 00:00:00 2001 From: cmstew Date: Mon, 31 Dec 2018 15:48:29 -0700 Subject: [PATCH 04/11] Update vst-install-ubuntu.sh - Added to help function for ssl - Added argument for enabling Let's Encrypt SSL - Added set_default_value 'ssl' 'no' - Install Let's Encrypt on hostname, update certificate, and enable auto-renew if 'ssl' argument is 'yes' --- install/vst-install-ubuntu.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/install/vst-install-ubuntu.sh b/install/vst-install-ubuntu.sh index e1ca1044a..dd526f331 100755 --- a/install/vst-install-ubuntu.sh +++ b/install/vst-install-ubuntu.sh @@ -61,6 +61,7 @@ help() { -l, --lang Default language default: en -y, --interactive Interactive install [yes|no] default: yes -s, --hostname Set hostname + -u, --ssl Add LE SSL for hostname [yes|no] default: no -e, --email Set admin email -p, --password Set admin password -f, --force Force installation @@ -149,6 +150,7 @@ for arg; do --lang) args="${args}-l " ;; --interactive) args="${args}-y " ;; --hostname) args="${args}-s " ;; + --ssl) args="${args}-u " ;; --email) args="${args}-e " ;; --password) args="${args}-p " ;; --force) args="${args}-f " ;; @@ -183,6 +185,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 y) interactive=$OPTARG ;; # Interactive install s) servername=$OPTARG ;; # Hostname + u) ssl=$OPTARG ;; # Add Let's Encrypt SSL for hostname e) email=$OPTARG ;; # Admin email p) vpass=$OPTARG ;; # Admin password f) force='yes' ;; # Force install @@ -215,6 +218,7 @@ set_default_value 'fail2ban' 'yes' set_default_value 'softaculous' 'yes' set_default_value 'quota' 'no' set_default_value 'interactive' 'yes' +set_default_value 'ssl' 'no' set_default_lang 'en' # Checking software conflicts @@ -1299,6 +1303,13 @@ $VESTA/upd/add_notifications.sh # Adding cronjob for autoupdates $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' $(hostname) '' 'yes' + $VESTA/bin/v-update-host-certificate admin $(hostname) + echo "UPDATE_HOSTNAME_SSL='yes'" >> $VESTA/conf/vesta.conf +fi + #----------------------------------------------------------# # Vesta Access Info # From 13e2f473e2fce15fdfa1e2d6a2e7249146baf3fc Mon Sep 17 00:00:00 2001 From: cmstew Date: Mon, 31 Dec 2018 19:10:05 -0700 Subject: [PATCH 05/11] Update vst-install-amazon.sh missed a change --- install/vst-install-amazon.sh | 40 +++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/install/vst-install-amazon.sh b/install/vst-install-amazon.sh index ce94edcde..dc6d8bed3 100644 --- a/install/vst-install-amazon.sh +++ b/install/vst-install-amazon.sh @@ -33,26 +33,26 @@ software="nginx httpd mod_ssl mod_ruid2 mod_fcgid mod_extract_forwarded # Defining help function help() { echo "Usage: $0 [OPTIONS] - -a, --apache Install Apache [yes|no] default: yes - -n, --nginx Install Nginx [yes|no] default: yes - -w, --phpfpm Install PHP-FPM [yes|no] default: no - -v, --vsftpd Install Vsftpd [yes|no] default: yes - -j, --proftpd Install ProFTPD [yes|no] default: no - -k, --named Install Bind [yes|no] default: yes - -m, --mysql Install MySQL [yes|no] default: yes - -g, --postgresql Install PostgreSQL [yes|no] default: no - -d, --mongodb Install MongoDB [yes|no] unsupported - -x, --exim Install Exim [yes|no] default: yes - -z, --dovecot Install Dovecot [yes|no] default: yes - -c, --clamav Install ClamAV [yes|no] default: yes - -t, --spamassassin Install SpamAssassin [yes|no] default: yes - -i, --iptables Install Iptables [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 - -q, --quota Filesystem Quota [yes|no] default: no + -a, --apache Install Apache [yes|no] default: yes + -n, --nginx Install Nginx [yes|no] default: yes + -w, --phpfpm Install PHP-FPM [yes|no] default: no + -v, --vsftpd Install Vsftpd [yes|no] default: yes + -j, --proftpd Install ProFTPD [yes|no] default: no + -k, --named Install Bind [yes|no] default: yes + -m, --mysql Install MySQL [yes|no] default: yes + -g, --postgresql Install PostgreSQL [yes|no] default: no + -d, --mongodb Install MongoDB [yes|no] unsupported + -x, --exim Install Exim [yes|no] default: yes + -z, --dovecot Install Dovecot [yes|no] default: yes + -c, --clamav Install ClamAV [yes|no] default: yes + -t, --spamassassin Install SpamAssassin [yes|no] default: yes + -i, --iptables Install Iptables [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 + -q, --quota Filesystem Quota [yes|no] default: no -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 -u, --ssl Add LE SSL for hostname [yes|no] default: no -e, --email Set admin email @@ -151,7 +151,7 @@ done eval set -- "$args" # 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 a) apache=$OPTARG ;; # Apache n) nginx=$OPTARG ;; # Nginx From c79785c790a4af5899b9ade52f1e5d7a8e824f1b Mon Sep 17 00:00:00 2001 From: cmstew Date: Mon, 31 Dec 2018 19:10:11 -0700 Subject: [PATCH 06/11] Update vst-install-debian.sh missed a change --- install/vst-install-debian.sh | 39 ++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh index 3e1e59405..a1805404c 100644 --- a/install/vst-install-debian.sh +++ b/install/vst-install-debian.sh @@ -61,25 +61,26 @@ fi # Defining help function help() { echo "Usage: $0 [OPTIONS] - -a, --apache Install Apache [yes|no] default: yes - -n, --nginx Install Nginx [yes|no] default: yes - -w, --phpfpm Install PHP-FPM [yes|no] default: no - -v, --vsftpd Install Vsftpd [yes|no] default: yes - -j, --proftpd Install ProFTPD [yes|no] default: no - -k, --named Install Bind [yes|no] default: yes - -m, --mysql Install MySQL [yes|no] default: yes - -g, --postgresql Install PostgreSQL [yes|no] default: no - -d, --mongodb Install MongoDB [yes|no] unsupported - -x, --exim Install Exim [yes|no] default: yes - -z, --dovecot Install Dovecot [yes|no] default: yes - -c, --clamav Install ClamAV [yes|no] default: yes - -t, --spamassassin Install SpamAssassin [yes|no] default: yes - -i, --iptables Install Iptables [yes|no] default: yes - -b, --fail2ban Install Fail2ban [yes|no] default: yes - -o, --softaculous Install Softaculous [yes|no] default: yes - -q, --quota Filesystem Quota [yes|no] default: no + -a, --apache Install Apache [yes|no] default: yes + -n, --nginx Install Nginx [yes|no] default: yes + -w, --phpfpm Install PHP-FPM [yes|no] default: no + -v, --vsftpd Install Vsftpd [yes|no] default: yes + -j, --proftpd Install ProFTPD [yes|no] default: no + -k, --named Install Bind [yes|no] default: yes + -m, --mysql Install MySQL [yes|no] default: yes + -g, --postgresql Install PostgreSQL [yes|no] default: no + -d, --mongodb Install MongoDB [yes|no] unsupported + -x, --exim Install Exim [yes|no] default: yes + -z, --dovecot Install Dovecot [yes|no] default: yes + -c, --clamav Install ClamAV [yes|no] default: yes + -t, --spamassassin Install SpamAssassin [yes|no] default: yes + -i, --iptables Install Iptables [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 + -q, --quota Filesystem Quota [yes|no] default: no -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 -u, --ssl Add LE SSL for hostname [yes|no] default: no -e, --email Set admin email @@ -182,7 +183,7 @@ done eval set -- "$args" # 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 a) apache=$OPTARG ;; # Apache n) nginx=$OPTARG ;; # Nginx From 3b58b4a8b72589d8cc502eee5c78f10a09af4e54 Mon Sep 17 00:00:00 2001 From: cmstew Date: Mon, 31 Dec 2018 19:10:18 -0700 Subject: [PATCH 07/11] Update vst-install-ubuntu.sh missed a change --- install/vst-install-ubuntu.sh | 39 ++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/install/vst-install-ubuntu.sh b/install/vst-install-ubuntu.sh index dd526f331..958d9a53b 100755 --- a/install/vst-install-ubuntu.sh +++ b/install/vst-install-ubuntu.sh @@ -41,25 +41,26 @@ fi # Defining help function help() { echo "Usage: $0 [OPTIONS] - -a, --apache Install Apache [yes|no] default: yes - -n, --nginx Install Nginx [yes|no] default: yes - -w, --phpfpm Install PHP-FPM [yes|no] default: no - -v, --vsftpd Install Vsftpd [yes|no] default: yes - -j, --proftpd Install ProFTPD [yes|no] default: no - -k, --named Install Bind [yes|no] default: yes - -m, --mysql Install MySQL [yes|no] default: yes - -g, --postgresql Install PostgreSQL [yes|no] default: no - -d, --mongodb Install MongoDB [yes|no] unsupported - -x, --exim Install Exim [yes|no] default: yes - -z, --dovecot Install Dovecot [yes|no] default: yes - -c, --clamav Install ClamAV [yes|no] default: yes - -t, --spamassassin Install SpamAssassin [yes|no] default: yes - -i, --iptables Install Iptables [yes|no] default: yes - -b, --fail2ban Install Fail2ban [yes|no] default: yes - -o, --softaculous Install Softaculous [yes|no] default: yes - -q, --quota Filesystem Quota [yes|no] default: no + -a, --apache Install Apache [yes|no] default: yes + -n, --nginx Install Nginx [yes|no] default: yes + -w, --phpfpm Install PHP-FPM [yes|no] default: no + -v, --vsftpd Install Vsftpd [yes|no] default: yes + -j, --proftpd Install ProFTPD [yes|no] default: no + -k, --named Install Bind [yes|no] default: yes + -m, --mysql Install MySQL [yes|no] default: yes + -g, --postgresql Install PostgreSQL [yes|no] default: no + -d, --mongodb Install MongoDB [yes|no] unsupported + -x, --exim Install Exim [yes|no] default: yes + -z, --dovecot Install Dovecot [yes|no] default: yes + -c, --clamav Install ClamAV [yes|no] default: yes + -t, --spamassassin Install SpamAssassin [yes|no] default: yes + -i, --iptables Install Iptables [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 + -q, --quota Filesystem Quota [yes|no] default: no -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 -u, --ssl Add LE SSL for hostname [yes|no] default: no -e, --email Set admin email @@ -162,7 +163,7 @@ done eval set -- "$args" # 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 a) apache=$OPTARG ;; # Apache n) nginx=$OPTARG ;; # Nginx From d8f372d99c3560e7708209d70d4e378fffb764f5 Mon Sep 17 00:00:00 2001 From: cmstew Date: Tue, 1 Jan 2019 12:07:30 -0700 Subject: [PATCH 08/11] Update vst-install-ubuntu.sh Changed hostname variable to match rest of script --- install/vst-install-ubuntu.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/vst-install-ubuntu.sh b/install/vst-install-ubuntu.sh index 958d9a53b..9e5bc1164 100755 --- a/install/vst-install-ubuntu.sh +++ b/install/vst-install-ubuntu.sh @@ -1306,8 +1306,8 @@ $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' $(hostname) '' 'yes' - $VESTA/bin/v-update-host-certificate admin $(hostname) + $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 From bdb0959e1b83dc7cbec33be99e0975296ea83064 Mon Sep 17 00:00:00 2001 From: cmstew Date: Tue, 1 Jan 2019 12:07:34 -0700 Subject: [PATCH 09/11] Update vst-install-debian.sh Changed hostname variable to match rest of script --- install/vst-install-debian.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh index a1805404c..9334d46e5 100644 --- a/install/vst-install-debian.sh +++ b/install/vst-install-debian.sh @@ -1359,8 +1359,8 @@ $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' $(hostname) '' 'yes' - $VESTA/bin/v-update-host-certificate admin $(hostname) + $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 From 58524248300e84bab349231adbcb9bcd509f2149 Mon Sep 17 00:00:00 2001 From: cmstew Date: Tue, 1 Jan 2019 12:07:43 -0700 Subject: [PATCH 10/11] Update vst-install-amazon.sh Changed hostname variable to match rest of script --- install/vst-install-amazon.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/vst-install-amazon.sh b/install/vst-install-amazon.sh index dc6d8bed3..0383b0559 100644 --- a/install/vst-install-amazon.sh +++ b/install/vst-install-amazon.sh @@ -1335,8 +1335,8 @@ $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' $(hostname) '' 'yes' - $VESTA/bin/v-update-host-certificate admin $(hostname) + $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 From be300fd82e005d2fa3b5528b8ae253b76d6a89bd Mon Sep 17 00:00:00 2001 From: cmstew Date: Tue, 1 Jan 2019 12:07:49 -0700 Subject: [PATCH 11/11] Update vst-install-rhel.sh Changed hostname variable to match rest of script --- install/vst-install-rhel.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/vst-install-rhel.sh b/install/vst-install-rhel.sh index c5fd17006..6d0d3c7d8 100755 --- a/install/vst-install-rhel.sh +++ b/install/vst-install-rhel.sh @@ -1358,8 +1358,8 @@ $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' $(hostname) '' 'yes' - $VESTA/bin/v-update-host-certificate admin $(hostname) + $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