diff --git a/server/debian/stretch/x86_64/server-container.sh b/server/debian/stretch/x86_64/server-container.sh index 88cd5bb..01ab379 100755 --- a/server/debian/stretch/x86_64/server-container.sh +++ b/server/debian/stretch/x86_64/server-container.sh @@ -33,13 +33,13 @@ declare -i CLEANCONTAINERKHANAT=0 declare -i CONNECTSSHKHANAT=0 declare -i KHANAT_CLIENT_VERSION=1 declare -i SHOWIPKHANATSERVER=0 -declare METHODSTARTSERVER="--start-with-manager" +declare METHODSTARTSERVER="--opennel-manager" declare -i CLEANIMAGENONE=0 declare DOCKERBUILDOPT="" declare DOCKERRUNOPT="" declare CONFIGUREAUTO="" declare UPDATEAUTO="" -declare -i CLEARTERMINAL=1 +declare -i CLEARTERMINAL=0 declare IMAGEGENERICSERVER="opennel/server_generic_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 --opennel-code-dir=[DIR] : localization opennel-code --pymanager-dir=[DIR] : localization pymanager - --start-khanat-with-screen : start with screen - --start-khanat-with-khanat-log : start server khanat and show khanat log - --start-khanat-with-full-log : start server khanat and show full log - --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) + --start-khanat-with-screen : start with screen + --start-bash : 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] --client-version=[INTEGER] : version client khanat (we need to communicate with our server) + --clear-terminal : clear terminal when script finished Example : cd [root Khanat directory] @@ -189,38 +186,15 @@ do shift ;; --start-khanat-with-screen) - METHODSTARTSERVER="--start-khanat-with-screen" - CLEARTERMINAL=1 + METHODSTARTSERVER="--screen" shift ;; - --start-khanat-with-khanat-log) - METHODSTARTSERVER="--show-khanat-log" - 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 + --start-bash) + METHODSTARTSERVER="--bash" shift ;; --start-with-manager) - METHODSTARTSERVER="--start-with-manager" - CLEARTERMINAL=0 + METHODSTARTSERVER="--opennel-manager" shift ;; --client-version*) @@ -259,6 +233,9 @@ do DOCKERRUNOPT="$DOCKERRUNOPT ${1#*=}" shift ;; + --clear-terminal) + CLEARTERMINAL=1 + ;; *) msg_error "[$(basename $0):$LINENO] options '$1' not recognize" usage