From 1c36cef3fb239419a3227fd41c0cfbb707cc24dc Mon Sep 17 00:00:00 2001
From: Hendrik Boll <hb.heboll@gmail.com>
Date: Sun, 12 May 2019 19:03:32 +0200
Subject: [PATCH] Updated files to be in compliance with testing resultUpdated
 files to be in compliance with testing results

---
 docker-compose.yml                              |   3 ++-
 docker-tmserver/.entrypoint-tmserver.sh.swp     | Bin 12288 -> 0 bytes
 .../GameData/Tracks/MatchSettings/playlist.txt  |   2 +-
 docker-xaseco/entrypoint-xaseco.sh              |   2 +-
 docker-xaseco/xaseco/config.xml                 |   2 +-
 docker-xaseco/xaseco/localdb/aseco.sql          |   1 +
 6 files changed, 6 insertions(+), 4 deletions(-)
 delete mode 100644 docker-tmserver/.entrypoint-tmserver.sh.swp

diff --git a/docker-compose.yml b/docker-compose.yml
index 812b6ca..2d8a8f5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,7 @@ services:
      - MYSQL_USER=trackmania
      - MYSQL_PASSWORD=
     volumes:
-     - /db-data:/var/lib/mysql
+     - ./db-data:/var/lib/mysql
   pma:
     image: phpmyadmin/phpmyadmin
     container_name: trackmania_phpmyadmin
@@ -50,6 +50,7 @@ services:
      - tmserver
     restart: on-failure
     environment:
+     - SERVER_SA_PASSWORD=
      - DB_HOST=db
      - DB_LOGIN=trackmania
      - DB_LOGIN_PASSWORD=
