From c426be582a111062beab5a013024238a08564c98 Mon Sep 17 00:00:00 2001 From: Leonid Suprun Date: Mon, 26 Jan 2015 11:59:09 +0300 Subject: [PATCH 1/2] apt-get, not yum --- install/vst-install-debian.sh | 4 ++-- install/vst-install-ubuntu.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh index a188c0653..c4e4620b8 100644 --- a/install/vst-install-debian.sh +++ b/install/vst-install-debian.sh @@ -26,7 +26,7 @@ help() { -f, --force Force installation -i, --disable-iptables Disable iptables support -b, --disable-fail2ban Disable fail2ban protection - -n, --noupdate Do not run yum update command + -n, --noupdate Do not run apt-get upgrade command -s, --hostname Set server hostname -e, --email Set email address -p, --password Set admin password instead of generating it @@ -78,7 +78,7 @@ while getopts "hfibdnqe:m:p:s:" Option; do f) force='yes' ;; # Force install i) disable_iptables='yes' ;; # Disable iptables b) disable_fail2ban='yes' ;; # Disable fail2ban - n) noupdate='yes' ;; # Disable yum update + n) noupdate='yes' ;; # Disable apt-get upgrade s) servername=$OPTARG ;; # Server hostname e) email=$OPTARG ;; # Set email p) vpass=$OPTARG ;; # Admin password diff --git a/install/vst-install-ubuntu.sh b/install/vst-install-ubuntu.sh index 7f05f58df..dfc64ff7e 100644 --- a/install/vst-install-ubuntu.sh +++ b/install/vst-install-ubuntu.sh @@ -25,7 +25,7 @@ help() { -f, --force Force installation -i, --disable-iptables Disable iptables support -b, --disable-fail2ban Disable fail2ban protection - -n, --noupdate Do not run yum update command + -n, --noupdate Do not run apt-get upgrade command -s, --hostname Set server hostname -e, --email Set email address -p, --password Set admin password instead of generating it @@ -77,7 +77,7 @@ while getopts "hfibdnqe:m:p:s:" Option; do f) force='yes' ;; # Force install i) disable_iptables='yes' ;; # Disable iptables b) disable_fail2ban='yes' ;; # Disable fail2ban - n) noupdate='yes' ;; # Disable yum update + n) noupdate='yes' ;; # Disable apt-get upgrade s) servername=$OPTARG ;; # Server hostname e) email=$OPTARG ;; # Set email p) vpass=$OPTARG ;; # Admin password From c1195d1f30f8e50b62be677d765be1dd4d7d3972 Mon Sep 17 00:00:00 2001 From: Leonid Suprun Date: Mon, 26 Jan 2015 12:32:37 +0300 Subject: [PATCH 2/2] Clarify "user admin exists" message --- install/vst-install-debian.sh | 6 +++--- install/vst-install-rhel.sh | 6 +++--- install/vst-install-ubuntu.sh | 6 +++--- install/vst-install.sh | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh index c4e4620b8..d5e8110a0 100644 --- a/install/vst-install-debian.sh +++ b/install/vst-install-debian.sh @@ -126,11 +126,11 @@ if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" != 'yes' ]; then exit 1 fi -# Check admin user account +# Check admin group if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" != 'yes' ]; then - echo "Error: user admin exists" + echo "Error: group admin exists" echo - echo 'Please remove admin user account before proceeding.' + echo 'Please remove admin group before proceeding.' echo 'If you want to do it automatically run installer with -f option:' echo "Example: bash $0 --force" exit 1 diff --git a/install/vst-install-rhel.sh b/install/vst-install-rhel.sh index ab1692a81..218c08401 100644 --- a/install/vst-install-rhel.sh +++ b/install/vst-install-rhel.sh @@ -124,11 +124,11 @@ if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" != 'yes' ]; then exit 1 fi -# Check admin user account +# Check admin group if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" != 'yes' ]; then - echo "Error: user admin exists" + echo "Error: group admin exists" echo - echo 'Please remove admin user account before proceeding.' + echo 'Please remove admin group before proceeding.' echo 'If you want to do it automatically run installer with -f option:' echo "Example: bash $0 --force" exit 1 diff --git a/install/vst-install-ubuntu.sh b/install/vst-install-ubuntu.sh index dfc64ff7e..6d1319569 100644 --- a/install/vst-install-ubuntu.sh +++ b/install/vst-install-ubuntu.sh @@ -123,11 +123,11 @@ if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" != 'yes' ]; then exit 1 fi -# Check admin user account +# Check admin group if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" != 'yes' ]; then - echo "Error: user admin exists" + echo "Error: group admin exists" echo - echo 'Please remove admin user account before proceeding.' + echo 'Please remove admin group before proceeding.' echo 'If you want to do it automatically run installer with -f option:' echo "Example: bash $0 --force" exit 1 diff --git a/install/vst-install.sh b/install/vst-install.sh index 864b671d2..9c064ab01 100644 --- a/install/vst-install.sh +++ b/install/vst-install.sh @@ -27,11 +27,11 @@ if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ -z "$1" ]; then exit 1 fi -# Check admin user account +# Check admin group if [ ! -z "$(grep ^admin: /etc/group)" ] && [ -z "$1" ]; then echo "Error: group admin exists" echo - echo 'Please remove admin user account before proceeding.' + echo 'Please remove admin group before proceeding.' echo 'If you want to do it automatically run installer with -f option:' echo "Example: bash $0 --force" exit 1