diff --git a/.gitignore b/.gitignore index 6a59872..6cb70f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# don't save our private key +mhack-www-data + # Miserable desktop garbage ## OSX Crap diff --git a/.gitignore b/.gitignore index 6a59872..6cb70f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# don't save our private key +mhack-www-data + # Miserable desktop garbage ## OSX Crap diff --git a/bin/start b/bin/start index c0bed90..0a90e4e 100755 --- a/bin/start +++ b/bin/start @@ -3,8 +3,8 @@ zandronum-server \ -host \ -port 10666 \ - -iwad "/home/zandronum/iwad/doom1.wad" \ + -iwad "/home/zandronum/iwad/notdoom2.wad" \ + -file "/home/zandronum/wad/cnemaps.wad" \ +exec "/home/zandronum/config/default.cfg" \ +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 + +CrashLogs 2 diff --git a/.gitignore b/.gitignore index 6a59872..6cb70f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# don't save our private key +mhack-www-data + # Miserable desktop garbage ## OSX Crap diff --git a/bin/start b/bin/start index c0bed90..0a90e4e 100755 --- a/bin/start +++ b/bin/start @@ -3,8 +3,8 @@ zandronum-server \ -host \ -port 10666 \ - -iwad "/home/zandronum/iwad/doom1.wad" \ + -iwad "/home/zandronum/iwad/notdoom2.wad" \ + -file "/home/zandronum/wad/cnemaps.wad" \ +exec "/home/zandronum/config/default.cfg" \ +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 + +CrashLogs 2 diff --git a/config/default.cfg b/config/default.cfg index 40e6a00..8147e89 100644 --- a/config/default.cfg +++ b/config/default.cfg @@ -1,8 +1,8 @@ //game options skill 4 -deathmatch 0 -fraglimit 0 -timelimit 0 +deathmatch 1 +fraglimit 20 +timelimit 10 winlimit 0 pointlimit 0 duellimit 0 @@ -22,25 +22,59 @@ sv_killallmonsters_percentage 95 //community -sv_website "https://github.com/mccarrmb/docker-doom" -sv_motd "Docker-Doom" -sv_hostemail admin@your-domain.com +sv_website "https://www.mhack.io/wads/index.php" +sv_motd "CNE Doom 2 Server" +sv_hostemail mark@mhack.io //host settings -sv_hostname "Docker-Doom" +sv_hostname "CNE Doom Server" sv_maxplayers 12 sv_maxclients 12 sv_broadcast 0 -sv_maprotation false -sv_randommaprotation false +sv_maprotation true +sv_randommaprotation true + +addmap MAP01 +addmap MAP02 +addmap MAP03 +addmap MAP04 +addmap MAP05 +addmap MAP06 +addmap MAP07 +addmap MAP08 +addmap MAP09 +addmap MAP10 +addmap MAP11 +addmap MAP12 +addmap MAP13 +addmap MAP14 +addmap MAP15 +addmap MAP16 +addmap MAP17 +addmap MAP18 +addmap MAP19 +addmap MAP20 +addmap MAP21 +addmap MAP22 +addmap MAP23 +addmap MAP24 +addmap MAP25 +addmap MAP26 +addmap MAP27 +addmap MAP28 +addmap MAP29 +addmap MAP30 +addmap MAP31 +addmap MAP32 +addmap MAP33 //master server settings -sv_updatemaster true +sv_updatemaster false sv_masterip master.zandronum.com:15300 sv_enforcemasterbanlist true //logging -logfile "/home/zandronum/log/gameplay.log" +logfile "/home/zandronum/logs/gameplay.log" sv_markchatlines true sv_logfilenametimestamp true sv_showlauncherqueries false @@ -50,7 +84,7 @@ sv_banexemptionfile "/home/zandronum/player/whitelist.txt" sv_banfile "/home/zandronum/player/banlist.txt" sv_enforcebans true -sv_rconpassword "rcon_password" +sv_rconpassword "whocaresface" sv_password "connect_password" sv_joinpassword "join_password" sv_forcejoinpassword false @@ -58,4 +92,4 @@ sv_nocallvote false //startup map -map E1M1 +map MAP10 diff --git a/.gitignore b/.gitignore index 6a59872..6cb70f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# don't save our private key +mhack-www-data + # Miserable desktop garbage ## OSX Crap diff --git a/bin/start b/bin/start index c0bed90..0a90e4e 100755 --- a/bin/start +++ b/bin/start @@ -3,8 +3,8 @@ zandronum-server \ -host \ -port 10666 \ - -iwad "/home/zandronum/iwad/doom1.wad" \ + -iwad "/home/zandronum/iwad/notdoom2.wad" \ + -file "/home/zandronum/wad/cnemaps.wad" \ +exec "/home/zandronum/config/default.cfg" \ +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 + +CrashLogs 2 diff --git a/config/default.cfg b/config/default.cfg index 40e6a00..8147e89 100644 --- a/config/default.cfg +++ b/config/default.cfg @@ -1,8 +1,8 @@ //game options skill 4 -deathmatch 0 -fraglimit 0 -timelimit 0 +deathmatch 1 +fraglimit 20 +timelimit 10 winlimit 0 pointlimit 0 duellimit 0 @@ -22,25 +22,59 @@ sv_killallmonsters_percentage 95 //community -sv_website "https://github.com/mccarrmb/docker-doom" -sv_motd "Docker-Doom" -sv_hostemail admin@your-domain.com +sv_website "https://www.mhack.io/wads/index.php" +sv_motd "CNE Doom 2 Server" +sv_hostemail mark@mhack.io //host settings -sv_hostname "Docker-Doom" +sv_hostname "CNE Doom Server" sv_maxplayers 12 sv_maxclients 12 sv_broadcast 0 -sv_maprotation false -sv_randommaprotation false +sv_maprotation true +sv_randommaprotation true + +addmap MAP01 +addmap MAP02 +addmap MAP03 +addmap MAP04 +addmap MAP05 +addmap MAP06 +addmap MAP07 +addmap MAP08 +addmap MAP09 +addmap MAP10 +addmap MAP11 +addmap MAP12 +addmap MAP13 +addmap MAP14 +addmap MAP15 +addmap MAP16 +addmap MAP17 +addmap MAP18 +addmap MAP19 +addmap MAP20 +addmap MAP21 +addmap MAP22 +addmap MAP23 +addmap MAP24 +addmap MAP25 +addmap MAP26 +addmap MAP27 +addmap MAP28 +addmap MAP29 +addmap MAP30 +addmap MAP31 +addmap MAP32 +addmap MAP33 //master server settings -sv_updatemaster true +sv_updatemaster false sv_masterip master.zandronum.com:15300 sv_enforcemasterbanlist true //logging -logfile "/home/zandronum/log/gameplay.log" +logfile "/home/zandronum/logs/gameplay.log" sv_markchatlines true sv_logfilenametimestamp true sv_showlauncherqueries false @@ -50,7 +84,7 @@ sv_banexemptionfile "/home/zandronum/player/whitelist.txt" sv_banfile "/home/zandronum/player/banlist.txt" sv_enforcebans true -sv_rconpassword "rcon_password" +sv_rconpassword "whocaresface" sv_password "connect_password" sv_joinpassword "join_password" sv_forcejoinpassword false @@ -58,4 +92,4 @@ sv_nocallvote false //startup map -map E1M1 +map MAP10 diff --git a/iwad/.gitignore b/iwad/.gitignore index 99f5d32..751553b 100644 --- a/iwad/.gitignore +++ b/iwad/.gitignore @@ -1,43 +1 @@ -# Commercial IWADs that should never be uploaded or I'll get sued - -# Doom -doom.wad -DOOM.WAD -doomu.wad -DOOMU.WAD -bfgdoom.wad -doombfg.wad - -# Doom II -doom2.wad -DOOM2.WAD -bfgdoom2.wad -doom2bfg.wad -doom2f.wad -DOOM2F.WAD - -# Final Doom -tnt.wad -TNT.WAD -plutonia.wad -PLUTONIA.WAD - -# Heretic -heretic.wad -HERETIC.WAD -hereticsr.wad -HERETICSR.WAD - -# Hexen -hexen.wad -HEXEN.WAD -hexendd.wad -HEXENDD.WAD - -# Strife -strife1.wad -STRIFE1.WAD -strife.wad -STRIFE.WAD -sve.wad - +*.bak diff --git a/.gitignore b/.gitignore index 6a59872..6cb70f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# don't save our private key +mhack-www-data + # Miserable desktop garbage ## OSX Crap diff --git a/bin/start b/bin/start index c0bed90..0a90e4e 100755 --- a/bin/start +++ b/bin/start @@ -3,8 +3,8 @@ zandronum-server \ -host \ -port 10666 \ - -iwad "/home/zandronum/iwad/doom1.wad" \ + -iwad "/home/zandronum/iwad/notdoom2.wad" \ + -file "/home/zandronum/wad/cnemaps.wad" \ +exec "/home/zandronum/config/default.cfg" \ +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 + +CrashLogs 2 diff --git a/config/default.cfg b/config/default.cfg index 40e6a00..8147e89 100644 --- a/config/default.cfg +++ b/config/default.cfg @@ -1,8 +1,8 @@ //game options skill 4 -deathmatch 0 -fraglimit 0 -timelimit 0 +deathmatch 1 +fraglimit 20 +timelimit 10 winlimit 0 pointlimit 0 duellimit 0 @@ -22,25 +22,59 @@ sv_killallmonsters_percentage 95 //community -sv_website "https://github.com/mccarrmb/docker-doom" -sv_motd "Docker-Doom" -sv_hostemail admin@your-domain.com +sv_website "https://www.mhack.io/wads/index.php" +sv_motd "CNE Doom 2 Server" +sv_hostemail mark@mhack.io //host settings -sv_hostname "Docker-Doom" +sv_hostname "CNE Doom Server" sv_maxplayers 12 sv_maxclients 12 sv_broadcast 0 -sv_maprotation false -sv_randommaprotation false +sv_maprotation true +sv_randommaprotation true + +addmap MAP01 +addmap MAP02 +addmap MAP03 +addmap MAP04 +addmap MAP05 +addmap MAP06 +addmap MAP07 +addmap MAP08 +addmap MAP09 +addmap MAP10 +addmap MAP11 +addmap MAP12 +addmap MAP13 +addmap MAP14 +addmap MAP15 +addmap MAP16 +addmap MAP17 +addmap MAP18 +addmap MAP19 +addmap MAP20 +addmap MAP21 +addmap MAP22 +addmap MAP23 +addmap MAP24 +addmap MAP25 +addmap MAP26 +addmap MAP27 +addmap MAP28 +addmap MAP29 +addmap MAP30 +addmap MAP31 +addmap MAP32 +addmap MAP33 //master server settings -sv_updatemaster true +sv_updatemaster false sv_masterip master.zandronum.com:15300 sv_enforcemasterbanlist true //logging -logfile "/home/zandronum/log/gameplay.log" +logfile "/home/zandronum/logs/gameplay.log" sv_markchatlines true sv_logfilenametimestamp true sv_showlauncherqueries false @@ -50,7 +84,7 @@ sv_banexemptionfile "/home/zandronum/player/whitelist.txt" sv_banfile "/home/zandronum/player/banlist.txt" sv_enforcebans true -sv_rconpassword "rcon_password" +sv_rconpassword "whocaresface" sv_password "connect_password" sv_joinpassword "join_password" sv_forcejoinpassword false @@ -58,4 +92,4 @@ sv_nocallvote false //startup map -map E1M1 +map MAP10 diff --git a/iwad/.gitignore b/iwad/.gitignore index 99f5d32..751553b 100644 --- a/iwad/.gitignore +++ b/iwad/.gitignore @@ -1,43 +1 @@ -# Commercial IWADs that should never be uploaded or I'll get sued - -# Doom -doom.wad -DOOM.WAD -doomu.wad -DOOMU.WAD -bfgdoom.wad -doombfg.wad - -# Doom II -doom2.wad -DOOM2.WAD -bfgdoom2.wad -doom2bfg.wad -doom2f.wad -DOOM2F.WAD - -# Final Doom -tnt.wad -TNT.WAD -plutonia.wad -PLUTONIA.WAD - -# Heretic -heretic.wad -HERETIC.WAD -hereticsr.wad -HERETICSR.WAD - -# Hexen -hexen.wad -HEXEN.WAD -hexendd.wad -HEXENDD.WAD - -# Strife -strife1.wad -STRIFE1.WAD -strife.wad -STRIFE.WAD -sve.wad - +*.bak diff --git a/iwad/DOOM.WAD b/iwad/DOOM.WAD new file mode 100644 index 0000000..6e1700a --- /dev/null +++ b/iwad/DOOM.WAD Binary files differ diff --git a/.gitignore b/.gitignore index 6a59872..6cb70f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# don't save our private key +mhack-www-data + # Miserable desktop garbage ## OSX Crap diff --git a/bin/start b/bin/start index c0bed90..0a90e4e 100755 --- a/bin/start +++ b/bin/start @@ -3,8 +3,8 @@ zandronum-server \ -host \ -port 10666 \ - -iwad "/home/zandronum/iwad/doom1.wad" \ + -iwad "/home/zandronum/iwad/notdoom2.wad" \ + -file "/home/zandronum/wad/cnemaps.wad" \ +exec "/home/zandronum/config/default.cfg" \ +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 + +CrashLogs 2 diff --git a/config/default.cfg b/config/default.cfg index 40e6a00..8147e89 100644 --- a/config/default.cfg +++ b/config/default.cfg @@ -1,8 +1,8 @@ //game options skill 4 -deathmatch 0 -fraglimit 0 -timelimit 0 +deathmatch 1 +fraglimit 20 +timelimit 10 winlimit 0 pointlimit 0 duellimit 0 @@ -22,25 +22,59 @@ sv_killallmonsters_percentage 95 //community -sv_website "https://github.com/mccarrmb/docker-doom" -sv_motd "Docker-Doom" -sv_hostemail admin@your-domain.com +sv_website "https://www.mhack.io/wads/index.php" +sv_motd "CNE Doom 2 Server" +sv_hostemail mark@mhack.io //host settings -sv_hostname "Docker-Doom" +sv_hostname "CNE Doom Server" sv_maxplayers 12 sv_maxclients 12 sv_broadcast 0 -sv_maprotation false -sv_randommaprotation false +sv_maprotation true +sv_randommaprotation true + +addmap MAP01 +addmap MAP02 +addmap MAP03 +addmap MAP04 +addmap MAP05 +addmap MAP06 +addmap MAP07 +addmap MAP08 +addmap MAP09 +addmap MAP10 +addmap MAP11 +addmap MAP12 +addmap MAP13 +addmap MAP14 +addmap MAP15 +addmap MAP16 +addmap MAP17 +addmap MAP18 +addmap MAP19 +addmap MAP20 +addmap MAP21 +addmap MAP22 +addmap MAP23 +addmap MAP24 +addmap MAP25 +addmap MAP26 +addmap MAP27 +addmap MAP28 +addmap MAP29 +addmap MAP30 +addmap MAP31 +addmap MAP32 +addmap MAP33 //master server settings -sv_updatemaster true +sv_updatemaster false sv_masterip master.zandronum.com:15300 sv_enforcemasterbanlist true //logging -logfile "/home/zandronum/log/gameplay.log" +logfile "/home/zandronum/logs/gameplay.log" sv_markchatlines true sv_logfilenametimestamp true sv_showlauncherqueries false @@ -50,7 +84,7 @@ sv_banexemptionfile "/home/zandronum/player/whitelist.txt" sv_banfile "/home/zandronum/player/banlist.txt" sv_enforcebans true -sv_rconpassword "rcon_password" +sv_rconpassword "whocaresface" sv_password "connect_password" sv_joinpassword "join_password" sv_forcejoinpassword false @@ -58,4 +92,4 @@ sv_nocallvote false //startup map -map E1M1 +map MAP10 diff --git a/iwad/.gitignore b/iwad/.gitignore index 99f5d32..751553b 100644 --- a/iwad/.gitignore +++ b/iwad/.gitignore @@ -1,43 +1 @@ -# Commercial IWADs that should never be uploaded or I'll get sued - -# Doom -doom.wad -DOOM.WAD -doomu.wad -DOOMU.WAD -bfgdoom.wad -doombfg.wad - -# Doom II -doom2.wad -DOOM2.WAD -bfgdoom2.wad -doom2bfg.wad -doom2f.wad -DOOM2F.WAD - -# Final Doom -tnt.wad -TNT.WAD -plutonia.wad -PLUTONIA.WAD - -# Heretic -heretic.wad -HERETIC.WAD -hereticsr.wad -HERETICSR.WAD - -# Hexen -hexen.wad -HEXEN.WAD -hexendd.wad -HEXENDD.WAD - -# Strife -strife1.wad -STRIFE1.WAD -strife.wad -STRIFE.WAD -sve.wad - +*.bak diff --git a/iwad/DOOM.WAD b/iwad/DOOM.WAD new file mode 100644 index 0000000..6e1700a --- /dev/null +++ b/iwad/DOOM.WAD Binary files differ diff --git a/iwad/notdoom2.wad b/iwad/notdoom2.wad new file mode 100644 index 0000000..a73d027 --- /dev/null +++ b/iwad/notdoom2.wad Binary files differ diff --git a/.gitignore b/.gitignore index 6a59872..6cb70f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# don't save our private key +mhack-www-data + # Miserable desktop garbage ## OSX Crap diff --git a/bin/start b/bin/start index c0bed90..0a90e4e 100755 --- a/bin/start +++ b/bin/start @@ -3,8 +3,8 @@ zandronum-server \ -host \ -port 10666 \ - -iwad "/home/zandronum/iwad/doom1.wad" \ + -iwad "/home/zandronum/iwad/notdoom2.wad" \ + -file "/home/zandronum/wad/cnemaps.wad" \ +exec "/home/zandronum/config/default.cfg" \ +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 + +CrashLogs 2 diff --git a/config/default.cfg b/config/default.cfg index 40e6a00..8147e89 100644 --- a/config/default.cfg +++ b/config/default.cfg @@ -1,8 +1,8 @@ //game options skill 4 -deathmatch 0 -fraglimit 0 -timelimit 0 +deathmatch 1 +fraglimit 20 +timelimit 10 winlimit 0 pointlimit 0 duellimit 0 @@ -22,25 +22,59 @@ sv_killallmonsters_percentage 95 //community -sv_website "https://github.com/mccarrmb/docker-doom" -sv_motd "Docker-Doom" -sv_hostemail admin@your-domain.com +sv_website "https://www.mhack.io/wads/index.php" +sv_motd "CNE Doom 2 Server" +sv_hostemail mark@mhack.io //host settings -sv_hostname "Docker-Doom" +sv_hostname "CNE Doom Server" sv_maxplayers 12 sv_maxclients 12 sv_broadcast 0 -sv_maprotation false -sv_randommaprotation false +sv_maprotation true +sv_randommaprotation true + +addmap MAP01 +addmap MAP02 +addmap MAP03 +addmap MAP04 +addmap MAP05 +addmap MAP06 +addmap MAP07 +addmap MAP08 +addmap MAP09 +addmap MAP10 +addmap MAP11 +addmap MAP12 +addmap MAP13 +addmap MAP14 +addmap MAP15 +addmap MAP16 +addmap MAP17 +addmap MAP18 +addmap MAP19 +addmap MAP20 +addmap MAP21 +addmap MAP22 +addmap MAP23 +addmap MAP24 +addmap MAP25 +addmap MAP26 +addmap MAP27 +addmap MAP28 +addmap MAP29 +addmap MAP30 +addmap MAP31 +addmap MAP32 +addmap MAP33 //master server settings -sv_updatemaster true +sv_updatemaster false sv_masterip master.zandronum.com:15300 sv_enforcemasterbanlist true //logging -logfile "/home/zandronum/log/gameplay.log" +logfile "/home/zandronum/logs/gameplay.log" sv_markchatlines true sv_logfilenametimestamp true sv_showlauncherqueries false @@ -50,7 +84,7 @@ sv_banexemptionfile "/home/zandronum/player/whitelist.txt" sv_banfile "/home/zandronum/player/banlist.txt" sv_enforcebans true -sv_rconpassword "rcon_password" +sv_rconpassword "whocaresface" sv_password "connect_password" sv_joinpassword "join_password" sv_forcejoinpassword false @@ -58,4 +92,4 @@ sv_nocallvote false //startup map -map E1M1 +map MAP10 diff --git a/iwad/.gitignore b/iwad/.gitignore index 99f5d32..751553b 100644 --- a/iwad/.gitignore +++ b/iwad/.gitignore @@ -1,43 +1 @@ -# Commercial IWADs that should never be uploaded or I'll get sued - -# Doom -doom.wad -DOOM.WAD -doomu.wad -DOOMU.WAD -bfgdoom.wad -doombfg.wad - -# Doom II -doom2.wad -DOOM2.WAD -bfgdoom2.wad -doom2bfg.wad -doom2f.wad -DOOM2F.WAD - -# Final Doom -tnt.wad -TNT.WAD -plutonia.wad -PLUTONIA.WAD - -# Heretic -heretic.wad -HERETIC.WAD -hereticsr.wad -HERETICSR.WAD - -# Hexen -hexen.wad -HEXEN.WAD -hexendd.wad -HEXENDD.WAD - -# Strife -strife1.wad -STRIFE1.WAD -strife.wad -STRIFE.WAD -sve.wad - +*.bak diff --git a/iwad/DOOM.WAD b/iwad/DOOM.WAD new file mode 100644 index 0000000..6e1700a --- /dev/null +++ b/iwad/DOOM.WAD Binary files differ diff --git a/iwad/notdoom2.wad b/iwad/notdoom2.wad new file mode 100644 index 0000000..a73d027 --- /dev/null +++ b/iwad/notdoom2.wad Binary files differ diff --git a/update-game b/update-game new file mode 100755 index 0000000..abd3e22 --- /dev/null +++ b/update-game @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +rsync -avze "ssh -i mhack-www-data -o StrictHostKeyChecking=no" wad/*.WAD wad/*.wad iwad/*.WAD iwad/*.wad www-data@mhack.io:/var/www/html/wads/ +rsync -va --delete --include='*/' --exclude='*.bak' --exclude '*git*' --exclude='*~' --exclude='*fuse*' wad iwad bin config player /mnt/user/appdata/docker-doom/ + +docker restart docker-doom diff --git a/.gitignore b/.gitignore index 6a59872..6cb70f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# don't save our private key +mhack-www-data + # Miserable desktop garbage ## OSX Crap diff --git a/bin/start b/bin/start index c0bed90..0a90e4e 100755 --- a/bin/start +++ b/bin/start @@ -3,8 +3,8 @@ zandronum-server \ -host \ -port 10666 \ - -iwad "/home/zandronum/iwad/doom1.wad" \ + -iwad "/home/zandronum/iwad/notdoom2.wad" \ + -file "/home/zandronum/wad/cnemaps.wad" \ +exec "/home/zandronum/config/default.cfg" \ +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 + +CrashLogs 2 diff --git a/config/default.cfg b/config/default.cfg index 40e6a00..8147e89 100644 --- a/config/default.cfg +++ b/config/default.cfg @@ -1,8 +1,8 @@ //game options skill 4 -deathmatch 0 -fraglimit 0 -timelimit 0 +deathmatch 1 +fraglimit 20 +timelimit 10 winlimit 0 pointlimit 0 duellimit 0 @@ -22,25 +22,59 @@ sv_killallmonsters_percentage 95 //community -sv_website "https://github.com/mccarrmb/docker-doom" -sv_motd "Docker-Doom" -sv_hostemail admin@your-domain.com +sv_website "https://www.mhack.io/wads/index.php" +sv_motd "CNE Doom 2 Server" +sv_hostemail mark@mhack.io //host settings -sv_hostname "Docker-Doom" +sv_hostname "CNE Doom Server" sv_maxplayers 12 sv_maxclients 12 sv_broadcast 0 -sv_maprotation false -sv_randommaprotation false +sv_maprotation true +sv_randommaprotation true + +addmap MAP01 +addmap MAP02 +addmap MAP03 +addmap MAP04 +addmap MAP05 +addmap MAP06 +addmap MAP07 +addmap MAP08 +addmap MAP09 +addmap MAP10 +addmap MAP11 +addmap MAP12 +addmap MAP13 +addmap MAP14 +addmap MAP15 +addmap MAP16 +addmap MAP17 +addmap MAP18 +addmap MAP19 +addmap MAP20 +addmap MAP21 +addmap MAP22 +addmap MAP23 +addmap MAP24 +addmap MAP25 +addmap MAP26 +addmap MAP27 +addmap MAP28 +addmap MAP29 +addmap MAP30 +addmap MAP31 +addmap MAP32 +addmap MAP33 //master server settings -sv_updatemaster true +sv_updatemaster false sv_masterip master.zandronum.com:15300 sv_enforcemasterbanlist true //logging -logfile "/home/zandronum/log/gameplay.log" +logfile "/home/zandronum/logs/gameplay.log" sv_markchatlines true sv_logfilenametimestamp true sv_showlauncherqueries false @@ -50,7 +84,7 @@ sv_banexemptionfile "/home/zandronum/player/whitelist.txt" sv_banfile "/home/zandronum/player/banlist.txt" sv_enforcebans true -sv_rconpassword "rcon_password" +sv_rconpassword "whocaresface" sv_password "connect_password" sv_joinpassword "join_password" sv_forcejoinpassword false @@ -58,4 +92,4 @@ sv_nocallvote false //startup map -map E1M1 +map MAP10 diff --git a/iwad/.gitignore b/iwad/.gitignore index 99f5d32..751553b 100644 --- a/iwad/.gitignore +++ b/iwad/.gitignore @@ -1,43 +1 @@ -# Commercial IWADs that should never be uploaded or I'll get sued - -# Doom -doom.wad -DOOM.WAD -doomu.wad -DOOMU.WAD -bfgdoom.wad -doombfg.wad - -# Doom II -doom2.wad -DOOM2.WAD -bfgdoom2.wad -doom2bfg.wad -doom2f.wad -DOOM2F.WAD - -# Final Doom -tnt.wad -TNT.WAD -plutonia.wad -PLUTONIA.WAD - -# Heretic -heretic.wad -HERETIC.WAD -hereticsr.wad -HERETICSR.WAD - -# Hexen -hexen.wad -HEXEN.WAD -hexendd.wad -HEXENDD.WAD - -# Strife -strife1.wad -STRIFE1.WAD -strife.wad -STRIFE.WAD -sve.wad - +*.bak diff --git a/iwad/DOOM.WAD b/iwad/DOOM.WAD new file mode 100644 index 0000000..6e1700a --- /dev/null +++ b/iwad/DOOM.WAD Binary files differ diff --git a/iwad/notdoom2.wad b/iwad/notdoom2.wad new file mode 100644 index 0000000..a73d027 --- /dev/null +++ b/iwad/notdoom2.wad Binary files differ diff --git a/update-game b/update-game new file mode 100755 index 0000000..abd3e22 --- /dev/null +++ b/update-game @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +rsync -avze "ssh -i mhack-www-data -o StrictHostKeyChecking=no" wad/*.WAD wad/*.wad iwad/*.WAD iwad/*.wad www-data@mhack.io:/var/www/html/wads/ +rsync -va --delete --include='*/' --exclude='*.bak' --exclude '*git*' --exclude='*~' --exclude='*fuse*' wad iwad bin config player /mnt/user/appdata/docker-doom/ + +docker restart docker-doom diff --git a/wad/CNEMAPS.WAD b/wad/CNEMAPS.WAD deleted file mode 100644 index 3563e1e..0000000 --- a/wad/CNEMAPS.WAD +++ /dev/null Binary files differ diff --git a/.gitignore b/.gitignore index 6a59872..6cb70f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# don't save our private key +mhack-www-data + # Miserable desktop garbage ## OSX Crap diff --git a/bin/start b/bin/start index c0bed90..0a90e4e 100755 --- a/bin/start +++ b/bin/start @@ -3,8 +3,8 @@ zandronum-server \ -host \ -port 10666 \ - -iwad "/home/zandronum/iwad/doom1.wad" \ + -iwad "/home/zandronum/iwad/notdoom2.wad" \ + -file "/home/zandronum/wad/cnemaps.wad" \ +exec "/home/zandronum/config/default.cfg" \ +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 + +CrashLogs 2 diff --git a/config/default.cfg b/config/default.cfg index 40e6a00..8147e89 100644 --- a/config/default.cfg +++ b/config/default.cfg @@ -1,8 +1,8 @@ //game options skill 4 -deathmatch 0 -fraglimit 0 -timelimit 0 +deathmatch 1 +fraglimit 20 +timelimit 10 winlimit 0 pointlimit 0 duellimit 0 @@ -22,25 +22,59 @@ sv_killallmonsters_percentage 95 //community -sv_website "https://github.com/mccarrmb/docker-doom" -sv_motd "Docker-Doom" -sv_hostemail admin@your-domain.com +sv_website "https://www.mhack.io/wads/index.php" +sv_motd "CNE Doom 2 Server" +sv_hostemail mark@mhack.io //host settings -sv_hostname "Docker-Doom" +sv_hostname "CNE Doom Server" sv_maxplayers 12 sv_maxclients 12 sv_broadcast 0 -sv_maprotation false -sv_randommaprotation false +sv_maprotation true +sv_randommaprotation true + +addmap MAP01 +addmap MAP02 +addmap MAP03 +addmap MAP04 +addmap MAP05 +addmap MAP06 +addmap MAP07 +addmap MAP08 +addmap MAP09 +addmap MAP10 +addmap MAP11 +addmap MAP12 +addmap MAP13 +addmap MAP14 +addmap MAP15 +addmap MAP16 +addmap MAP17 +addmap MAP18 +addmap MAP19 +addmap MAP20 +addmap MAP21 +addmap MAP22 +addmap MAP23 +addmap MAP24 +addmap MAP25 +addmap MAP26 +addmap MAP27 +addmap MAP28 +addmap MAP29 +addmap MAP30 +addmap MAP31 +addmap MAP32 +addmap MAP33 //master server settings -sv_updatemaster true +sv_updatemaster false sv_masterip master.zandronum.com:15300 sv_enforcemasterbanlist true //logging -logfile "/home/zandronum/log/gameplay.log" +logfile "/home/zandronum/logs/gameplay.log" sv_markchatlines true sv_logfilenametimestamp true sv_showlauncherqueries false @@ -50,7 +84,7 @@ sv_banexemptionfile "/home/zandronum/player/whitelist.txt" sv_banfile "/home/zandronum/player/banlist.txt" sv_enforcebans true -sv_rconpassword "rcon_password" +sv_rconpassword "whocaresface" sv_password "connect_password" sv_joinpassword "join_password" sv_forcejoinpassword false @@ -58,4 +92,4 @@ sv_nocallvote false //startup map -map E1M1 +map MAP10 diff --git a/iwad/.gitignore b/iwad/.gitignore index 99f5d32..751553b 100644 --- a/iwad/.gitignore +++ b/iwad/.gitignore @@ -1,43 +1 @@ -# Commercial IWADs that should never be uploaded or I'll get sued - -# Doom -doom.wad -DOOM.WAD -doomu.wad -DOOMU.WAD -bfgdoom.wad -doombfg.wad - -# Doom II -doom2.wad -DOOM2.WAD -bfgdoom2.wad -doom2bfg.wad -doom2f.wad -DOOM2F.WAD - -# Final Doom -tnt.wad -TNT.WAD -plutonia.wad -PLUTONIA.WAD - -# Heretic -heretic.wad -HERETIC.WAD -hereticsr.wad -HERETICSR.WAD - -# Hexen -hexen.wad -HEXEN.WAD -hexendd.wad -HEXENDD.WAD - -# Strife -strife1.wad -STRIFE1.WAD -strife.wad -STRIFE.WAD -sve.wad - +*.bak diff --git a/iwad/DOOM.WAD b/iwad/DOOM.WAD new file mode 100644 index 0000000..6e1700a --- /dev/null +++ b/iwad/DOOM.WAD Binary files differ diff --git a/iwad/notdoom2.wad b/iwad/notdoom2.wad new file mode 100644 index 0000000..a73d027 --- /dev/null +++ b/iwad/notdoom2.wad Binary files differ diff --git a/update-game b/update-game new file mode 100755 index 0000000..abd3e22 --- /dev/null +++ b/update-game @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +rsync -avze "ssh -i mhack-www-data -o StrictHostKeyChecking=no" wad/*.WAD wad/*.wad iwad/*.WAD iwad/*.wad www-data@mhack.io:/var/www/html/wads/ +rsync -va --delete --include='*/' --exclude='*.bak' --exclude '*git*' --exclude='*~' --exclude='*fuse*' wad iwad bin config player /mnt/user/appdata/docker-doom/ + +docker restart docker-doom diff --git a/wad/CNEMAPS.WAD b/wad/CNEMAPS.WAD deleted file mode 100644 index 3563e1e..0000000 --- a/wad/CNEMAPS.WAD +++ /dev/null Binary files differ diff --git a/wad/cnemaps.wad b/wad/cnemaps.wad new file mode 100644 index 0000000..5c4b28f --- /dev/null +++ b/wad/cnemaps.wad Binary files differ