diff --git a/docker-tmserver/.entrypoint-tmserver.sh.swp b/docker-tmserver/.entrypoint-tmserver.sh.swp
deleted file mode 100644
index c249fc825570fa5e1eb9d3ca43390b069dcb79bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2Piz}S6vn4Wlm-Y?6d?{syl#R52Yb^51fjK%m4qk~PC^_4sHvjy?${n>J!^Kx
zPSUDy=fVYvTM=gj0&xJ2P>BOvL7b4dg46^5PF(nQy|LHMx&?%UKx5@+d)~g8dHc<q
zw}~>f+3nQ|Jyo1#c%5eKrSHDoxpDs~R(YN=?zg0h?YDU8Ft~+B@A9k3fUX~Udm?gc
z9U1tpX=xF4(d=0Z{kBjhI&6nhnZB*4n}2E^>tq$M3gjs;$>!(IC0l*UIZJ2mdm+!s
z+N=Ur0jq#jz$#!BunJfOtO8bn|EU6|eS*D)d%G>YzjFF{V&pSz+7GLMRlq7>6|f3e
z1*`&A0jq#jz$#!BunJfO{(}l|pRtEdGIrq(1dsp!AN~FR>%ENq41NMXf*-(F;0y2}
zcptn6E`x3GAUF*s!T0wt_BMD6ya`?b3*ZspfZrz>`xLwbt^osnyPL7kz%{T3nxF)(
z-^JJ)U=LgX3*Z6p^_`4;1U>+-gD1fRI0<eCzf2%r@Fn;Jd<+i3GvEyP<`iS^f-7JZ
zJPd9?gX`dP5bJRs*q2qnDqt0`3Rne36%Yr)BgYNfW^jycE8^Z>iz~^i$+<QM4l4Ay
zXoV{Nj`M6HQo_XF8@wfUwJ=7ihAvgO@tW1N<+cNU7)Wi3<{<I)g)cpBgum<68znDP
zb=gR+;juRy!3suQ;)c76iIY3<WfKKKj&=)$o$2cG=JxXD?#A54?#BA&R-xdInp}r=
z@_LMTqdCsAT&=#izPXegJ2j2zvAABTEU#sQNiAdi*UFXU%;<4*jOTOfE30d}8^<FW
zzHqbNnTe84V|>d?mArYf=A@?<J{2S#TajuxuY1Ot^k!3oM5AYAAT(oBv>3KpLU~9h
z(w&+%(#TMeRMg7>swa+9wA|%EhbI?9oV{eMF4;ty5vk%OXR9eS;fGUZsx+zDgz%an
zIcp*Hj&G7Lv=_;CGUh(lFq<MRi8}8Dae9*pY33#)&Nxig>EcByTqbAw%5W@K9lCVs
zJej6Y*+}E%MwtB#M`MFi*b+20s?h=RV~J-Q4WuVRIX)&!ZLalx82L|AKm6>PUv>Hl
zXU(PQN89@ip{Stg+}vYFx>jVPX^8865d;(n-W4R{Hbq?dVJkQ!^bt{94=`?jEruf*
z-0@1!IbH{z4nd(3MS3~xkjIf9O|BZfIqIlS`#kbB)j9^V&L9H<9g+$SR)E9QYKM{G
z%H%Ft_U7{Cs&?8U8jduhStijll4Y#_tYSIA{426$Zg5n!kxE^1<{y7zHoNNS4r~h%
z&BbpNug~BvhBskytv5o>hC6y3jEe!qzU0i!=g)tuS$qBRX2r0hGl~Nw{K8Rg_jWdM
z&kH-s^!Hj^o?23CBz7^~{c$?Ssj3Z+Offe_hfDrnnm7m>*y?|O*6d{cGAyvcg1EX7
z?{XRNS|CWMu8cy3YHp~@BN-b};^R79Bv%-3@EZqQSyCEPWySI9D4&d>BI9X;#{`=?
N>(-=lYaHk4{{X6`57z(y

diff --git a/docker-tmserver/tmserver/GameData/Tracks/MatchSettings/playlist.txt b/docker-tmserver/tmserver/GameData/Tracks/MatchSettings/playlist.txt
index 97627e8..c6d9ff5 100644
--- a/docker-tmserver/tmserver/GameData/Tracks/MatchSettings/playlist.txt
+++ b/docker-tmserver/tmserver/GameData/Tracks/MatchSettings/playlist.txt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <playlist>
 	<gameinfos>
-		<game_mode>0</game_mode>
+		<game_mode>1</game_mode>
 		<chat_time>10000</chat_time>
 		<finishtimeout>1</finishtimeout>
 		<allwarmupduration>0</allwarmupduration>
diff --git a/docker-xaseco/entrypoint-xaseco.sh b/docker-xaseco/entrypoint-xaseco.sh
index 1bda795..230ea0e 100755
--- a/docker-xaseco/entrypoint-xaseco.sh
+++ b/docker-xaseco/entrypoint-xaseco.sh
@@ -16,7 +16,7 @@ fi
 if [[ -z "${MASTERADMIN_LOGIN}" ]]
 then
 	echo "No ingame MasterAdmin was specified."
-	MASTERADMIN_LOGIN=""
+	MASTERADMIN_LOGIN="_placeholder_"
 fi
 if [[ -z "${SERVER_SA_PASSWORD}" ]]
 then
diff --git a/docker-xaseco/xaseco/config.xml b/docker-xaseco/xaseco/config.xml
index e695055..a35c6d0 100644
--- a/docker-xaseco/xaseco/config.xml
+++ b/docker-xaseco/xaseco/config.xml
@@ -6,7 +6,7 @@
       <!-- ipaddress can be specified to guard each login against       -->
       <!-- unauthorized use of admin commands from other IP addresses   -->
 <!-- format:
-      <tmlogin>--$MASTERADMIN_LOGIN--</tmlogin> <ipaddress></ipaddress>
+      <tmlogin>_placeholder_</tmlogin> <ipaddress></ipaddress>
 -->
     </masteradmins>
 
diff --git a/docker-xaseco/xaseco/localdb/aseco.sql b/docker-xaseco/xaseco/localdb/aseco.sql
index 3b05520..20906e9 100644
--- a/docker-xaseco/xaseco/localdb/aseco.sql
+++ b/docker-xaseco/xaseco/localdb/aseco.sql
@@ -9,6 +9,7 @@
 CREATE TABLE IF NOT EXISTS `challenges` (
   `Id` mediumint(9) NOT NULL auto_increment,
   `Uid` varchar(27) NOT NULL default '',
+  `Date` datetime NOT NULL default '1970-01-01 00:00:00',
   `Name` varchar(100) NOT NULL default '',
   `Author` varchar(30) NOT NULL default '',
   `Environment` varchar(10) NOT NULL default '',