Khaganat-NeL/khanat-server-docker-NeL
Khaganat-NeL/khanat-server-docker-NeL
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

change default method (now start with opennel-manager)

Browse source
This commit is contained in:
Jean Sorgemoel 2018-08-16 19:29:39 +02:00
parent 693067feec
commit 7d3165c320
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -44,7 +44,7 @@ Linux server build:
- (cd /opt/download ; $WORKDIR/server/common/download_artefacts.sh 'https://git.khaganat.net' 'khaganat' 'mmorpg_khanat/opennel-pymanager' $CI_COMMIT_REF_NAME 'develop' 'master') - (cd /opt/download ; $WORKDIR/server/common/download_artefacts.sh 'https://git.khaganat.net' 'khaganat' 'mmorpg_khanat/opennel-pymanager' $CI_COMMIT_REF_NAME 'develop' 'master')
- ls -l /opt/download - ls -l /opt/download
- mkdir -p /opt/artefacts - mkdir -p /opt/artefacts
- (cd /opt/artefacts ; for file in /opt/download/khanat-server-debian_strech*.zip ; do echo "extract $file"; unzip -q -o $file; done) - (cd /opt/artefacts ; for file in /opt/download/khanat-server_static-debian_strech*.zip ; do echo "extract $file"; unzip -q -o $file; done)
- (cd /opt/artefacts ; for file in /opt/download/khanat-client_static-debian_amd64_strech*.zip ; do echo "extract $file"; unzip -q -o $file; done) - (cd /opt/artefacts ; for file in /opt/download/khanat-client_static-debian_amd64_strech*.zip ; do echo "extract $file"; unzip -q -o $file; done)
- (cd /opt/artefacts ; for file in /opt/download/khanat-*pymanager*.zip ; do echo "extract $file"; unzip -q -o $file; done) - (cd /opt/artefacts ; for file in /opt/download/khanat-*pymanager*.zip ; do echo "extract $file"; unzip -q -o $file; done)
- mkdir -p /opt/ext - mkdir -p /opt/ext

2
server/debian/common/servercontainer_launch_auto.sh
View file

@ -311,7 +311,7 @@ then
tail -n+0 -f /home/gameserver/log/apache2/* /home/gameserver/log/mysql/* /home/gameserver/log/khanat/* tail -n+0 -f /home/gameserver/log/apache2/* /home/gameserver/log/mysql/* /home/gameserver/log/khanat/*
elif [[ $METHOD_START -eq 4 ]] elif [[ $METHOD_START -eq 4 ]]
then then
msg_debug "start with " msg_debug "start with status"
/opt/ext/servercontainer_launch_service.sh /opt/ext/servercontainer_launch_service.sh
sleep 10 sleep 10
watch /opt/ext/servercontainer_launch_status.sh --no-color watch /opt/ext/servercontainer_launch_status.sh --no-color

6
server/debian/stretch/x86_64/server-container.sh
View file

@ -33,7 +33,7 @@ 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-khanat-with-screen" declare METHODSTARTSERVER="--start-with-manager"
declare -i CLEANIMAGENONE=0 declare -i CLEANIMAGENONE=0
declare DOCKERBUILDOPT="" declare DOCKERBUILDOPT=""
declare DOCKERRUNOPT="" declare DOCKERRUNOPT=""
@ -90,13 +90,13 @@ 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-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-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 : 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-watch-state-nagios : start server khanat and show state [nagios format] (loop)
--start-khanat-with-bash-after : start server khanat and launch bash --start-khanat-with-bash-after : start server khanat and launch bash
--start-with-manager : start khanat with manager --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)