diff --git a/bin-templates/start b/bin-templates/start new file mode 100755 index 0000000..ede3965 --- /dev/null +++ b/bin-templates/start @@ -0,0 +1,14 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/notdoom2.wad" \ +#if defined CNEMAPS + -file "/home/zandronum/wad/cnemaps.wad" \ +#elif defined DWANGO21 + -file "/home/zandronum/wad/dwango21.wad" \ +#endif + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 diff --git a/bin-templates/start b/bin-templates/start new file mode 100755 index 0000000..ede3965 --- /dev/null +++ b/bin-templates/start @@ -0,0 +1,14 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/notdoom2.wad" \ +#if defined CNEMAPS + -file "/home/zandronum/wad/cnemaps.wad" \ +#elif defined DWANGO21 + -file "/home/zandronum/wad/dwango21.wad" \ +#endif + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 diff --git a/bin/start b/bin/start index 0a90e4e..3994780 100755 --- a/bin/start +++ b/bin/start @@ -4,7 +4,7 @@ -host \ -port 10666 \ -iwad "/home/zandronum/iwad/notdoom2.wad" \ - -file "/home/zandronum/wad/cnemaps.wad" \ + -file "/home/zandronum/wad/dwango21.wad" \ +exec "/home/zandronum/config/default.cfg" \ +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ +CrashLogs 2 diff --git a/bin-templates/start b/bin-templates/start new file mode 100755 index 0000000..ede3965 --- /dev/null +++ b/bin-templates/start @@ -0,0 +1,14 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/notdoom2.wad" \ +#if defined CNEMAPS + -file "/home/zandronum/wad/cnemaps.wad" \ +#elif defined DWANGO21 + -file "/home/zandronum/wad/dwango21.wad" \ +#endif + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 diff --git a/bin/start b/bin/start index 0a90e4e..3994780 100755 --- a/bin/start +++ b/bin/start @@ -4,7 +4,7 @@ -host \ -port 10666 \ -iwad "/home/zandronum/iwad/notdoom2.wad" \ - -file "/home/zandronum/wad/cnemaps.wad" \ + -file "/home/zandronum/wad/dwango21.wad" \ +exec "/home/zandronum/config/default.cfg" \ +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ +CrashLogs 2 diff --git a/config-templates/default.cfg b/config-templates/default.cfg new file mode 100644 index 0000000..2a90a2e --- /dev/null +++ b/config-templates/default.cfg @@ -0,0 +1,97 @@ +//game options +skill 4 +deathmatch 1 +fraglimit 20 +timelimit 10 +winlimit 0 +pointlimit 0 +duellimit 0 +sv_weaponstay true +sv_itemrespawn true +sv_coop_losekeys false +sv_coop_loseinventory false +sv_coop_loseweapons false +sv_coop_loseammo false +sv_barrelrespawn true +sv_weapondrop true +sv_nojump true +sv_nocrouch true +sv_randomcoopstarts true +sv_disallowbots true +sv_defaultdmflags false +sv_killallmonsters_percentage 95 + +//community +sv_website "https://www.mhack.io/wads/index.php" +sv_motd "CNE Doom 2 Server" +sv_hostemail mark@mhack.io + +//host settings +sv_hostname "CNE Doom Server" +sv_maxplayers 12 +sv_maxclients 12 +sv_broadcast 0 +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 +#if CNEMAPS +addmap MAP26 +addmap MAP27 +addmap MAP28 +addmap MAP29 +addmap MAP30 +addmap MAP31 +addmap MAP32 +addmap MAP33 +#endif + +//master server settings +sv_updatemaster false +sv_masterip master.zandronum.com:15300 +sv_enforcemasterbanlist true + +//logging +logfile "/home/zandronum/logs/gameplay.log" +sv_markchatlines true +sv_logfilenametimestamp true +sv_showlauncherqueries false + +//administration +sv_adminlistfile "/home/zandronum/player/adminlist.txt" +sv_banexemptionfile "/home/zandronum/player/whitelist.txt" +sv_banfile "/home/zandronum/player/banlist.txt" +sv_enforcebans true +sv_rconpassword "whocaresface" +sv_password "connect_password" +sv_joinpassword "join_password" +sv_forcejoinpassword false +sv_forcepassword false +sv_nocallvote false + +//startup map +map MAP10 diff --git a/bin-templates/start b/bin-templates/start new file mode 100755 index 0000000..ede3965 --- /dev/null +++ b/bin-templates/start @@ -0,0 +1,14 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/notdoom2.wad" \ +#if defined CNEMAPS + -file "/home/zandronum/wad/cnemaps.wad" \ +#elif defined DWANGO21 + -file "/home/zandronum/wad/dwango21.wad" \ +#endif + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 diff --git a/bin/start b/bin/start index 0a90e4e..3994780 100755 --- a/bin/start +++ b/bin/start @@ -4,7 +4,7 @@ -host \ -port 10666 \ -iwad "/home/zandronum/iwad/notdoom2.wad" \ - -file "/home/zandronum/wad/cnemaps.wad" \ + -file "/home/zandronum/wad/dwango21.wad" \ +exec "/home/zandronum/config/default.cfg" \ +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ +CrashLogs 2 diff --git a/config-templates/default.cfg b/config-templates/default.cfg new file mode 100644 index 0000000..2a90a2e --- /dev/null +++ b/config-templates/default.cfg @@ -0,0 +1,97 @@ +//game options +skill 4 +deathmatch 1 +fraglimit 20 +timelimit 10 +winlimit 0 +pointlimit 0 +duellimit 0 +sv_weaponstay true +sv_itemrespawn true +sv_coop_losekeys false +sv_coop_loseinventory false +sv_coop_loseweapons false +sv_coop_loseammo false +sv_barrelrespawn true +sv_weapondrop true +sv_nojump true +sv_nocrouch true +sv_randomcoopstarts true +sv_disallowbots true +sv_defaultdmflags false +sv_killallmonsters_percentage 95 + +//community +sv_website "https://www.mhack.io/wads/index.php" +sv_motd "CNE Doom 2 Server" +sv_hostemail mark@mhack.io + +//host settings +sv_hostname "CNE Doom Server" +sv_maxplayers 12 +sv_maxclients 12 +sv_broadcast 0 +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 +#if CNEMAPS +addmap MAP26 +addmap MAP27 +addmap MAP28 +addmap MAP29 +addmap MAP30 +addmap MAP31 +addmap MAP32 +addmap MAP33 +#endif + +//master server settings +sv_updatemaster false +sv_masterip master.zandronum.com:15300 +sv_enforcemasterbanlist true + +//logging +logfile "/home/zandronum/logs/gameplay.log" +sv_markchatlines true +sv_logfilenametimestamp true +sv_showlauncherqueries false + +//administration +sv_adminlistfile "/home/zandronum/player/adminlist.txt" +sv_banexemptionfile "/home/zandronum/player/whitelist.txt" +sv_banfile "/home/zandronum/player/banlist.txt" +sv_enforcebans true +sv_rconpassword "whocaresface" +sv_password "connect_password" +sv_joinpassword "join_password" +sv_forcejoinpassword false +sv_forcepassword false +sv_nocallvote false + +//startup map +map MAP10 diff --git a/config/default.cfg b/config/default.cfg index 8147e89..2b492d6 100644 --- a/config/default.cfg +++ b/config/default.cfg @@ -59,14 +59,6 @@ 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 false diff --git a/bin-templates/start b/bin-templates/start new file mode 100755 index 0000000..ede3965 --- /dev/null +++ b/bin-templates/start @@ -0,0 +1,14 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/notdoom2.wad" \ +#if defined CNEMAPS + -file "/home/zandronum/wad/cnemaps.wad" \ +#elif defined DWANGO21 + -file "/home/zandronum/wad/dwango21.wad" \ +#endif + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 diff --git a/bin/start b/bin/start index 0a90e4e..3994780 100755 --- a/bin/start +++ b/bin/start @@ -4,7 +4,7 @@ -host \ -port 10666 \ -iwad "/home/zandronum/iwad/notdoom2.wad" \ - -file "/home/zandronum/wad/cnemaps.wad" \ + -file "/home/zandronum/wad/dwango21.wad" \ +exec "/home/zandronum/config/default.cfg" \ +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ +CrashLogs 2 diff --git a/config-templates/default.cfg b/config-templates/default.cfg new file mode 100644 index 0000000..2a90a2e --- /dev/null +++ b/config-templates/default.cfg @@ -0,0 +1,97 @@ +//game options +skill 4 +deathmatch 1 +fraglimit 20 +timelimit 10 +winlimit 0 +pointlimit 0 +duellimit 0 +sv_weaponstay true +sv_itemrespawn true +sv_coop_losekeys false +sv_coop_loseinventory false +sv_coop_loseweapons false +sv_coop_loseammo false +sv_barrelrespawn true +sv_weapondrop true +sv_nojump true +sv_nocrouch true +sv_randomcoopstarts true +sv_disallowbots true +sv_defaultdmflags false +sv_killallmonsters_percentage 95 + +//community +sv_website "https://www.mhack.io/wads/index.php" +sv_motd "CNE Doom 2 Server" +sv_hostemail mark@mhack.io + +//host settings +sv_hostname "CNE Doom Server" +sv_maxplayers 12 +sv_maxclients 12 +sv_broadcast 0 +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 +#if CNEMAPS +addmap MAP26 +addmap MAP27 +addmap MAP28 +addmap MAP29 +addmap MAP30 +addmap MAP31 +addmap MAP32 +addmap MAP33 +#endif + +//master server settings +sv_updatemaster false +sv_masterip master.zandronum.com:15300 +sv_enforcemasterbanlist true + +//logging +logfile "/home/zandronum/logs/gameplay.log" +sv_markchatlines true +sv_logfilenametimestamp true +sv_showlauncherqueries false + +//administration +sv_adminlistfile "/home/zandronum/player/adminlist.txt" +sv_banexemptionfile "/home/zandronum/player/whitelist.txt" +sv_banfile "/home/zandronum/player/banlist.txt" +sv_enforcebans true +sv_rconpassword "whocaresface" +sv_password "connect_password" +sv_joinpassword "join_password" +sv_forcejoinpassword false +sv_forcepassword false +sv_nocallvote false + +//startup map +map MAP10 diff --git a/config/default.cfg b/config/default.cfg index 8147e89..2b492d6 100644 --- a/config/default.cfg +++ b/config/default.cfg @@ -59,14 +59,6 @@ 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 false diff --git a/update-game b/update-game index abd3e22..8515f8e 100755 --- a/update-game +++ b/update-game @@ -1,6 +1,17 @@ #!/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/ +upload=1 +if [ "$1" == "--noupload" ]; then upload=0; shift; fi -docker restart docker-doom +filepp -lc "\\NL" "$@" bin-templates/start > bin/start +filepp -lc "\\NL" "$@" config-templates/default.cfg > config/default.cfg + +chmod u+x bin/start + +if [ $upload -eq 1 ] +then + 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 +fi diff --git a/bin-templates/start b/bin-templates/start new file mode 100755 index 0000000..ede3965 --- /dev/null +++ b/bin-templates/start @@ -0,0 +1,14 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/notdoom2.wad" \ +#if defined CNEMAPS + -file "/home/zandronum/wad/cnemaps.wad" \ +#elif defined DWANGO21 + -file "/home/zandronum/wad/dwango21.wad" \ +#endif + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 diff --git a/bin/start b/bin/start index 0a90e4e..3994780 100755 --- a/bin/start +++ b/bin/start @@ -4,7 +4,7 @@ -host \ -port 10666 \ -iwad "/home/zandronum/iwad/notdoom2.wad" \ - -file "/home/zandronum/wad/cnemaps.wad" \ + -file "/home/zandronum/wad/dwango21.wad" \ +exec "/home/zandronum/config/default.cfg" \ +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ +CrashLogs 2 diff --git a/config-templates/default.cfg b/config-templates/default.cfg new file mode 100644 index 0000000..2a90a2e --- /dev/null +++ b/config-templates/default.cfg @@ -0,0 +1,97 @@ +//game options +skill 4 +deathmatch 1 +fraglimit 20 +timelimit 10 +winlimit 0 +pointlimit 0 +duellimit 0 +sv_weaponstay true +sv_itemrespawn true +sv_coop_losekeys false +sv_coop_loseinventory false +sv_coop_loseweapons false +sv_coop_loseammo false +sv_barrelrespawn true +sv_weapondrop true +sv_nojump true +sv_nocrouch true +sv_randomcoopstarts true +sv_disallowbots true +sv_defaultdmflags false +sv_killallmonsters_percentage 95 + +//community +sv_website "https://www.mhack.io/wads/index.php" +sv_motd "CNE Doom 2 Server" +sv_hostemail mark@mhack.io + +//host settings +sv_hostname "CNE Doom Server" +sv_maxplayers 12 +sv_maxclients 12 +sv_broadcast 0 +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 +#if CNEMAPS +addmap MAP26 +addmap MAP27 +addmap MAP28 +addmap MAP29 +addmap MAP30 +addmap MAP31 +addmap MAP32 +addmap MAP33 +#endif + +//master server settings +sv_updatemaster false +sv_masterip master.zandronum.com:15300 +sv_enforcemasterbanlist true + +//logging +logfile "/home/zandronum/logs/gameplay.log" +sv_markchatlines true +sv_logfilenametimestamp true +sv_showlauncherqueries false + +//administration +sv_adminlistfile "/home/zandronum/player/adminlist.txt" +sv_banexemptionfile "/home/zandronum/player/whitelist.txt" +sv_banfile "/home/zandronum/player/banlist.txt" +sv_enforcebans true +sv_rconpassword "whocaresface" +sv_password "connect_password" +sv_joinpassword "join_password" +sv_forcejoinpassword false +sv_forcepassword false +sv_nocallvote false + +//startup map +map MAP10 diff --git a/config/default.cfg b/config/default.cfg index 8147e89..2b492d6 100644 --- a/config/default.cfg +++ b/config/default.cfg @@ -59,14 +59,6 @@ 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 false diff --git a/update-game b/update-game index abd3e22..8515f8e 100755 --- a/update-game +++ b/update-game @@ -1,6 +1,17 @@ #!/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/ +upload=1 +if [ "$1" == "--noupload" ]; then upload=0; shift; fi -docker restart docker-doom +filepp -lc "\\NL" "$@" bin-templates/start > bin/start +filepp -lc "\\NL" "$@" config-templates/default.cfg > config/default.cfg + +chmod u+x bin/start + +if [ $upload -eq 1 ] +then + 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 +fi diff --git a/wad/dwango21.wad b/wad/dwango21.wad new file mode 100644 index 0000000..cfd232b --- /dev/null +++ b/wad/dwango21.wad Binary files differ