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

Merge pull request #297 from devsli/master

Browse source 
Fix messages
This commit is contained in:
Serghey Rodin 2015-04-14 14:02:40 +03:00
commit 144b58fc15
4 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,7 +26,7 @@ help() {
-f, --force Force installation -f, --force Force installation
-i, --disable-iptables Disable iptables support -i, --disable-iptables Disable iptables support
-b, --disable-fail2ban Disable fail2ban protection -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 -s, --hostname Set server hostname
-e, --email Set email address -e, --email Set email address
-p, --password Set admin password instead of generating it -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 f) force='yes' ;; # Force install
i) disable_iptables='yes' ;; # Disable iptables i) disable_iptables='yes' ;; # Disable iptables
b) disable_fail2ban='yes' ;; # Disable fail2ban b) disable_fail2ban='yes' ;; # Disable fail2ban
n) noupdate='yes' ;; # Disable yum update n) noupdate='yes' ;; # Disable apt-get upgrade
s) servername=$OPTARG ;; # Server hostname s) servername=$OPTARG ;; # Server hostname
e) email=$OPTARG ;; # Set email e) email=$OPTARG ;; # Set email
p) vpass=$OPTARG ;; # Admin password p) vpass=$OPTARG ;; # Admin password
@ -126,11 +126,11 @@ if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" != 'yes' ]; then
exit 1 exit 1
fi fi
# Check admin user account # Check admin group
if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" != 'yes' ]; then if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" != 'yes' ]; then
echo "Error: user admin exists" echo "Error: group admin exists"
echo 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 'If you want to do it automatically run installer with -f option:'
echo "Example: bash $0 --force" echo "Example: bash $0 --force"
exit 1 exit 1

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

@ -124,11 +124,11 @@ if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" != 'yes' ]; then
exit 1 exit 1
fi fi
# Check admin user account # Check admin group
if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" != 'yes' ]; then if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" != 'yes' ]; then
echo "Error: user admin exists" echo "Error: group admin exists"
echo 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 'If you want to do it automatically run installer with -f option:'
echo "Example: bash $0 --force" echo "Example: bash $0 --force"
exit 1 exit 1

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

@ -25,7 +25,7 @@ help() {
-f, --force Force installation -f, --force Force installation
-i, --disable-iptables Disable iptables support -i, --disable-iptables Disable iptables support
-b, --disable-fail2ban Disable fail2ban protection -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 -s, --hostname Set server hostname
-e, --email Set email address -e, --email Set email address
-p, --password Set admin password instead of generating it -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 f) force='yes' ;; # Force install
i) disable_iptables='yes' ;; # Disable iptables i) disable_iptables='yes' ;; # Disable iptables
b) disable_fail2ban='yes' ;; # Disable fail2ban b) disable_fail2ban='yes' ;; # Disable fail2ban
n) noupdate='yes' ;; # Disable yum update n) noupdate='yes' ;; # Disable apt-get upgrade
s) servername=$OPTARG ;; # Server hostname s) servername=$OPTARG ;; # Server hostname
e) email=$OPTARG ;; # Set email e) email=$OPTARG ;; # Set email
p) vpass=$OPTARG ;; # Admin password p) vpass=$OPTARG ;; # Admin password
@ -123,11 +123,11 @@ if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" != 'yes' ]; then
exit 1 exit 1
fi fi
# Check admin user account # Check admin group
if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" != 'yes' ]; then if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" != 'yes' ]; then
echo "Error: user admin exists" echo "Error: group admin exists"
echo 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 'If you want to do it automatically run installer with -f option:'
echo "Example: bash $0 --force" echo "Example: bash $0 --force"
exit 1 exit 1

4
install/vst-install.sh
View file

@ -27,11 +27,11 @@ if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ -z "$1" ]; then
exit 1 exit 1
fi fi
# Check admin user account # Check admin group
if [ ! -z "$(grep ^admin: /etc/group)" ] && [ -z "$1" ]; then if [ ! -z "$(grep ^admin: /etc/group)" ] && [ -z "$1" ]; then
echo "Error: group admin exists" echo "Error: group admin exists"
echo 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 'If you want to do it automatically run installer with -f option:'
echo "Example: bash $0 --force" echo "Example: bash $0 --force"
exit 1 exit 1