Merge branch 'develop' of ssh://git.khaganat.net:3543/khaganat/mmorpg_khanat/khanat-server-docker into develop

.gitlab-ci.yml

@@ -99,11 +99,11 @@ Linux server build:
     - for dir in /home/* ; do if [ $dir != '/home/gameserver' ] ; then option="$option --exclude=$dir" ; fi ; done
     - echo "option '$option'"
     - find /home/gameserver -type d -exec du -sh {} \;
-    - tar --numeric-owner --exclude=.git --exclude=.dockerenv --exclude=/proc --exclude=/sys --exclude=/builds --exclude=/opt/download --exclude=khanat-debian-server.tar.gz $option -cjf khanat-debian-server.tar.gz /
-    - ls -lh khanat-debian-server.tar.gz
+    - tar --numeric-owner --exclude=.git --exclude=.dockerenv --exclude=/proc --exclude=/sys --exclude=/builds --exclude=/opt/download --exclude=khanat-debian-server.tar.gz $option -czf khanat-debian-server.tar.gz /
+    - ls -lh khanat-debian-server.*
   artifacts:
     name: "khanat-$(echo $CI_BUILD_REF | head -c 7 )-$CI_PIPELINE_ID-server-debian-stretch"
     paths:
-      - khanat-debian-server.tar.gz
+      - khanat-debian-server.tar.bz2
     expire_in: 2 hour
 

server/common/rootweb/index.php

@@ -86,6 +86,7 @@ print "SERVER IP: ". getHostByName(gethostname());
    <div>
     script to download and convert launcher on our instance:
     <a href="/prepare_environment_container_64.sh">prepare_environment_container_64.sh</a>
+    aned after execute it.
    </div>
    <div>
       Account / Password