remove old option, and add option to clear terminal after use server-container.sh
This commit is contained in:
parent
d1417d7261
commit
8d0a6efba2
1 changed files with 13 additions and 36 deletions
|
@ -33,13 +33,13 @@ declare -i CLEANCONTAINERKHANAT=0
|
||||||
declare -i CONNECTSSHKHANAT=0
|
declare -i CONNECTSSHKHANAT=0
|
||||||
declare -i KHANAT_CLIENT_VERSION=1
|
declare -i KHANAT_CLIENT_VERSION=1
|
||||||
declare -i SHOWIPKHANATSERVER=0
|
declare -i SHOWIPKHANATSERVER=0
|
||||||
declare METHODSTARTSERVER="--start-with-manager"
|
declare METHODSTARTSERVER="--opennel-manager"
|
||||||
declare -i CLEANIMAGENONE=0
|
declare -i CLEANIMAGENONE=0
|
||||||
declare DOCKERBUILDOPT=""
|
declare DOCKERBUILDOPT=""
|
||||||
declare DOCKERRUNOPT=""
|
declare DOCKERRUNOPT=""
|
||||||
declare CONFIGUREAUTO=""
|
declare CONFIGUREAUTO=""
|
||||||
declare UPDATEAUTO=""
|
declare UPDATEAUTO=""
|
||||||
declare -i CLEARTERMINAL=1
|
declare -i CLEARTERMINAL=0
|
||||||
|
|
||||||
declare IMAGEGENERICSERVER="opennel/server_generic_debian_stretch_x86_64"
|
declare IMAGEGENERICSERVER="opennel/server_generic_debian_stretch_x86_64"
|
||||||
declare IMAGEKHANATSERVER="opennel/servercontainer_debian_stretch_x86_64"
|
declare IMAGEKHANATSERVER="opennel/servercontainer_debian_stretch_x86_64"
|
||||||
|
@ -90,15 +90,12 @@ options:
|
||||||
--khanat-client-data-dir=[DIR] : localization khanat-client-data
|
--khanat-client-data-dir=[DIR] : localization khanat-client-data
|
||||||
--opennel-code-dir=[DIR] : localization opennel-code
|
--opennel-code-dir=[DIR] : localization opennel-code
|
||||||
--pymanager-dir=[DIR] : localization pymanager
|
--pymanager-dir=[DIR] : localization pymanager
|
||||||
--start-khanat-with-screen : start with screen
|
--start-khanat-with-screen : start with screen
|
||||||
--start-khanat-with-khanat-log : start server khanat and show khanat log
|
--start-bash : start server khanat and launch bash
|
||||||
--start-khanat-with-full-log : start server khanat and show full log
|
--start-with-manager : start khanat with manager (default)
|
||||||
--start-khanat-with-watch-state : start server khanat and show state (loop)
|
|
||||||
--start-khanat-with-watch-state-nagios : start server khanat and show state [nagios format] (loop)
|
|
||||||
--start-khanat-with-bash-after : start server khanat and launch bash
|
|
||||||
--start-with-manager : start khanat with manager (default)
|
|
||||||
--ssh : connect on khanat server (with ssh) [Exclusive action, can't execute other action]
|
--ssh : connect on khanat server (with ssh) [Exclusive action, can't execute other action]
|
||||||
--client-version=[INTEGER] : version client khanat (we need to communicate with our server)
|
--client-version=[INTEGER] : version client khanat (we need to communicate with our server)
|
||||||
|
--clear-terminal : clear terminal when script finished
|
||||||
|
|
||||||
Example :
|
Example :
|
||||||
cd [root Khanat directory]
|
cd [root Khanat directory]
|
||||||
|
@ -189,38 +186,15 @@ do
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
--start-khanat-with-screen)
|
--start-khanat-with-screen)
|
||||||
METHODSTARTSERVER="--start-khanat-with-screen"
|
METHODSTARTSERVER="--screen"
|
||||||
CLEARTERMINAL=1
|
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
--start-khanat-with-khanat-log)
|
--start-bash)
|
||||||
METHODSTARTSERVER="--show-khanat-log"
|
METHODSTARTSERVER="--bash"
|
||||||
CLEARTERMINAL=1
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
--start-khanat-with-full-log)
|
|
||||||
METHODSTARTSERVER="--show-all-log"
|
|
||||||
CLEARTERMINAL=1
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
--start-khanat-with-watch-state)
|
|
||||||
METHODSTARTSERVER="--show-status"
|
|
||||||
CLEARTERMINAL=1
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
--start-khanat-with-watch-state-nagios)
|
|
||||||
METHODSTARTSERVER="--show-status-nagios"
|
|
||||||
CLEARTERMINAL=1
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
--start-khanat-with-bash-after)
|
|
||||||
METHODSTARTSERVER="--bash-after-start"
|
|
||||||
CLEARTERMINAL=1
|
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
--start-with-manager)
|
--start-with-manager)
|
||||||
METHODSTARTSERVER="--start-with-manager"
|
METHODSTARTSERVER="--opennel-manager"
|
||||||
CLEARTERMINAL=0
|
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
--client-version*)
|
--client-version*)
|
||||||
|
@ -259,6 +233,9 @@ do
|
||||||
DOCKERRUNOPT="$DOCKERRUNOPT ${1#*=}"
|
DOCKERRUNOPT="$DOCKERRUNOPT ${1#*=}"
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
|
--clear-terminal)
|
||||||
|
CLEARTERMINAL=1
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
msg_error "[$(basename $0):$LINENO] options '$1' not recognize"
|
msg_error "[$(basename $0):$LINENO] options '$1' not recognize"
|
||||||
usage
|
usage
|
||||||
|
|
Loading…
Reference in a new issue