diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/builder/views/adminlist.txt.erb b/builder/views/adminlist.txt.erb deleted file mode 100644 index df3aa78..0000000 --- a/builder/views/adminlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @admin_list.nil? %> -<% @admin_list.each do |admin| %> -<%= admin.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/builder/views/adminlist.txt.erb b/builder/views/adminlist.txt.erb deleted file mode 100644 index df3aa78..0000000 --- a/builder/views/adminlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @admin_list.nil? %> -<% @admin_list.each do |admin| %> -<%= admin.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/banlist.txt.erb b/builder/views/banlist.txt.erb deleted file mode 100644 index c10a138..0000000 --- a/builder/views/banlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -93.99.233.*:capodecima - 93.99.233.6 - DDOS - June 19th 2016 - Perm -<% unless @ban_list.nil? %> -<% @ban_list.each do |ban| %> -<%= ban.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/builder/views/adminlist.txt.erb b/builder/views/adminlist.txt.erb deleted file mode 100644 index df3aa78..0000000 --- a/builder/views/adminlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @admin_list.nil? %> -<% @admin_list.each do |admin| %> -<%= admin.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/banlist.txt.erb b/builder/views/banlist.txt.erb deleted file mode 100644 index c10a138..0000000 --- a/builder/views/banlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -93.99.233.*:capodecima - 93.99.233.6 - DDOS - June 19th 2016 - Perm -<% unless @ban_list.nil? %> -<% @ban_list.each do |ban| %> -<%= ban.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/default.cfg.erb b/builder/views/default.cfg.erb deleted file mode 100644 index e69de29..0000000 --- a/builder/views/default.cfg.erb +++ /dev/null diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/builder/views/adminlist.txt.erb b/builder/views/adminlist.txt.erb deleted file mode 100644 index df3aa78..0000000 --- a/builder/views/adminlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @admin_list.nil? %> -<% @admin_list.each do |admin| %> -<%= admin.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/banlist.txt.erb b/builder/views/banlist.txt.erb deleted file mode 100644 index c10a138..0000000 --- a/builder/views/banlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -93.99.233.*:capodecima - 93.99.233.6 - DDOS - June 19th 2016 - Perm -<% unless @ban_list.nil? %> -<% @ban_list.each do |ban| %> -<%= ban.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/default.cfg.erb b/builder/views/default.cfg.erb deleted file mode 100644 index e69de29..0000000 --- a/builder/views/default.cfg.erb +++ /dev/null diff --git a/builder/views/summon.bash.erb b/builder/views/summon.bash.erb deleted file mode 100644 index 5eb9649..0000000 --- a/builder/views/summon.bash.erb +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port <%= @port.to_s %> \ - -iwad "/home/zandronum/iwads/<%= @iwad.to_s %>" \ - +exec "/home/zandronum/config/<%= @config.to_s %>" \ - +CrashLog_Dir "/home/zandronum/logs/<%= @server_name.to_s %>.log" \ - +CrashLogs 2 \ - +map <%= @start_map.to_s %> \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/builder/views/adminlist.txt.erb b/builder/views/adminlist.txt.erb deleted file mode 100644 index df3aa78..0000000 --- a/builder/views/adminlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @admin_list.nil? %> -<% @admin_list.each do |admin| %> -<%= admin.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/banlist.txt.erb b/builder/views/banlist.txt.erb deleted file mode 100644 index c10a138..0000000 --- a/builder/views/banlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -93.99.233.*:capodecima - 93.99.233.6 - DDOS - June 19th 2016 - Perm -<% unless @ban_list.nil? %> -<% @ban_list.each do |ban| %> -<%= ban.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/default.cfg.erb b/builder/views/default.cfg.erb deleted file mode 100644 index e69de29..0000000 --- a/builder/views/default.cfg.erb +++ /dev/null diff --git a/builder/views/summon.bash.erb b/builder/views/summon.bash.erb deleted file mode 100644 index 5eb9649..0000000 --- a/builder/views/summon.bash.erb +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port <%= @port.to_s %> \ - -iwad "/home/zandronum/iwads/<%= @iwad.to_s %>" \ - +exec "/home/zandronum/config/<%= @config.to_s %>" \ - +CrashLog_Dir "/home/zandronum/logs/<%= @server_name.to_s %>.log" \ - +CrashLogs 2 \ - +map <%= @start_map.to_s %> \ No newline at end of file diff --git a/builder/views/whitelist.txt.erb b/builder/views/whitelist.txt.erb deleted file mode 100644 index 203d1d0..0000000 --- a/builder/views/whitelist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @white_list.nil? %> -<% @white_list.each do |white| %> -<%= white.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/builder/views/adminlist.txt.erb b/builder/views/adminlist.txt.erb deleted file mode 100644 index df3aa78..0000000 --- a/builder/views/adminlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @admin_list.nil? %> -<% @admin_list.each do |admin| %> -<%= admin.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/banlist.txt.erb b/builder/views/banlist.txt.erb deleted file mode 100644 index c10a138..0000000 --- a/builder/views/banlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -93.99.233.*:capodecima - 93.99.233.6 - DDOS - June 19th 2016 - Perm -<% unless @ban_list.nil? %> -<% @ban_list.each do |ban| %> -<%= ban.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/default.cfg.erb b/builder/views/default.cfg.erb deleted file mode 100644 index e69de29..0000000 --- a/builder/views/default.cfg.erb +++ /dev/null diff --git a/builder/views/summon.bash.erb b/builder/views/summon.bash.erb deleted file mode 100644 index 5eb9649..0000000 --- a/builder/views/summon.bash.erb +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port <%= @port.to_s %> \ - -iwad "/home/zandronum/iwads/<%= @iwad.to_s %>" \ - +exec "/home/zandronum/config/<%= @config.to_s %>" \ - +CrashLog_Dir "/home/zandronum/logs/<%= @server_name.to_s %>.log" \ - +CrashLogs 2 \ - +map <%= @start_map.to_s %> \ No newline at end of file diff --git a/builder/views/whitelist.txt.erb b/builder/views/whitelist.txt.erb deleted file mode 100644 index 203d1d0..0000000 --- a/builder/views/whitelist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @white_list.nil? %> -<% @white_list.each do |white| %> -<%= white.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/docker-doom.bash b/docker-doom.bash deleted file mode 100755 index d6dd3bb..0000000 --- a/docker-doom.bash +++ /dev/null @@ -1,9 +0,0 @@ -docker run \ - --name docker-doom \ - --restart always \ - -v ./iwad:/home/zandronum/iwad \ - -v ./wad:/home/zandronum/wad \ - -v ./config/:/home/zandronum/config \ - -v ./player/:/home/zandronum/player \ - -p 10666:10666 \ - -d docker-doom diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/builder/views/adminlist.txt.erb b/builder/views/adminlist.txt.erb deleted file mode 100644 index df3aa78..0000000 --- a/builder/views/adminlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @admin_list.nil? %> -<% @admin_list.each do |admin| %> -<%= admin.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/banlist.txt.erb b/builder/views/banlist.txt.erb deleted file mode 100644 index c10a138..0000000 --- a/builder/views/banlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -93.99.233.*:capodecima - 93.99.233.6 - DDOS - June 19th 2016 - Perm -<% unless @ban_list.nil? %> -<% @ban_list.each do |ban| %> -<%= ban.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/default.cfg.erb b/builder/views/default.cfg.erb deleted file mode 100644 index e69de29..0000000 --- a/builder/views/default.cfg.erb +++ /dev/null diff --git a/builder/views/summon.bash.erb b/builder/views/summon.bash.erb deleted file mode 100644 index 5eb9649..0000000 --- a/builder/views/summon.bash.erb +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port <%= @port.to_s %> \ - -iwad "/home/zandronum/iwads/<%= @iwad.to_s %>" \ - +exec "/home/zandronum/config/<%= @config.to_s %>" \ - +CrashLog_Dir "/home/zandronum/logs/<%= @server_name.to_s %>.log" \ - +CrashLogs 2 \ - +map <%= @start_map.to_s %> \ No newline at end of file diff --git a/builder/views/whitelist.txt.erb b/builder/views/whitelist.txt.erb deleted file mode 100644 index 203d1d0..0000000 --- a/builder/views/whitelist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @white_list.nil? %> -<% @white_list.each do |white| %> -<%= white.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/docker-doom.bash b/docker-doom.bash deleted file mode 100755 index d6dd3bb..0000000 --- a/docker-doom.bash +++ /dev/null @@ -1,9 +0,0 @@ -docker run \ - --name docker-doom \ - --restart always \ - -v ./iwad:/home/zandronum/iwad \ - -v ./wad:/home/zandronum/wad \ - -v ./config/:/home/zandronum/config \ - -v ./player/:/home/zandronum/player \ - -p 10666:10666 \ - -d docker-doom diff --git a/docker-doom.ps1 b/docker-doom.ps1 deleted file mode 100755 index 8110689..0000000 --- a/docker-doom.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -docker container run ` - --name docker-doom ` - --restart always ` - -v .\iwad:/home/zandronum/iwad ` - -v .\wad:/home/zandronum/wad ` - -v .\config:/home/zandronum/config ` - -v .\player:/home/zandronum/player ` - -p 10666:10666 ` - -d docker-doom diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/builder/views/adminlist.txt.erb b/builder/views/adminlist.txt.erb deleted file mode 100644 index df3aa78..0000000 --- a/builder/views/adminlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @admin_list.nil? %> -<% @admin_list.each do |admin| %> -<%= admin.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/banlist.txt.erb b/builder/views/banlist.txt.erb deleted file mode 100644 index c10a138..0000000 --- a/builder/views/banlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -93.99.233.*:capodecima - 93.99.233.6 - DDOS - June 19th 2016 - Perm -<% unless @ban_list.nil? %> -<% @ban_list.each do |ban| %> -<%= ban.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/default.cfg.erb b/builder/views/default.cfg.erb deleted file mode 100644 index e69de29..0000000 --- a/builder/views/default.cfg.erb +++ /dev/null diff --git a/builder/views/summon.bash.erb b/builder/views/summon.bash.erb deleted file mode 100644 index 5eb9649..0000000 --- a/builder/views/summon.bash.erb +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port <%= @port.to_s %> \ - -iwad "/home/zandronum/iwads/<%= @iwad.to_s %>" \ - +exec "/home/zandronum/config/<%= @config.to_s %>" \ - +CrashLog_Dir "/home/zandronum/logs/<%= @server_name.to_s %>.log" \ - +CrashLogs 2 \ - +map <%= @start_map.to_s %> \ No newline at end of file diff --git a/builder/views/whitelist.txt.erb b/builder/views/whitelist.txt.erb deleted file mode 100644 index 203d1d0..0000000 --- a/builder/views/whitelist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @white_list.nil? %> -<% @white_list.each do |white| %> -<%= white.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/docker-doom.bash b/docker-doom.bash deleted file mode 100755 index d6dd3bb..0000000 --- a/docker-doom.bash +++ /dev/null @@ -1,9 +0,0 @@ -docker run \ - --name docker-doom \ - --restart always \ - -v ./iwad:/home/zandronum/iwad \ - -v ./wad:/home/zandronum/wad \ - -v ./config/:/home/zandronum/config \ - -v ./player/:/home/zandronum/player \ - -p 10666:10666 \ - -d docker-doom diff --git a/docker-doom.ps1 b/docker-doom.ps1 deleted file mode 100755 index 8110689..0000000 --- a/docker-doom.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -docker container run ` - --name docker-doom ` - --restart always ` - -v .\iwad:/home/zandronum/iwad ` - -v .\wad:/home/zandronum/wad ` - -v .\config:/home/zandronum/config ` - -v .\player:/home/zandronum/player ` - -p 10666:10666 ` - -d docker-doom diff --git a/wad/.gitignore b/wad/.gitignore deleted file mode 100644 index 9cba1a6..0000000 --- a/wad/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# directory for patch wads and newer GZDoom pk3 & pk7 mods - -*.WAD -*.wad -*.PK3 -*.pk3 -*.PK7 -*.pk7 diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/builder/views/adminlist.txt.erb b/builder/views/adminlist.txt.erb deleted file mode 100644 index df3aa78..0000000 --- a/builder/views/adminlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @admin_list.nil? %> -<% @admin_list.each do |admin| %> -<%= admin.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/banlist.txt.erb b/builder/views/banlist.txt.erb deleted file mode 100644 index c10a138..0000000 --- a/builder/views/banlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -93.99.233.*:capodecima - 93.99.233.6 - DDOS - June 19th 2016 - Perm -<% unless @ban_list.nil? %> -<% @ban_list.each do |ban| %> -<%= ban.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/default.cfg.erb b/builder/views/default.cfg.erb deleted file mode 100644 index e69de29..0000000 --- a/builder/views/default.cfg.erb +++ /dev/null diff --git a/builder/views/summon.bash.erb b/builder/views/summon.bash.erb deleted file mode 100644 index 5eb9649..0000000 --- a/builder/views/summon.bash.erb +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port <%= @port.to_s %> \ - -iwad "/home/zandronum/iwads/<%= @iwad.to_s %>" \ - +exec "/home/zandronum/config/<%= @config.to_s %>" \ - +CrashLog_Dir "/home/zandronum/logs/<%= @server_name.to_s %>.log" \ - +CrashLogs 2 \ - +map <%= @start_map.to_s %> \ No newline at end of file diff --git a/builder/views/whitelist.txt.erb b/builder/views/whitelist.txt.erb deleted file mode 100644 index 203d1d0..0000000 --- a/builder/views/whitelist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @white_list.nil? %> -<% @white_list.each do |white| %> -<%= white.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/docker-doom.bash b/docker-doom.bash deleted file mode 100755 index d6dd3bb..0000000 --- a/docker-doom.bash +++ /dev/null @@ -1,9 +0,0 @@ -docker run \ - --name docker-doom \ - --restart always \ - -v ./iwad:/home/zandronum/iwad \ - -v ./wad:/home/zandronum/wad \ - -v ./config/:/home/zandronum/config \ - -v ./player/:/home/zandronum/player \ - -p 10666:10666 \ - -d docker-doom diff --git a/docker-doom.ps1 b/docker-doom.ps1 deleted file mode 100755 index 8110689..0000000 --- a/docker-doom.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -docker container run ` - --name docker-doom ` - --restart always ` - -v .\iwad:/home/zandronum/iwad ` - -v .\wad:/home/zandronum/wad ` - -v .\config:/home/zandronum/config ` - -v .\player:/home/zandronum/player ` - -p 10666:10666 ` - -d docker-doom diff --git a/wad/.gitignore b/wad/.gitignore deleted file mode 100644 index 9cba1a6..0000000 --- a/wad/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# directory for patch wads and newer GZDoom pk3 & pk7 mods - -*.WAD -*.wad -*.PK3 -*.pk3 -*.PK7 -*.pk7 diff --git a/wad/DWANGO20.WAD b/wad/DWANGO20.WAD new file mode 100644 index 0000000..dbdfc34 --- /dev/null +++ b/wad/DWANGO20.WAD Binary files differ diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/builder/views/adminlist.txt.erb b/builder/views/adminlist.txt.erb deleted file mode 100644 index df3aa78..0000000 --- a/builder/views/adminlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @admin_list.nil? %> -<% @admin_list.each do |admin| %> -<%= admin.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/banlist.txt.erb b/builder/views/banlist.txt.erb deleted file mode 100644 index c10a138..0000000 --- a/builder/views/banlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -93.99.233.*:capodecima - 93.99.233.6 - DDOS - June 19th 2016 - Perm -<% unless @ban_list.nil? %> -<% @ban_list.each do |ban| %> -<%= ban.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/default.cfg.erb b/builder/views/default.cfg.erb deleted file mode 100644 index e69de29..0000000 --- a/builder/views/default.cfg.erb +++ /dev/null diff --git a/builder/views/summon.bash.erb b/builder/views/summon.bash.erb deleted file mode 100644 index 5eb9649..0000000 --- a/builder/views/summon.bash.erb +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port <%= @port.to_s %> \ - -iwad "/home/zandronum/iwads/<%= @iwad.to_s %>" \ - +exec "/home/zandronum/config/<%= @config.to_s %>" \ - +CrashLog_Dir "/home/zandronum/logs/<%= @server_name.to_s %>.log" \ - +CrashLogs 2 \ - +map <%= @start_map.to_s %> \ No newline at end of file diff --git a/builder/views/whitelist.txt.erb b/builder/views/whitelist.txt.erb deleted file mode 100644 index 203d1d0..0000000 --- a/builder/views/whitelist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @white_list.nil? %> -<% @white_list.each do |white| %> -<%= white.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/docker-doom.bash b/docker-doom.bash deleted file mode 100755 index d6dd3bb..0000000 --- a/docker-doom.bash +++ /dev/null @@ -1,9 +0,0 @@ -docker run \ - --name docker-doom \ - --restart always \ - -v ./iwad:/home/zandronum/iwad \ - -v ./wad:/home/zandronum/wad \ - -v ./config/:/home/zandronum/config \ - -v ./player/:/home/zandronum/player \ - -p 10666:10666 \ - -d docker-doom diff --git a/docker-doom.ps1 b/docker-doom.ps1 deleted file mode 100755 index 8110689..0000000 --- a/docker-doom.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -docker container run ` - --name docker-doom ` - --restart always ` - -v .\iwad:/home/zandronum/iwad ` - -v .\wad:/home/zandronum/wad ` - -v .\config:/home/zandronum/config ` - -v .\player:/home/zandronum/player ` - -p 10666:10666 ` - -d docker-doom diff --git a/wad/.gitignore b/wad/.gitignore deleted file mode 100644 index 9cba1a6..0000000 --- a/wad/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# directory for patch wads and newer GZDoom pk3 & pk7 mods - -*.WAD -*.wad -*.PK3 -*.pk3 -*.PK7 -*.pk7 diff --git a/wad/DWANGO20.WAD b/wad/DWANGO20.WAD new file mode 100644 index 0000000..dbdfc34 --- /dev/null +++ b/wad/DWANGO20.WAD Binary files differ diff --git a/wad/doom2/ATTACK.WAD b/wad/doom2/ATTACK.WAD new file mode 100644 index 0000000..abf8d39 --- /dev/null +++ b/wad/doom2/ATTACK.WAD Binary files differ diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/builder/views/adminlist.txt.erb b/builder/views/adminlist.txt.erb deleted file mode 100644 index df3aa78..0000000 --- a/builder/views/adminlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @admin_list.nil? %> -<% @admin_list.each do |admin| %> -<%= admin.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/banlist.txt.erb b/builder/views/banlist.txt.erb deleted file mode 100644 index c10a138..0000000 --- a/builder/views/banlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -93.99.233.*:capodecima - 93.99.233.6 - DDOS - June 19th 2016 - Perm -<% unless @ban_list.nil? %> -<% @ban_list.each do |ban| %> -<%= ban.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/default.cfg.erb b/builder/views/default.cfg.erb deleted file mode 100644 index e69de29..0000000 --- a/builder/views/default.cfg.erb +++ /dev/null diff --git a/builder/views/summon.bash.erb b/builder/views/summon.bash.erb deleted file mode 100644 index 5eb9649..0000000 --- a/builder/views/summon.bash.erb +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port <%= @port.to_s %> \ - -iwad "/home/zandronum/iwads/<%= @iwad.to_s %>" \ - +exec "/home/zandronum/config/<%= @config.to_s %>" \ - +CrashLog_Dir "/home/zandronum/logs/<%= @server_name.to_s %>.log" \ - +CrashLogs 2 \ - +map <%= @start_map.to_s %> \ No newline at end of file diff --git a/builder/views/whitelist.txt.erb b/builder/views/whitelist.txt.erb deleted file mode 100644 index 203d1d0..0000000 --- a/builder/views/whitelist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @white_list.nil? %> -<% @white_list.each do |white| %> -<%= white.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/docker-doom.bash b/docker-doom.bash deleted file mode 100755 index d6dd3bb..0000000 --- a/docker-doom.bash +++ /dev/null @@ -1,9 +0,0 @@ -docker run \ - --name docker-doom \ - --restart always \ - -v ./iwad:/home/zandronum/iwad \ - -v ./wad:/home/zandronum/wad \ - -v ./config/:/home/zandronum/config \ - -v ./player/:/home/zandronum/player \ - -p 10666:10666 \ - -d docker-doom diff --git a/docker-doom.ps1 b/docker-doom.ps1 deleted file mode 100755 index 8110689..0000000 --- a/docker-doom.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -docker container run ` - --name docker-doom ` - --restart always ` - -v .\iwad:/home/zandronum/iwad ` - -v .\wad:/home/zandronum/wad ` - -v .\config:/home/zandronum/config ` - -v .\player:/home/zandronum/player ` - -p 10666:10666 ` - -d docker-doom diff --git a/wad/.gitignore b/wad/.gitignore deleted file mode 100644 index 9cba1a6..0000000 --- a/wad/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# directory for patch wads and newer GZDoom pk3 & pk7 mods - -*.WAD -*.wad -*.PK3 -*.pk3 -*.PK7 -*.pk7 diff --git a/wad/DWANGO20.WAD b/wad/DWANGO20.WAD new file mode 100644 index 0000000..dbdfc34 --- /dev/null +++ b/wad/DWANGO20.WAD Binary files differ diff --git a/wad/doom2/ATTACK.WAD b/wad/doom2/ATTACK.WAD new file mode 100644 index 0000000..abf8d39 --- /dev/null +++ b/wad/doom2/ATTACK.WAD Binary files differ diff --git a/wad/doom2/BLACKTWR.WAD b/wad/doom2/BLACKTWR.WAD new file mode 100644 index 0000000..5aec986 --- /dev/null +++ b/wad/doom2/BLACKTWR.WAD Binary files differ diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/builder/views/adminlist.txt.erb b/builder/views/adminlist.txt.erb deleted file mode 100644 index df3aa78..0000000 --- a/builder/views/adminlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @admin_list.nil? %> -<% @admin_list.each do |admin| %> -<%= admin.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/banlist.txt.erb b/builder/views/banlist.txt.erb deleted file mode 100644 index c10a138..0000000 --- a/builder/views/banlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -93.99.233.*:capodecima - 93.99.233.6 - DDOS - June 19th 2016 - Perm -<% unless @ban_list.nil? %> -<% @ban_list.each do |ban| %> -<%= ban.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/default.cfg.erb b/builder/views/default.cfg.erb deleted file mode 100644 index e69de29..0000000 --- a/builder/views/default.cfg.erb +++ /dev/null diff --git a/builder/views/summon.bash.erb b/builder/views/summon.bash.erb deleted file mode 100644 index 5eb9649..0000000 --- a/builder/views/summon.bash.erb +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port <%= @port.to_s %> \ - -iwad "/home/zandronum/iwads/<%= @iwad.to_s %>" \ - +exec "/home/zandronum/config/<%= @config.to_s %>" \ - +CrashLog_Dir "/home/zandronum/logs/<%= @server_name.to_s %>.log" \ - +CrashLogs 2 \ - +map <%= @start_map.to_s %> \ No newline at end of file diff --git a/builder/views/whitelist.txt.erb b/builder/views/whitelist.txt.erb deleted file mode 100644 index 203d1d0..0000000 --- a/builder/views/whitelist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @white_list.nil? %> -<% @white_list.each do |white| %> -<%= white.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/docker-doom.bash b/docker-doom.bash deleted file mode 100755 index d6dd3bb..0000000 --- a/docker-doom.bash +++ /dev/null @@ -1,9 +0,0 @@ -docker run \ - --name docker-doom \ - --restart always \ - -v ./iwad:/home/zandronum/iwad \ - -v ./wad:/home/zandronum/wad \ - -v ./config/:/home/zandronum/config \ - -v ./player/:/home/zandronum/player \ - -p 10666:10666 \ - -d docker-doom diff --git a/docker-doom.ps1 b/docker-doom.ps1 deleted file mode 100755 index 8110689..0000000 --- a/docker-doom.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -docker container run ` - --name docker-doom ` - --restart always ` - -v .\iwad:/home/zandronum/iwad ` - -v .\wad:/home/zandronum/wad ` - -v .\config:/home/zandronum/config ` - -v .\player:/home/zandronum/player ` - -p 10666:10666 ` - -d docker-doom diff --git a/wad/.gitignore b/wad/.gitignore deleted file mode 100644 index 9cba1a6..0000000 --- a/wad/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# directory for patch wads and newer GZDoom pk3 & pk7 mods - -*.WAD -*.wad -*.PK3 -*.pk3 -*.PK7 -*.pk7 diff --git a/wad/DWANGO20.WAD b/wad/DWANGO20.WAD new file mode 100644 index 0000000..dbdfc34 --- /dev/null +++ b/wad/DWANGO20.WAD Binary files differ diff --git a/wad/doom2/ATTACK.WAD b/wad/doom2/ATTACK.WAD new file mode 100644 index 0000000..abf8d39 --- /dev/null +++ b/wad/doom2/ATTACK.WAD Binary files differ diff --git a/wad/doom2/BLACKTWR.WAD b/wad/doom2/BLACKTWR.WAD new file mode 100644 index 0000000..5aec986 --- /dev/null +++ b/wad/doom2/BLACKTWR.WAD Binary files differ diff --git a/wad/doom2/BLOODSEA.WAD b/wad/doom2/BLOODSEA.WAD new file mode 100644 index 0000000..82d4c09 --- /dev/null +++ b/wad/doom2/BLOODSEA.WAD Binary files differ diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/builder/views/adminlist.txt.erb b/builder/views/adminlist.txt.erb deleted file mode 100644 index df3aa78..0000000 --- a/builder/views/adminlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @admin_list.nil? %> -<% @admin_list.each do |admin| %> -<%= admin.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/banlist.txt.erb b/builder/views/banlist.txt.erb deleted file mode 100644 index c10a138..0000000 --- a/builder/views/banlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -93.99.233.*:capodecima - 93.99.233.6 - DDOS - June 19th 2016 - Perm -<% unless @ban_list.nil? %> -<% @ban_list.each do |ban| %> -<%= ban.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/default.cfg.erb b/builder/views/default.cfg.erb deleted file mode 100644 index e69de29..0000000 --- a/builder/views/default.cfg.erb +++ /dev/null diff --git a/builder/views/summon.bash.erb b/builder/views/summon.bash.erb deleted file mode 100644 index 5eb9649..0000000 --- a/builder/views/summon.bash.erb +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port <%= @port.to_s %> \ - -iwad "/home/zandronum/iwads/<%= @iwad.to_s %>" \ - +exec "/home/zandronum/config/<%= @config.to_s %>" \ - +CrashLog_Dir "/home/zandronum/logs/<%= @server_name.to_s %>.log" \ - +CrashLogs 2 \ - +map <%= @start_map.to_s %> \ No newline at end of file diff --git a/builder/views/whitelist.txt.erb b/builder/views/whitelist.txt.erb deleted file mode 100644 index 203d1d0..0000000 --- a/builder/views/whitelist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @white_list.nil? %> -<% @white_list.each do |white| %> -<%= white.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/docker-doom.bash b/docker-doom.bash deleted file mode 100755 index d6dd3bb..0000000 --- a/docker-doom.bash +++ /dev/null @@ -1,9 +0,0 @@ -docker run \ - --name docker-doom \ - --restart always \ - -v ./iwad:/home/zandronum/iwad \ - -v ./wad:/home/zandronum/wad \ - -v ./config/:/home/zandronum/config \ - -v ./player/:/home/zandronum/player \ - -p 10666:10666 \ - -d docker-doom diff --git a/docker-doom.ps1 b/docker-doom.ps1 deleted file mode 100755 index 8110689..0000000 --- a/docker-doom.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -docker container run ` - --name docker-doom ` - --restart always ` - -v .\iwad:/home/zandronum/iwad ` - -v .\wad:/home/zandronum/wad ` - -v .\config:/home/zandronum/config ` - -v .\player:/home/zandronum/player ` - -p 10666:10666 ` - -d docker-doom diff --git a/wad/.gitignore b/wad/.gitignore deleted file mode 100644 index 9cba1a6..0000000 --- a/wad/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# directory for patch wads and newer GZDoom pk3 & pk7 mods - -*.WAD -*.wad -*.PK3 -*.pk3 -*.PK7 -*.pk7 diff --git a/wad/DWANGO20.WAD b/wad/DWANGO20.WAD new file mode 100644 index 0000000..dbdfc34 --- /dev/null +++ b/wad/DWANGO20.WAD Binary files differ diff --git a/wad/doom2/ATTACK.WAD b/wad/doom2/ATTACK.WAD new file mode 100644 index 0000000..abf8d39 --- /dev/null +++ b/wad/doom2/ATTACK.WAD Binary files differ diff --git a/wad/doom2/BLACKTWR.WAD b/wad/doom2/BLACKTWR.WAD new file mode 100644 index 0000000..5aec986 --- /dev/null +++ b/wad/doom2/BLACKTWR.WAD Binary files differ diff --git a/wad/doom2/BLOODSEA.WAD b/wad/doom2/BLOODSEA.WAD new file mode 100644 index 0000000..82d4c09 --- /dev/null +++ b/wad/doom2/BLOODSEA.WAD Binary files differ diff --git a/wad/doom2/CANYON.WAD b/wad/doom2/CANYON.WAD new file mode 100644 index 0000000..fd9d1c4 --- /dev/null +++ b/wad/doom2/CANYON.WAD Binary files differ diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/builder/views/adminlist.txt.erb b/builder/views/adminlist.txt.erb deleted file mode 100644 index df3aa78..0000000 --- a/builder/views/adminlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @admin_list.nil? %> -<% @admin_list.each do |admin| %> -<%= admin.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/banlist.txt.erb b/builder/views/banlist.txt.erb deleted file mode 100644 index c10a138..0000000 --- a/builder/views/banlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -93.99.233.*:capodecima - 93.99.233.6 - DDOS - June 19th 2016 - Perm -<% unless @ban_list.nil? %> -<% @ban_list.each do |ban| %> -<%= ban.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/default.cfg.erb b/builder/views/default.cfg.erb deleted file mode 100644 index e69de29..0000000 --- a/builder/views/default.cfg.erb +++ /dev/null diff --git a/builder/views/summon.bash.erb b/builder/views/summon.bash.erb deleted file mode 100644 index 5eb9649..0000000 --- a/builder/views/summon.bash.erb +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port <%= @port.to_s %> \ - -iwad "/home/zandronum/iwads/<%= @iwad.to_s %>" \ - +exec "/home/zandronum/config/<%= @config.to_s %>" \ - +CrashLog_Dir "/home/zandronum/logs/<%= @server_name.to_s %>.log" \ - +CrashLogs 2 \ - +map <%= @start_map.to_s %> \ No newline at end of file diff --git a/builder/views/whitelist.txt.erb b/builder/views/whitelist.txt.erb deleted file mode 100644 index 203d1d0..0000000 --- a/builder/views/whitelist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @white_list.nil? %> -<% @white_list.each do |white| %> -<%= white.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/docker-doom.bash b/docker-doom.bash deleted file mode 100755 index d6dd3bb..0000000 --- a/docker-doom.bash +++ /dev/null @@ -1,9 +0,0 @@ -docker run \ - --name docker-doom \ - --restart always \ - -v ./iwad:/home/zandronum/iwad \ - -v ./wad:/home/zandronum/wad \ - -v ./config/:/home/zandronum/config \ - -v ./player/:/home/zandronum/player \ - -p 10666:10666 \ - -d docker-doom diff --git a/docker-doom.ps1 b/docker-doom.ps1 deleted file mode 100755 index 8110689..0000000 --- a/docker-doom.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -docker container run ` - --name docker-doom ` - --restart always ` - -v .\iwad:/home/zandronum/iwad ` - -v .\wad:/home/zandronum/wad ` - -v .\config:/home/zandronum/config ` - -v .\player:/home/zandronum/player ` - -p 10666:10666 ` - -d docker-doom diff --git a/wad/.gitignore b/wad/.gitignore deleted file mode 100644 index 9cba1a6..0000000 --- a/wad/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# directory for patch wads and newer GZDoom pk3 & pk7 mods - -*.WAD -*.wad -*.PK3 -*.pk3 -*.PK7 -*.pk7 diff --git a/wad/DWANGO20.WAD b/wad/DWANGO20.WAD new file mode 100644 index 0000000..dbdfc34 --- /dev/null +++ b/wad/DWANGO20.WAD Binary files differ diff --git a/wad/doom2/ATTACK.WAD b/wad/doom2/ATTACK.WAD new file mode 100644 index 0000000..abf8d39 --- /dev/null +++ b/wad/doom2/ATTACK.WAD Binary files differ diff --git a/wad/doom2/BLACKTWR.WAD b/wad/doom2/BLACKTWR.WAD new file mode 100644 index 0000000..5aec986 --- /dev/null +++ b/wad/doom2/BLACKTWR.WAD Binary files differ diff --git a/wad/doom2/BLOODSEA.WAD b/wad/doom2/BLOODSEA.WAD new file mode 100644 index 0000000..82d4c09 --- /dev/null +++ b/wad/doom2/BLOODSEA.WAD Binary files differ diff --git a/wad/doom2/CANYON.WAD b/wad/doom2/CANYON.WAD new file mode 100644 index 0000000..fd9d1c4 --- /dev/null +++ b/wad/doom2/CANYON.WAD Binary files differ diff --git a/wad/doom2/CATWALK.WAD b/wad/doom2/CATWALK.WAD new file mode 100644 index 0000000..7a0481e --- /dev/null +++ b/wad/doom2/CATWALK.WAD Binary files differ diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/builder/views/adminlist.txt.erb b/builder/views/adminlist.txt.erb deleted file mode 100644 index df3aa78..0000000 --- a/builder/views/adminlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @admin_list.nil? %> -<% @admin_list.each do |admin| %> -<%= admin.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/banlist.txt.erb b/builder/views/banlist.txt.erb deleted file mode 100644 index c10a138..0000000 --- a/builder/views/banlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -93.99.233.*:capodecima - 93.99.233.6 - DDOS - June 19th 2016 - Perm -<% unless @ban_list.nil? %> -<% @ban_list.each do |ban| %> -<%= ban.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/default.cfg.erb b/builder/views/default.cfg.erb deleted file mode 100644 index e69de29..0000000 --- a/builder/views/default.cfg.erb +++ /dev/null diff --git a/builder/views/summon.bash.erb b/builder/views/summon.bash.erb deleted file mode 100644 index 5eb9649..0000000 --- a/builder/views/summon.bash.erb +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port <%= @port.to_s %> \ - -iwad "/home/zandronum/iwads/<%= @iwad.to_s %>" \ - +exec "/home/zandronum/config/<%= @config.to_s %>" \ - +CrashLog_Dir "/home/zandronum/logs/<%= @server_name.to_s %>.log" \ - +CrashLogs 2 \ - +map <%= @start_map.to_s %> \ No newline at end of file diff --git a/builder/views/whitelist.txt.erb b/builder/views/whitelist.txt.erb deleted file mode 100644 index 203d1d0..0000000 --- a/builder/views/whitelist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @white_list.nil? %> -<% @white_list.each do |white| %> -<%= white.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/docker-doom.bash b/docker-doom.bash deleted file mode 100755 index d6dd3bb..0000000 --- a/docker-doom.bash +++ /dev/null @@ -1,9 +0,0 @@ -docker run \ - --name docker-doom \ - --restart always \ - -v ./iwad:/home/zandronum/iwad \ - -v ./wad:/home/zandronum/wad \ - -v ./config/:/home/zandronum/config \ - -v ./player/:/home/zandronum/player \ - -p 10666:10666 \ - -d docker-doom diff --git a/docker-doom.ps1 b/docker-doom.ps1 deleted file mode 100755 index 8110689..0000000 --- a/docker-doom.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -docker container run ` - --name docker-doom ` - --restart always ` - -v .\iwad:/home/zandronum/iwad ` - -v .\wad:/home/zandronum/wad ` - -v .\config:/home/zandronum/config ` - -v .\player:/home/zandronum/player ` - -p 10666:10666 ` - -d docker-doom diff --git a/wad/.gitignore b/wad/.gitignore deleted file mode 100644 index 9cba1a6..0000000 --- a/wad/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# directory for patch wads and newer GZDoom pk3 & pk7 mods - -*.WAD -*.wad -*.PK3 -*.pk3 -*.PK7 -*.pk7 diff --git a/wad/DWANGO20.WAD b/wad/DWANGO20.WAD new file mode 100644 index 0000000..dbdfc34 --- /dev/null +++ b/wad/DWANGO20.WAD Binary files differ diff --git a/wad/doom2/ATTACK.WAD b/wad/doom2/ATTACK.WAD new file mode 100644 index 0000000..abf8d39 --- /dev/null +++ b/wad/doom2/ATTACK.WAD Binary files differ diff --git a/wad/doom2/BLACKTWR.WAD b/wad/doom2/BLACKTWR.WAD new file mode 100644 index 0000000..5aec986 --- /dev/null +++ b/wad/doom2/BLACKTWR.WAD Binary files differ diff --git a/wad/doom2/BLOODSEA.WAD b/wad/doom2/BLOODSEA.WAD new file mode 100644 index 0000000..82d4c09 --- /dev/null +++ b/wad/doom2/BLOODSEA.WAD Binary files differ diff --git a/wad/doom2/CANYON.WAD b/wad/doom2/CANYON.WAD new file mode 100644 index 0000000..fd9d1c4 --- /dev/null +++ b/wad/doom2/CANYON.WAD Binary files differ diff --git a/wad/doom2/CATWALK.WAD b/wad/doom2/CATWALK.WAD new file mode 100644 index 0000000..7a0481e --- /dev/null +++ b/wad/doom2/CATWALK.WAD Binary files differ diff --git a/wad/doom2/COMBINE.WAD b/wad/doom2/COMBINE.WAD new file mode 100644 index 0000000..87c9d8c --- /dev/null +++ b/wad/doom2/COMBINE.WAD Binary files differ diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/builder/views/adminlist.txt.erb b/builder/views/adminlist.txt.erb deleted file mode 100644 index df3aa78..0000000 --- a/builder/views/adminlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @admin_list.nil? %> -<% @admin_list.each do |admin| %> -<%= admin.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/banlist.txt.erb b/builder/views/banlist.txt.erb deleted file mode 100644 index c10a138..0000000 --- a/builder/views/banlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -93.99.233.*:capodecima - 93.99.233.6 - DDOS - June 19th 2016 - Perm -<% unless @ban_list.nil? %> -<% @ban_list.each do |ban| %> -<%= ban.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/default.cfg.erb b/builder/views/default.cfg.erb deleted file mode 100644 index e69de29..0000000 --- a/builder/views/default.cfg.erb +++ /dev/null diff --git a/builder/views/summon.bash.erb b/builder/views/summon.bash.erb deleted file mode 100644 index 5eb9649..0000000 --- a/builder/views/summon.bash.erb +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port <%= @port.to_s %> \ - -iwad "/home/zandronum/iwads/<%= @iwad.to_s %>" \ - +exec "/home/zandronum/config/<%= @config.to_s %>" \ - +CrashLog_Dir "/home/zandronum/logs/<%= @server_name.to_s %>.log" \ - +CrashLogs 2 \ - +map <%= @start_map.to_s %> \ No newline at end of file diff --git a/builder/views/whitelist.txt.erb b/builder/views/whitelist.txt.erb deleted file mode 100644 index 203d1d0..0000000 --- a/builder/views/whitelist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @white_list.nil? %> -<% @white_list.each do |white| %> -<%= white.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/docker-doom.bash b/docker-doom.bash deleted file mode 100755 index d6dd3bb..0000000 --- a/docker-doom.bash +++ /dev/null @@ -1,9 +0,0 @@ -docker run \ - --name docker-doom \ - --restart always \ - -v ./iwad:/home/zandronum/iwad \ - -v ./wad:/home/zandronum/wad \ - -v ./config/:/home/zandronum/config \ - -v ./player/:/home/zandronum/player \ - -p 10666:10666 \ - -d docker-doom diff --git a/docker-doom.ps1 b/docker-doom.ps1 deleted file mode 100755 index 8110689..0000000 --- a/docker-doom.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -docker container run ` - --name docker-doom ` - --restart always ` - -v .\iwad:/home/zandronum/iwad ` - -v .\wad:/home/zandronum/wad ` - -v .\config:/home/zandronum/config ` - -v .\player:/home/zandronum/player ` - -p 10666:10666 ` - -d docker-doom diff --git a/wad/.gitignore b/wad/.gitignore deleted file mode 100644 index 9cba1a6..0000000 --- a/wad/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# directory for patch wads and newer GZDoom pk3 & pk7 mods - -*.WAD -*.wad -*.PK3 -*.pk3 -*.PK7 -*.pk7 diff --git a/wad/DWANGO20.WAD b/wad/DWANGO20.WAD new file mode 100644 index 0000000..dbdfc34 --- /dev/null +++ b/wad/DWANGO20.WAD Binary files differ diff --git a/wad/doom2/ATTACK.WAD b/wad/doom2/ATTACK.WAD new file mode 100644 index 0000000..abf8d39 --- /dev/null +++ b/wad/doom2/ATTACK.WAD Binary files differ diff --git a/wad/doom2/BLACKTWR.WAD b/wad/doom2/BLACKTWR.WAD new file mode 100644 index 0000000..5aec986 --- /dev/null +++ b/wad/doom2/BLACKTWR.WAD Binary files differ diff --git a/wad/doom2/BLOODSEA.WAD b/wad/doom2/BLOODSEA.WAD new file mode 100644 index 0000000..82d4c09 --- /dev/null +++ b/wad/doom2/BLOODSEA.WAD Binary files differ diff --git a/wad/doom2/CANYON.WAD b/wad/doom2/CANYON.WAD new file mode 100644 index 0000000..fd9d1c4 --- /dev/null +++ b/wad/doom2/CANYON.WAD Binary files differ diff --git a/wad/doom2/CATWALK.WAD b/wad/doom2/CATWALK.WAD new file mode 100644 index 0000000..7a0481e --- /dev/null +++ b/wad/doom2/CATWALK.WAD Binary files differ diff --git a/wad/doom2/COMBINE.WAD b/wad/doom2/COMBINE.WAD new file mode 100644 index 0000000..87c9d8c --- /dev/null +++ b/wad/doom2/COMBINE.WAD Binary files differ diff --git a/wad/doom2/FISTULA.WAD b/wad/doom2/FISTULA.WAD new file mode 100644 index 0000000..08d62d4 --- /dev/null +++ b/wad/doom2/FISTULA.WAD Binary files differ diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/builder/views/adminlist.txt.erb b/builder/views/adminlist.txt.erb deleted file mode 100644 index df3aa78..0000000 --- a/builder/views/adminlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @admin_list.nil? %> -<% @admin_list.each do |admin| %> -<%= admin.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/banlist.txt.erb b/builder/views/banlist.txt.erb deleted file mode 100644 index c10a138..0000000 --- a/builder/views/banlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -93.99.233.*:capodecima - 93.99.233.6 - DDOS - June 19th 2016 - Perm -<% unless @ban_list.nil? %> -<% @ban_list.each do |ban| %> -<%= ban.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/default.cfg.erb b/builder/views/default.cfg.erb deleted file mode 100644 index e69de29..0000000 --- a/builder/views/default.cfg.erb +++ /dev/null diff --git a/builder/views/summon.bash.erb b/builder/views/summon.bash.erb deleted file mode 100644 index 5eb9649..0000000 --- a/builder/views/summon.bash.erb +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port <%= @port.to_s %> \ - -iwad "/home/zandronum/iwads/<%= @iwad.to_s %>" \ - +exec "/home/zandronum/config/<%= @config.to_s %>" \ - +CrashLog_Dir "/home/zandronum/logs/<%= @server_name.to_s %>.log" \ - +CrashLogs 2 \ - +map <%= @start_map.to_s %> \ No newline at end of file diff --git a/builder/views/whitelist.txt.erb b/builder/views/whitelist.txt.erb deleted file mode 100644 index 203d1d0..0000000 --- a/builder/views/whitelist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @white_list.nil? %> -<% @white_list.each do |white| %> -<%= white.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/docker-doom.bash b/docker-doom.bash deleted file mode 100755 index d6dd3bb..0000000 --- a/docker-doom.bash +++ /dev/null @@ -1,9 +0,0 @@ -docker run \ - --name docker-doom \ - --restart always \ - -v ./iwad:/home/zandronum/iwad \ - -v ./wad:/home/zandronum/wad \ - -v ./config/:/home/zandronum/config \ - -v ./player/:/home/zandronum/player \ - -p 10666:10666 \ - -d docker-doom diff --git a/docker-doom.ps1 b/docker-doom.ps1 deleted file mode 100755 index 8110689..0000000 --- a/docker-doom.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -docker container run ` - --name docker-doom ` - --restart always ` - -v .\iwad:/home/zandronum/iwad ` - -v .\wad:/home/zandronum/wad ` - -v .\config:/home/zandronum/config ` - -v .\player:/home/zandronum/player ` - -p 10666:10666 ` - -d docker-doom diff --git a/wad/.gitignore b/wad/.gitignore deleted file mode 100644 index 9cba1a6..0000000 --- a/wad/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# directory for patch wads and newer GZDoom pk3 & pk7 mods - -*.WAD -*.wad -*.PK3 -*.pk3 -*.PK7 -*.pk7 diff --git a/wad/DWANGO20.WAD b/wad/DWANGO20.WAD new file mode 100644 index 0000000..dbdfc34 --- /dev/null +++ b/wad/DWANGO20.WAD Binary files differ diff --git a/wad/doom2/ATTACK.WAD b/wad/doom2/ATTACK.WAD new file mode 100644 index 0000000..abf8d39 --- /dev/null +++ b/wad/doom2/ATTACK.WAD Binary files differ diff --git a/wad/doom2/BLACKTWR.WAD b/wad/doom2/BLACKTWR.WAD new file mode 100644 index 0000000..5aec986 --- /dev/null +++ b/wad/doom2/BLACKTWR.WAD Binary files differ diff --git a/wad/doom2/BLOODSEA.WAD b/wad/doom2/BLOODSEA.WAD new file mode 100644 index 0000000..82d4c09 --- /dev/null +++ b/wad/doom2/BLOODSEA.WAD Binary files differ diff --git a/wad/doom2/CANYON.WAD b/wad/doom2/CANYON.WAD new file mode 100644 index 0000000..fd9d1c4 --- /dev/null +++ b/wad/doom2/CANYON.WAD Binary files differ diff --git a/wad/doom2/CATWALK.WAD b/wad/doom2/CATWALK.WAD new file mode 100644 index 0000000..7a0481e --- /dev/null +++ b/wad/doom2/CATWALK.WAD Binary files differ diff --git a/wad/doom2/COMBINE.WAD b/wad/doom2/COMBINE.WAD new file mode 100644 index 0000000..87c9d8c --- /dev/null +++ b/wad/doom2/COMBINE.WAD Binary files differ diff --git a/wad/doom2/FISTULA.WAD b/wad/doom2/FISTULA.WAD new file mode 100644 index 0000000..08d62d4 --- /dev/null +++ b/wad/doom2/FISTULA.WAD Binary files differ diff --git a/wad/doom2/GARRISON.WAD b/wad/doom2/GARRISON.WAD new file mode 100644 index 0000000..7f825dd --- /dev/null +++ b/wad/doom2/GARRISON.WAD Binary files differ diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/builder/views/adminlist.txt.erb b/builder/views/adminlist.txt.erb deleted file mode 100644 index df3aa78..0000000 --- a/builder/views/adminlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @admin_list.nil? %> -<% @admin_list.each do |admin| %> -<%= admin.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/banlist.txt.erb b/builder/views/banlist.txt.erb deleted file mode 100644 index c10a138..0000000 --- a/builder/views/banlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -93.99.233.*:capodecima - 93.99.233.6 - DDOS - June 19th 2016 - Perm -<% unless @ban_list.nil? %> -<% @ban_list.each do |ban| %> -<%= ban.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/default.cfg.erb b/builder/views/default.cfg.erb deleted file mode 100644 index e69de29..0000000 --- a/builder/views/default.cfg.erb +++ /dev/null diff --git a/builder/views/summon.bash.erb b/builder/views/summon.bash.erb deleted file mode 100644 index 5eb9649..0000000 --- a/builder/views/summon.bash.erb +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port <%= @port.to_s %> \ - -iwad "/home/zandronum/iwads/<%= @iwad.to_s %>" \ - +exec "/home/zandronum/config/<%= @config.to_s %>" \ - +CrashLog_Dir "/home/zandronum/logs/<%= @server_name.to_s %>.log" \ - +CrashLogs 2 \ - +map <%= @start_map.to_s %> \ No newline at end of file diff --git a/builder/views/whitelist.txt.erb b/builder/views/whitelist.txt.erb deleted file mode 100644 index 203d1d0..0000000 --- a/builder/views/whitelist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @white_list.nil? %> -<% @white_list.each do |white| %> -<%= white.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/docker-doom.bash b/docker-doom.bash deleted file mode 100755 index d6dd3bb..0000000 --- a/docker-doom.bash +++ /dev/null @@ -1,9 +0,0 @@ -docker run \ - --name docker-doom \ - --restart always \ - -v ./iwad:/home/zandronum/iwad \ - -v ./wad:/home/zandronum/wad \ - -v ./config/:/home/zandronum/config \ - -v ./player/:/home/zandronum/player \ - -p 10666:10666 \ - -d docker-doom diff --git a/docker-doom.ps1 b/docker-doom.ps1 deleted file mode 100755 index 8110689..0000000 --- a/docker-doom.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -docker container run ` - --name docker-doom ` - --restart always ` - -v .\iwad:/home/zandronum/iwad ` - -v .\wad:/home/zandronum/wad ` - -v .\config:/home/zandronum/config ` - -v .\player:/home/zandronum/player ` - -p 10666:10666 ` - -d docker-doom diff --git a/wad/.gitignore b/wad/.gitignore deleted file mode 100644 index 9cba1a6..0000000 --- a/wad/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# directory for patch wads and newer GZDoom pk3 & pk7 mods - -*.WAD -*.wad -*.PK3 -*.pk3 -*.PK7 -*.pk7 diff --git a/wad/DWANGO20.WAD b/wad/DWANGO20.WAD new file mode 100644 index 0000000..dbdfc34 --- /dev/null +++ b/wad/DWANGO20.WAD Binary files differ diff --git a/wad/doom2/ATTACK.WAD b/wad/doom2/ATTACK.WAD new file mode 100644 index 0000000..abf8d39 --- /dev/null +++ b/wad/doom2/ATTACK.WAD Binary files differ diff --git a/wad/doom2/BLACKTWR.WAD b/wad/doom2/BLACKTWR.WAD new file mode 100644 index 0000000..5aec986 --- /dev/null +++ b/wad/doom2/BLACKTWR.WAD Binary files differ diff --git a/wad/doom2/BLOODSEA.WAD b/wad/doom2/BLOODSEA.WAD new file mode 100644 index 0000000..82d4c09 --- /dev/null +++ b/wad/doom2/BLOODSEA.WAD Binary files differ diff --git a/wad/doom2/CANYON.WAD b/wad/doom2/CANYON.WAD new file mode 100644 index 0000000..fd9d1c4 --- /dev/null +++ b/wad/doom2/CANYON.WAD Binary files differ diff --git a/wad/doom2/CATWALK.WAD b/wad/doom2/CATWALK.WAD new file mode 100644 index 0000000..7a0481e --- /dev/null +++ b/wad/doom2/CATWALK.WAD Binary files differ diff --git a/wad/doom2/COMBINE.WAD b/wad/doom2/COMBINE.WAD new file mode 100644 index 0000000..87c9d8c --- /dev/null +++ b/wad/doom2/COMBINE.WAD Binary files differ diff --git a/wad/doom2/FISTULA.WAD b/wad/doom2/FISTULA.WAD new file mode 100644 index 0000000..08d62d4 --- /dev/null +++ b/wad/doom2/FISTULA.WAD Binary files differ diff --git a/wad/doom2/GARRISON.WAD b/wad/doom2/GARRISON.WAD new file mode 100644 index 0000000..7f825dd --- /dev/null +++ b/wad/doom2/GARRISON.WAD Binary files differ diff --git a/wad/doom2/GERYON.WAD b/wad/doom2/GERYON.WAD new file mode 100644 index 0000000..d036bc6 --- /dev/null +++ b/wad/doom2/GERYON.WAD Binary files differ diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/builder/views/adminlist.txt.erb b/builder/views/adminlist.txt.erb deleted file mode 100644 index df3aa78..0000000 --- a/builder/views/adminlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @admin_list.nil? %> -<% @admin_list.each do |admin| %> -<%= admin.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/banlist.txt.erb b/builder/views/banlist.txt.erb deleted file mode 100644 index c10a138..0000000 --- a/builder/views/banlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -93.99.233.*:capodecima - 93.99.233.6 - DDOS - June 19th 2016 - Perm -<% unless @ban_list.nil? %> -<% @ban_list.each do |ban| %> -<%= ban.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/default.cfg.erb b/builder/views/default.cfg.erb deleted file mode 100644 index e69de29..0000000 --- a/builder/views/default.cfg.erb +++ /dev/null diff --git a/builder/views/summon.bash.erb b/builder/views/summon.bash.erb deleted file mode 100644 index 5eb9649..0000000 --- a/builder/views/summon.bash.erb +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port <%= @port.to_s %> \ - -iwad "/home/zandronum/iwads/<%= @iwad.to_s %>" \ - +exec "/home/zandronum/config/<%= @config.to_s %>" \ - +CrashLog_Dir "/home/zandronum/logs/<%= @server_name.to_s %>.log" \ - +CrashLogs 2 \ - +map <%= @start_map.to_s %> \ No newline at end of file diff --git a/builder/views/whitelist.txt.erb b/builder/views/whitelist.txt.erb deleted file mode 100644 index 203d1d0..0000000 --- a/builder/views/whitelist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @white_list.nil? %> -<% @white_list.each do |white| %> -<%= white.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/docker-doom.bash b/docker-doom.bash deleted file mode 100755 index d6dd3bb..0000000 --- a/docker-doom.bash +++ /dev/null @@ -1,9 +0,0 @@ -docker run \ - --name docker-doom \ - --restart always \ - -v ./iwad:/home/zandronum/iwad \ - -v ./wad:/home/zandronum/wad \ - -v ./config/:/home/zandronum/config \ - -v ./player/:/home/zandronum/player \ - -p 10666:10666 \ - -d docker-doom diff --git a/docker-doom.ps1 b/docker-doom.ps1 deleted file mode 100755 index 8110689..0000000 --- a/docker-doom.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -docker container run ` - --name docker-doom ` - --restart always ` - -v .\iwad:/home/zandronum/iwad ` - -v .\wad:/home/zandronum/wad ` - -v .\config:/home/zandronum/config ` - -v .\player:/home/zandronum/player ` - -p 10666:10666 ` - -d docker-doom diff --git a/wad/.gitignore b/wad/.gitignore deleted file mode 100644 index 9cba1a6..0000000 --- a/wad/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# directory for patch wads and newer GZDoom pk3 & pk7 mods - -*.WAD -*.wad -*.PK3 -*.pk3 -*.PK7 -*.pk7 diff --git a/wad/DWANGO20.WAD b/wad/DWANGO20.WAD new file mode 100644 index 0000000..dbdfc34 --- /dev/null +++ b/wad/DWANGO20.WAD Binary files differ diff --git a/wad/doom2/ATTACK.WAD b/wad/doom2/ATTACK.WAD new file mode 100644 index 0000000..abf8d39 --- /dev/null +++ b/wad/doom2/ATTACK.WAD Binary files differ diff --git a/wad/doom2/BLACKTWR.WAD b/wad/doom2/BLACKTWR.WAD new file mode 100644 index 0000000..5aec986 --- /dev/null +++ b/wad/doom2/BLACKTWR.WAD Binary files differ diff --git a/wad/doom2/BLOODSEA.WAD b/wad/doom2/BLOODSEA.WAD new file mode 100644 index 0000000..82d4c09 --- /dev/null +++ b/wad/doom2/BLOODSEA.WAD Binary files differ diff --git a/wad/doom2/CANYON.WAD b/wad/doom2/CANYON.WAD new file mode 100644 index 0000000..fd9d1c4 --- /dev/null +++ b/wad/doom2/CANYON.WAD Binary files differ diff --git a/wad/doom2/CATWALK.WAD b/wad/doom2/CATWALK.WAD new file mode 100644 index 0000000..7a0481e --- /dev/null +++ b/wad/doom2/CATWALK.WAD Binary files differ diff --git a/wad/doom2/COMBINE.WAD b/wad/doom2/COMBINE.WAD new file mode 100644 index 0000000..87c9d8c --- /dev/null +++ b/wad/doom2/COMBINE.WAD Binary files differ diff --git a/wad/doom2/FISTULA.WAD b/wad/doom2/FISTULA.WAD new file mode 100644 index 0000000..08d62d4 --- /dev/null +++ b/wad/doom2/FISTULA.WAD Binary files differ diff --git a/wad/doom2/GARRISON.WAD b/wad/doom2/GARRISON.WAD new file mode 100644 index 0000000..7f825dd --- /dev/null +++ b/wad/doom2/GARRISON.WAD Binary files differ diff --git a/wad/doom2/GERYON.WAD b/wad/doom2/GERYON.WAD new file mode 100644 index 0000000..d036bc6 --- /dev/null +++ b/wad/doom2/GERYON.WAD Binary files differ diff --git a/wad/doom2/MANOR.WAD b/wad/doom2/MANOR.WAD new file mode 100644 index 0000000..47fda46 --- /dev/null +++ b/wad/doom2/MANOR.WAD Binary files differ diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/builder/views/adminlist.txt.erb b/builder/views/adminlist.txt.erb deleted file mode 100644 index df3aa78..0000000 --- a/builder/views/adminlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @admin_list.nil? %> -<% @admin_list.each do |admin| %> -<%= admin.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/banlist.txt.erb b/builder/views/banlist.txt.erb deleted file mode 100644 index c10a138..0000000 --- a/builder/views/banlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -93.99.233.*:capodecima - 93.99.233.6 - DDOS - June 19th 2016 - Perm -<% unless @ban_list.nil? %> -<% @ban_list.each do |ban| %> -<%= ban.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/default.cfg.erb b/builder/views/default.cfg.erb deleted file mode 100644 index e69de29..0000000 --- a/builder/views/default.cfg.erb +++ /dev/null diff --git a/builder/views/summon.bash.erb b/builder/views/summon.bash.erb deleted file mode 100644 index 5eb9649..0000000 --- a/builder/views/summon.bash.erb +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port <%= @port.to_s %> \ - -iwad "/home/zandronum/iwads/<%= @iwad.to_s %>" \ - +exec "/home/zandronum/config/<%= @config.to_s %>" \ - +CrashLog_Dir "/home/zandronum/logs/<%= @server_name.to_s %>.log" \ - +CrashLogs 2 \ - +map <%= @start_map.to_s %> \ No newline at end of file diff --git a/builder/views/whitelist.txt.erb b/builder/views/whitelist.txt.erb deleted file mode 100644 index 203d1d0..0000000 --- a/builder/views/whitelist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @white_list.nil? %> -<% @white_list.each do |white| %> -<%= white.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/docker-doom.bash b/docker-doom.bash deleted file mode 100755 index d6dd3bb..0000000 --- a/docker-doom.bash +++ /dev/null @@ -1,9 +0,0 @@ -docker run \ - --name docker-doom \ - --restart always \ - -v ./iwad:/home/zandronum/iwad \ - -v ./wad:/home/zandronum/wad \ - -v ./config/:/home/zandronum/config \ - -v ./player/:/home/zandronum/player \ - -p 10666:10666 \ - -d docker-doom diff --git a/docker-doom.ps1 b/docker-doom.ps1 deleted file mode 100755 index 8110689..0000000 --- a/docker-doom.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -docker container run ` - --name docker-doom ` - --restart always ` - -v .\iwad:/home/zandronum/iwad ` - -v .\wad:/home/zandronum/wad ` - -v .\config:/home/zandronum/config ` - -v .\player:/home/zandronum/player ` - -p 10666:10666 ` - -d docker-doom diff --git a/wad/.gitignore b/wad/.gitignore deleted file mode 100644 index 9cba1a6..0000000 --- a/wad/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# directory for patch wads and newer GZDoom pk3 & pk7 mods - -*.WAD -*.wad -*.PK3 -*.pk3 -*.PK7 -*.pk7 diff --git a/wad/DWANGO20.WAD b/wad/DWANGO20.WAD new file mode 100644 index 0000000..dbdfc34 --- /dev/null +++ b/wad/DWANGO20.WAD Binary files differ diff --git a/wad/doom2/ATTACK.WAD b/wad/doom2/ATTACK.WAD new file mode 100644 index 0000000..abf8d39 --- /dev/null +++ b/wad/doom2/ATTACK.WAD Binary files differ diff --git a/wad/doom2/BLACKTWR.WAD b/wad/doom2/BLACKTWR.WAD new file mode 100644 index 0000000..5aec986 --- /dev/null +++ b/wad/doom2/BLACKTWR.WAD Binary files differ diff --git a/wad/doom2/BLOODSEA.WAD b/wad/doom2/BLOODSEA.WAD new file mode 100644 index 0000000..82d4c09 --- /dev/null +++ b/wad/doom2/BLOODSEA.WAD Binary files differ diff --git a/wad/doom2/CANYON.WAD b/wad/doom2/CANYON.WAD new file mode 100644 index 0000000..fd9d1c4 --- /dev/null +++ b/wad/doom2/CANYON.WAD Binary files differ diff --git a/wad/doom2/CATWALK.WAD b/wad/doom2/CATWALK.WAD new file mode 100644 index 0000000..7a0481e --- /dev/null +++ b/wad/doom2/CATWALK.WAD Binary files differ diff --git a/wad/doom2/COMBINE.WAD b/wad/doom2/COMBINE.WAD new file mode 100644 index 0000000..87c9d8c --- /dev/null +++ b/wad/doom2/COMBINE.WAD Binary files differ diff --git a/wad/doom2/FISTULA.WAD b/wad/doom2/FISTULA.WAD new file mode 100644 index 0000000..08d62d4 --- /dev/null +++ b/wad/doom2/FISTULA.WAD Binary files differ diff --git a/wad/doom2/GARRISON.WAD b/wad/doom2/GARRISON.WAD new file mode 100644 index 0000000..7f825dd --- /dev/null +++ b/wad/doom2/GARRISON.WAD Binary files differ diff --git a/wad/doom2/GERYON.WAD b/wad/doom2/GERYON.WAD new file mode 100644 index 0000000..d036bc6 --- /dev/null +++ b/wad/doom2/GERYON.WAD Binary files differ diff --git a/wad/doom2/MANOR.WAD b/wad/doom2/MANOR.WAD new file mode 100644 index 0000000..47fda46 --- /dev/null +++ b/wad/doom2/MANOR.WAD Binary files differ diff --git a/wad/doom2/MEPHISTO.WAD b/wad/doom2/MEPHISTO.WAD new file mode 100644 index 0000000..2f3f342 --- /dev/null +++ b/wad/doom2/MEPHISTO.WAD Binary files differ diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/builder/views/adminlist.txt.erb b/builder/views/adminlist.txt.erb deleted file mode 100644 index df3aa78..0000000 --- a/builder/views/adminlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @admin_list.nil? %> -<% @admin_list.each do |admin| %> -<%= admin.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/banlist.txt.erb b/builder/views/banlist.txt.erb deleted file mode 100644 index c10a138..0000000 --- a/builder/views/banlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -93.99.233.*:capodecima - 93.99.233.6 - DDOS - June 19th 2016 - Perm -<% unless @ban_list.nil? %> -<% @ban_list.each do |ban| %> -<%= ban.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/default.cfg.erb b/builder/views/default.cfg.erb deleted file mode 100644 index e69de29..0000000 --- a/builder/views/default.cfg.erb +++ /dev/null diff --git a/builder/views/summon.bash.erb b/builder/views/summon.bash.erb deleted file mode 100644 index 5eb9649..0000000 --- a/builder/views/summon.bash.erb +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port <%= @port.to_s %> \ - -iwad "/home/zandronum/iwads/<%= @iwad.to_s %>" \ - +exec "/home/zandronum/config/<%= @config.to_s %>" \ - +CrashLog_Dir "/home/zandronum/logs/<%= @server_name.to_s %>.log" \ - +CrashLogs 2 \ - +map <%= @start_map.to_s %> \ No newline at end of file diff --git a/builder/views/whitelist.txt.erb b/builder/views/whitelist.txt.erb deleted file mode 100644 index 203d1d0..0000000 --- a/builder/views/whitelist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @white_list.nil? %> -<% @white_list.each do |white| %> -<%= white.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/docker-doom.bash b/docker-doom.bash deleted file mode 100755 index d6dd3bb..0000000 --- a/docker-doom.bash +++ /dev/null @@ -1,9 +0,0 @@ -docker run \ - --name docker-doom \ - --restart always \ - -v ./iwad:/home/zandronum/iwad \ - -v ./wad:/home/zandronum/wad \ - -v ./config/:/home/zandronum/config \ - -v ./player/:/home/zandronum/player \ - -p 10666:10666 \ - -d docker-doom diff --git a/docker-doom.ps1 b/docker-doom.ps1 deleted file mode 100755 index 8110689..0000000 --- a/docker-doom.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -docker container run ` - --name docker-doom ` - --restart always ` - -v .\iwad:/home/zandronum/iwad ` - -v .\wad:/home/zandronum/wad ` - -v .\config:/home/zandronum/config ` - -v .\player:/home/zandronum/player ` - -p 10666:10666 ` - -d docker-doom diff --git a/wad/.gitignore b/wad/.gitignore deleted file mode 100644 index 9cba1a6..0000000 --- a/wad/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# directory for patch wads and newer GZDoom pk3 & pk7 mods - -*.WAD -*.wad -*.PK3 -*.pk3 -*.PK7 -*.pk7 diff --git a/wad/DWANGO20.WAD b/wad/DWANGO20.WAD new file mode 100644 index 0000000..dbdfc34 --- /dev/null +++ b/wad/DWANGO20.WAD Binary files differ diff --git a/wad/doom2/ATTACK.WAD b/wad/doom2/ATTACK.WAD new file mode 100644 index 0000000..abf8d39 --- /dev/null +++ b/wad/doom2/ATTACK.WAD Binary files differ diff --git a/wad/doom2/BLACKTWR.WAD b/wad/doom2/BLACKTWR.WAD new file mode 100644 index 0000000..5aec986 --- /dev/null +++ b/wad/doom2/BLACKTWR.WAD Binary files differ diff --git a/wad/doom2/BLOODSEA.WAD b/wad/doom2/BLOODSEA.WAD new file mode 100644 index 0000000..82d4c09 --- /dev/null +++ b/wad/doom2/BLOODSEA.WAD Binary files differ diff --git a/wad/doom2/CANYON.WAD b/wad/doom2/CANYON.WAD new file mode 100644 index 0000000..fd9d1c4 --- /dev/null +++ b/wad/doom2/CANYON.WAD Binary files differ diff --git a/wad/doom2/CATWALK.WAD b/wad/doom2/CATWALK.WAD new file mode 100644 index 0000000..7a0481e --- /dev/null +++ b/wad/doom2/CATWALK.WAD Binary files differ diff --git a/wad/doom2/COMBINE.WAD b/wad/doom2/COMBINE.WAD new file mode 100644 index 0000000..87c9d8c --- /dev/null +++ b/wad/doom2/COMBINE.WAD Binary files differ diff --git a/wad/doom2/FISTULA.WAD b/wad/doom2/FISTULA.WAD new file mode 100644 index 0000000..08d62d4 --- /dev/null +++ b/wad/doom2/FISTULA.WAD Binary files differ diff --git a/wad/doom2/GARRISON.WAD b/wad/doom2/GARRISON.WAD new file mode 100644 index 0000000..7f825dd --- /dev/null +++ b/wad/doom2/GARRISON.WAD Binary files differ diff --git a/wad/doom2/GERYON.WAD b/wad/doom2/GERYON.WAD new file mode 100644 index 0000000..d036bc6 --- /dev/null +++ b/wad/doom2/GERYON.WAD Binary files differ diff --git a/wad/doom2/MANOR.WAD b/wad/doom2/MANOR.WAD new file mode 100644 index 0000000..47fda46 --- /dev/null +++ b/wad/doom2/MANOR.WAD Binary files differ diff --git a/wad/doom2/MEPHISTO.WAD b/wad/doom2/MEPHISTO.WAD new file mode 100644 index 0000000..2f3f342 --- /dev/null +++ b/wad/doom2/MEPHISTO.WAD Binary files differ diff --git a/wad/doom2/MINOS.WAD b/wad/doom2/MINOS.WAD new file mode 100644 index 0000000..5bcf22a --- /dev/null +++ b/wad/doom2/MINOS.WAD Binary files differ diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/builder/views/adminlist.txt.erb b/builder/views/adminlist.txt.erb deleted file mode 100644 index df3aa78..0000000 --- a/builder/views/adminlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @admin_list.nil? %> -<% @admin_list.each do |admin| %> -<%= admin.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/banlist.txt.erb b/builder/views/banlist.txt.erb deleted file mode 100644 index c10a138..0000000 --- a/builder/views/banlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -93.99.233.*:capodecima - 93.99.233.6 - DDOS - June 19th 2016 - Perm -<% unless @ban_list.nil? %> -<% @ban_list.each do |ban| %> -<%= ban.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/default.cfg.erb b/builder/views/default.cfg.erb deleted file mode 100644 index e69de29..0000000 --- a/builder/views/default.cfg.erb +++ /dev/null diff --git a/builder/views/summon.bash.erb b/builder/views/summon.bash.erb deleted file mode 100644 index 5eb9649..0000000 --- a/builder/views/summon.bash.erb +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port <%= @port.to_s %> \ - -iwad "/home/zandronum/iwads/<%= @iwad.to_s %>" \ - +exec "/home/zandronum/config/<%= @config.to_s %>" \ - +CrashLog_Dir "/home/zandronum/logs/<%= @server_name.to_s %>.log" \ - +CrashLogs 2 \ - +map <%= @start_map.to_s %> \ No newline at end of file diff --git a/builder/views/whitelist.txt.erb b/builder/views/whitelist.txt.erb deleted file mode 100644 index 203d1d0..0000000 --- a/builder/views/whitelist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @white_list.nil? %> -<% @white_list.each do |white| %> -<%= white.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/docker-doom.bash b/docker-doom.bash deleted file mode 100755 index d6dd3bb..0000000 --- a/docker-doom.bash +++ /dev/null @@ -1,9 +0,0 @@ -docker run \ - --name docker-doom \ - --restart always \ - -v ./iwad:/home/zandronum/iwad \ - -v ./wad:/home/zandronum/wad \ - -v ./config/:/home/zandronum/config \ - -v ./player/:/home/zandronum/player \ - -p 10666:10666 \ - -d docker-doom diff --git a/docker-doom.ps1 b/docker-doom.ps1 deleted file mode 100755 index 8110689..0000000 --- a/docker-doom.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -docker container run ` - --name docker-doom ` - --restart always ` - -v .\iwad:/home/zandronum/iwad ` - -v .\wad:/home/zandronum/wad ` - -v .\config:/home/zandronum/config ` - -v .\player:/home/zandronum/player ` - -p 10666:10666 ` - -d docker-doom diff --git a/wad/.gitignore b/wad/.gitignore deleted file mode 100644 index 9cba1a6..0000000 --- a/wad/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# directory for patch wads and newer GZDoom pk3 & pk7 mods - -*.WAD -*.wad -*.PK3 -*.pk3 -*.PK7 -*.pk7 diff --git a/wad/DWANGO20.WAD b/wad/DWANGO20.WAD new file mode 100644 index 0000000..dbdfc34 --- /dev/null +++ b/wad/DWANGO20.WAD Binary files differ diff --git a/wad/doom2/ATTACK.WAD b/wad/doom2/ATTACK.WAD new file mode 100644 index 0000000..abf8d39 --- /dev/null +++ b/wad/doom2/ATTACK.WAD Binary files differ diff --git a/wad/doom2/BLACKTWR.WAD b/wad/doom2/BLACKTWR.WAD new file mode 100644 index 0000000..5aec986 --- /dev/null +++ b/wad/doom2/BLACKTWR.WAD Binary files differ diff --git a/wad/doom2/BLOODSEA.WAD b/wad/doom2/BLOODSEA.WAD new file mode 100644 index 0000000..82d4c09 --- /dev/null +++ b/wad/doom2/BLOODSEA.WAD Binary files differ diff --git a/wad/doom2/CANYON.WAD b/wad/doom2/CANYON.WAD new file mode 100644 index 0000000..fd9d1c4 --- /dev/null +++ b/wad/doom2/CANYON.WAD Binary files differ diff --git a/wad/doom2/CATWALK.WAD b/wad/doom2/CATWALK.WAD new file mode 100644 index 0000000..7a0481e --- /dev/null +++ b/wad/doom2/CATWALK.WAD Binary files differ diff --git a/wad/doom2/COMBINE.WAD b/wad/doom2/COMBINE.WAD new file mode 100644 index 0000000..87c9d8c --- /dev/null +++ b/wad/doom2/COMBINE.WAD Binary files differ diff --git a/wad/doom2/FISTULA.WAD b/wad/doom2/FISTULA.WAD new file mode 100644 index 0000000..08d62d4 --- /dev/null +++ b/wad/doom2/FISTULA.WAD Binary files differ diff --git a/wad/doom2/GARRISON.WAD b/wad/doom2/GARRISON.WAD new file mode 100644 index 0000000..7f825dd --- /dev/null +++ b/wad/doom2/GARRISON.WAD Binary files differ diff --git a/wad/doom2/GERYON.WAD b/wad/doom2/GERYON.WAD new file mode 100644 index 0000000..d036bc6 --- /dev/null +++ b/wad/doom2/GERYON.WAD Binary files differ diff --git a/wad/doom2/MANOR.WAD b/wad/doom2/MANOR.WAD new file mode 100644 index 0000000..47fda46 --- /dev/null +++ b/wad/doom2/MANOR.WAD Binary files differ diff --git a/wad/doom2/MEPHISTO.WAD b/wad/doom2/MEPHISTO.WAD new file mode 100644 index 0000000..2f3f342 --- /dev/null +++ b/wad/doom2/MEPHISTO.WAD Binary files differ diff --git a/wad/doom2/MINOS.WAD b/wad/doom2/MINOS.WAD new file mode 100644 index 0000000..5bcf22a --- /dev/null +++ b/wad/doom2/MINOS.WAD Binary files differ diff --git a/wad/doom2/NESSUS.WAD b/wad/doom2/NESSUS.WAD new file mode 100644 index 0000000..ca0090e --- /dev/null +++ b/wad/doom2/NESSUS.WAD Binary files differ diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/builder/views/adminlist.txt.erb b/builder/views/adminlist.txt.erb deleted file mode 100644 index df3aa78..0000000 --- a/builder/views/adminlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @admin_list.nil? %> -<% @admin_list.each do |admin| %> -<%= admin.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/banlist.txt.erb b/builder/views/banlist.txt.erb deleted file mode 100644 index c10a138..0000000 --- a/builder/views/banlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -93.99.233.*:capodecima - 93.99.233.6 - DDOS - June 19th 2016 - Perm -<% unless @ban_list.nil? %> -<% @ban_list.each do |ban| %> -<%= ban.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/default.cfg.erb b/builder/views/default.cfg.erb deleted file mode 100644 index e69de29..0000000 --- a/builder/views/default.cfg.erb +++ /dev/null diff --git a/builder/views/summon.bash.erb b/builder/views/summon.bash.erb deleted file mode 100644 index 5eb9649..0000000 --- a/builder/views/summon.bash.erb +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port <%= @port.to_s %> \ - -iwad "/home/zandronum/iwads/<%= @iwad.to_s %>" \ - +exec "/home/zandronum/config/<%= @config.to_s %>" \ - +CrashLog_Dir "/home/zandronum/logs/<%= @server_name.to_s %>.log" \ - +CrashLogs 2 \ - +map <%= @start_map.to_s %> \ No newline at end of file diff --git a/builder/views/whitelist.txt.erb b/builder/views/whitelist.txt.erb deleted file mode 100644 index 203d1d0..0000000 --- a/builder/views/whitelist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @white_list.nil? %> -<% @white_list.each do |white| %> -<%= white.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/docker-doom.bash b/docker-doom.bash deleted file mode 100755 index d6dd3bb..0000000 --- a/docker-doom.bash +++ /dev/null @@ -1,9 +0,0 @@ -docker run \ - --name docker-doom \ - --restart always \ - -v ./iwad:/home/zandronum/iwad \ - -v ./wad:/home/zandronum/wad \ - -v ./config/:/home/zandronum/config \ - -v ./player/:/home/zandronum/player \ - -p 10666:10666 \ - -d docker-doom diff --git a/docker-doom.ps1 b/docker-doom.ps1 deleted file mode 100755 index 8110689..0000000 --- a/docker-doom.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -docker container run ` - --name docker-doom ` - --restart always ` - -v .\iwad:/home/zandronum/iwad ` - -v .\wad:/home/zandronum/wad ` - -v .\config:/home/zandronum/config ` - -v .\player:/home/zandronum/player ` - -p 10666:10666 ` - -d docker-doom diff --git a/wad/.gitignore b/wad/.gitignore deleted file mode 100644 index 9cba1a6..0000000 --- a/wad/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# directory for patch wads and newer GZDoom pk3 & pk7 mods - -*.WAD -*.wad -*.PK3 -*.pk3 -*.PK7 -*.pk7 diff --git a/wad/DWANGO20.WAD b/wad/DWANGO20.WAD new file mode 100644 index 0000000..dbdfc34 --- /dev/null +++ b/wad/DWANGO20.WAD Binary files differ diff --git a/wad/doom2/ATTACK.WAD b/wad/doom2/ATTACK.WAD new file mode 100644 index 0000000..abf8d39 --- /dev/null +++ b/wad/doom2/ATTACK.WAD Binary files differ diff --git a/wad/doom2/BLACKTWR.WAD b/wad/doom2/BLACKTWR.WAD new file mode 100644 index 0000000..5aec986 --- /dev/null +++ b/wad/doom2/BLACKTWR.WAD Binary files differ diff --git a/wad/doom2/BLOODSEA.WAD b/wad/doom2/BLOODSEA.WAD new file mode 100644 index 0000000..82d4c09 --- /dev/null +++ b/wad/doom2/BLOODSEA.WAD Binary files differ diff --git a/wad/doom2/CANYON.WAD b/wad/doom2/CANYON.WAD new file mode 100644 index 0000000..fd9d1c4 --- /dev/null +++ b/wad/doom2/CANYON.WAD Binary files differ diff --git a/wad/doom2/CATWALK.WAD b/wad/doom2/CATWALK.WAD new file mode 100644 index 0000000..7a0481e --- /dev/null +++ b/wad/doom2/CATWALK.WAD Binary files differ diff --git a/wad/doom2/COMBINE.WAD b/wad/doom2/COMBINE.WAD new file mode 100644 index 0000000..87c9d8c --- /dev/null +++ b/wad/doom2/COMBINE.WAD Binary files differ diff --git a/wad/doom2/FISTULA.WAD b/wad/doom2/FISTULA.WAD new file mode 100644 index 0000000..08d62d4 --- /dev/null +++ b/wad/doom2/FISTULA.WAD Binary files differ diff --git a/wad/doom2/GARRISON.WAD b/wad/doom2/GARRISON.WAD new file mode 100644 index 0000000..7f825dd --- /dev/null +++ b/wad/doom2/GARRISON.WAD Binary files differ diff --git a/wad/doom2/GERYON.WAD b/wad/doom2/GERYON.WAD new file mode 100644 index 0000000..d036bc6 --- /dev/null +++ b/wad/doom2/GERYON.WAD Binary files differ diff --git a/wad/doom2/MANOR.WAD b/wad/doom2/MANOR.WAD new file mode 100644 index 0000000..47fda46 --- /dev/null +++ b/wad/doom2/MANOR.WAD Binary files differ diff --git a/wad/doom2/MEPHISTO.WAD b/wad/doom2/MEPHISTO.WAD new file mode 100644 index 0000000..2f3f342 --- /dev/null +++ b/wad/doom2/MEPHISTO.WAD Binary files differ diff --git a/wad/doom2/MINOS.WAD b/wad/doom2/MINOS.WAD new file mode 100644 index 0000000..5bcf22a --- /dev/null +++ b/wad/doom2/MINOS.WAD Binary files differ diff --git a/wad/doom2/NESSUS.WAD b/wad/doom2/NESSUS.WAD new file mode 100644 index 0000000..ca0090e --- /dev/null +++ b/wad/doom2/NESSUS.WAD Binary files differ diff --git a/wad/doom2/PARADOX.WAD b/wad/doom2/PARADOX.WAD new file mode 100644 index 0000000..c636cbc --- /dev/null +++ b/wad/doom2/PARADOX.WAD Binary files differ diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/builder/views/adminlist.txt.erb b/builder/views/adminlist.txt.erb deleted file mode 100644 index df3aa78..0000000 --- a/builder/views/adminlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @admin_list.nil? %> -<% @admin_list.each do |admin| %> -<%= admin.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/banlist.txt.erb b/builder/views/banlist.txt.erb deleted file mode 100644 index c10a138..0000000 --- a/builder/views/banlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -93.99.233.*:capodecima - 93.99.233.6 - DDOS - June 19th 2016 - Perm -<% unless @ban_list.nil? %> -<% @ban_list.each do |ban| %> -<%= ban.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/default.cfg.erb b/builder/views/default.cfg.erb deleted file mode 100644 index e69de29..0000000 --- a/builder/views/default.cfg.erb +++ /dev/null diff --git a/builder/views/summon.bash.erb b/builder/views/summon.bash.erb deleted file mode 100644 index 5eb9649..0000000 --- a/builder/views/summon.bash.erb +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port <%= @port.to_s %> \ - -iwad "/home/zandronum/iwads/<%= @iwad.to_s %>" \ - +exec "/home/zandronum/config/<%= @config.to_s %>" \ - +CrashLog_Dir "/home/zandronum/logs/<%= @server_name.to_s %>.log" \ - +CrashLogs 2 \ - +map <%= @start_map.to_s %> \ No newline at end of file diff --git a/builder/views/whitelist.txt.erb b/builder/views/whitelist.txt.erb deleted file mode 100644 index 203d1d0..0000000 --- a/builder/views/whitelist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @white_list.nil? %> -<% @white_list.each do |white| %> -<%= white.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/docker-doom.bash b/docker-doom.bash deleted file mode 100755 index d6dd3bb..0000000 --- a/docker-doom.bash +++ /dev/null @@ -1,9 +0,0 @@ -docker run \ - --name docker-doom \ - --restart always \ - -v ./iwad:/home/zandronum/iwad \ - -v ./wad:/home/zandronum/wad \ - -v ./config/:/home/zandronum/config \ - -v ./player/:/home/zandronum/player \ - -p 10666:10666 \ - -d docker-doom diff --git a/docker-doom.ps1 b/docker-doom.ps1 deleted file mode 100755 index 8110689..0000000 --- a/docker-doom.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -docker container run ` - --name docker-doom ` - --restart always ` - -v .\iwad:/home/zandronum/iwad ` - -v .\wad:/home/zandronum/wad ` - -v .\config:/home/zandronum/config ` - -v .\player:/home/zandronum/player ` - -p 10666:10666 ` - -d docker-doom diff --git a/wad/.gitignore b/wad/.gitignore deleted file mode 100644 index 9cba1a6..0000000 --- a/wad/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# directory for patch wads and newer GZDoom pk3 & pk7 mods - -*.WAD -*.wad -*.PK3 -*.pk3 -*.PK7 -*.pk7 diff --git a/wad/DWANGO20.WAD b/wad/DWANGO20.WAD new file mode 100644 index 0000000..dbdfc34 --- /dev/null +++ b/wad/DWANGO20.WAD Binary files differ diff --git a/wad/doom2/ATTACK.WAD b/wad/doom2/ATTACK.WAD new file mode 100644 index 0000000..abf8d39 --- /dev/null +++ b/wad/doom2/ATTACK.WAD Binary files differ diff --git a/wad/doom2/BLACKTWR.WAD b/wad/doom2/BLACKTWR.WAD new file mode 100644 index 0000000..5aec986 --- /dev/null +++ b/wad/doom2/BLACKTWR.WAD Binary files differ diff --git a/wad/doom2/BLOODSEA.WAD b/wad/doom2/BLOODSEA.WAD new file mode 100644 index 0000000..82d4c09 --- /dev/null +++ b/wad/doom2/BLOODSEA.WAD Binary files differ diff --git a/wad/doom2/CANYON.WAD b/wad/doom2/CANYON.WAD new file mode 100644 index 0000000..fd9d1c4 --- /dev/null +++ b/wad/doom2/CANYON.WAD Binary files differ diff --git a/wad/doom2/CATWALK.WAD b/wad/doom2/CATWALK.WAD new file mode 100644 index 0000000..7a0481e --- /dev/null +++ b/wad/doom2/CATWALK.WAD Binary files differ diff --git a/wad/doom2/COMBINE.WAD b/wad/doom2/COMBINE.WAD new file mode 100644 index 0000000..87c9d8c --- /dev/null +++ b/wad/doom2/COMBINE.WAD Binary files differ diff --git a/wad/doom2/FISTULA.WAD b/wad/doom2/FISTULA.WAD new file mode 100644 index 0000000..08d62d4 --- /dev/null +++ b/wad/doom2/FISTULA.WAD Binary files differ diff --git a/wad/doom2/GARRISON.WAD b/wad/doom2/GARRISON.WAD new file mode 100644 index 0000000..7f825dd --- /dev/null +++ b/wad/doom2/GARRISON.WAD Binary files differ diff --git a/wad/doom2/GERYON.WAD b/wad/doom2/GERYON.WAD new file mode 100644 index 0000000..d036bc6 --- /dev/null +++ b/wad/doom2/GERYON.WAD Binary files differ diff --git a/wad/doom2/MANOR.WAD b/wad/doom2/MANOR.WAD new file mode 100644 index 0000000..47fda46 --- /dev/null +++ b/wad/doom2/MANOR.WAD Binary files differ diff --git a/wad/doom2/MEPHISTO.WAD b/wad/doom2/MEPHISTO.WAD new file mode 100644 index 0000000..2f3f342 --- /dev/null +++ b/wad/doom2/MEPHISTO.WAD Binary files differ diff --git a/wad/doom2/MINOS.WAD b/wad/doom2/MINOS.WAD new file mode 100644 index 0000000..5bcf22a --- /dev/null +++ b/wad/doom2/MINOS.WAD Binary files differ diff --git a/wad/doom2/NESSUS.WAD b/wad/doom2/NESSUS.WAD new file mode 100644 index 0000000..ca0090e --- /dev/null +++ b/wad/doom2/NESSUS.WAD Binary files differ diff --git a/wad/doom2/PARADOX.WAD b/wad/doom2/PARADOX.WAD new file mode 100644 index 0000000..c636cbc --- /dev/null +++ b/wad/doom2/PARADOX.WAD Binary files differ diff --git a/wad/doom2/SUBSPACE.WAD b/wad/doom2/SUBSPACE.WAD new file mode 100644 index 0000000..a052ecf --- /dev/null +++ b/wad/doom2/SUBSPACE.WAD Binary files differ diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/builder/views/adminlist.txt.erb b/builder/views/adminlist.txt.erb deleted file mode 100644 index df3aa78..0000000 --- a/builder/views/adminlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @admin_list.nil? %> -<% @admin_list.each do |admin| %> -<%= admin.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/banlist.txt.erb b/builder/views/banlist.txt.erb deleted file mode 100644 index c10a138..0000000 --- a/builder/views/banlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -93.99.233.*:capodecima - 93.99.233.6 - DDOS - June 19th 2016 - Perm -<% unless @ban_list.nil? %> -<% @ban_list.each do |ban| %> -<%= ban.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/default.cfg.erb b/builder/views/default.cfg.erb deleted file mode 100644 index e69de29..0000000 --- a/builder/views/default.cfg.erb +++ /dev/null diff --git a/builder/views/summon.bash.erb b/builder/views/summon.bash.erb deleted file mode 100644 index 5eb9649..0000000 --- a/builder/views/summon.bash.erb +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port <%= @port.to_s %> \ - -iwad "/home/zandronum/iwads/<%= @iwad.to_s %>" \ - +exec "/home/zandronum/config/<%= @config.to_s %>" \ - +CrashLog_Dir "/home/zandronum/logs/<%= @server_name.to_s %>.log" \ - +CrashLogs 2 \ - +map <%= @start_map.to_s %> \ No newline at end of file diff --git a/builder/views/whitelist.txt.erb b/builder/views/whitelist.txt.erb deleted file mode 100644 index 203d1d0..0000000 --- a/builder/views/whitelist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @white_list.nil? %> -<% @white_list.each do |white| %> -<%= white.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/docker-doom.bash b/docker-doom.bash deleted file mode 100755 index d6dd3bb..0000000 --- a/docker-doom.bash +++ /dev/null @@ -1,9 +0,0 @@ -docker run \ - --name docker-doom \ - --restart always \ - -v ./iwad:/home/zandronum/iwad \ - -v ./wad:/home/zandronum/wad \ - -v ./config/:/home/zandronum/config \ - -v ./player/:/home/zandronum/player \ - -p 10666:10666 \ - -d docker-doom diff --git a/docker-doom.ps1 b/docker-doom.ps1 deleted file mode 100755 index 8110689..0000000 --- a/docker-doom.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -docker container run ` - --name docker-doom ` - --restart always ` - -v .\iwad:/home/zandronum/iwad ` - -v .\wad:/home/zandronum/wad ` - -v .\config:/home/zandronum/config ` - -v .\player:/home/zandronum/player ` - -p 10666:10666 ` - -d docker-doom diff --git a/wad/.gitignore b/wad/.gitignore deleted file mode 100644 index 9cba1a6..0000000 --- a/wad/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# directory for patch wads and newer GZDoom pk3 & pk7 mods - -*.WAD -*.wad -*.PK3 -*.pk3 -*.PK7 -*.pk7 diff --git a/wad/DWANGO20.WAD b/wad/DWANGO20.WAD new file mode 100644 index 0000000..dbdfc34 --- /dev/null +++ b/wad/DWANGO20.WAD Binary files differ diff --git a/wad/doom2/ATTACK.WAD b/wad/doom2/ATTACK.WAD new file mode 100644 index 0000000..abf8d39 --- /dev/null +++ b/wad/doom2/ATTACK.WAD Binary files differ diff --git a/wad/doom2/BLACKTWR.WAD b/wad/doom2/BLACKTWR.WAD new file mode 100644 index 0000000..5aec986 --- /dev/null +++ b/wad/doom2/BLACKTWR.WAD Binary files differ diff --git a/wad/doom2/BLOODSEA.WAD b/wad/doom2/BLOODSEA.WAD new file mode 100644 index 0000000..82d4c09 --- /dev/null +++ b/wad/doom2/BLOODSEA.WAD Binary files differ diff --git a/wad/doom2/CANYON.WAD b/wad/doom2/CANYON.WAD new file mode 100644 index 0000000..fd9d1c4 --- /dev/null +++ b/wad/doom2/CANYON.WAD Binary files differ diff --git a/wad/doom2/CATWALK.WAD b/wad/doom2/CATWALK.WAD new file mode 100644 index 0000000..7a0481e --- /dev/null +++ b/wad/doom2/CATWALK.WAD Binary files differ diff --git a/wad/doom2/COMBINE.WAD b/wad/doom2/COMBINE.WAD new file mode 100644 index 0000000..87c9d8c --- /dev/null +++ b/wad/doom2/COMBINE.WAD Binary files differ diff --git a/wad/doom2/FISTULA.WAD b/wad/doom2/FISTULA.WAD new file mode 100644 index 0000000..08d62d4 --- /dev/null +++ b/wad/doom2/FISTULA.WAD Binary files differ diff --git a/wad/doom2/GARRISON.WAD b/wad/doom2/GARRISON.WAD new file mode 100644 index 0000000..7f825dd --- /dev/null +++ b/wad/doom2/GARRISON.WAD Binary files differ diff --git a/wad/doom2/GERYON.WAD b/wad/doom2/GERYON.WAD new file mode 100644 index 0000000..d036bc6 --- /dev/null +++ b/wad/doom2/GERYON.WAD Binary files differ diff --git a/wad/doom2/MANOR.WAD b/wad/doom2/MANOR.WAD new file mode 100644 index 0000000..47fda46 --- /dev/null +++ b/wad/doom2/MANOR.WAD Binary files differ diff --git a/wad/doom2/MEPHISTO.WAD b/wad/doom2/MEPHISTO.WAD new file mode 100644 index 0000000..2f3f342 --- /dev/null +++ b/wad/doom2/MEPHISTO.WAD Binary files differ diff --git a/wad/doom2/MINOS.WAD b/wad/doom2/MINOS.WAD new file mode 100644 index 0000000..5bcf22a --- /dev/null +++ b/wad/doom2/MINOS.WAD Binary files differ diff --git a/wad/doom2/NESSUS.WAD b/wad/doom2/NESSUS.WAD new file mode 100644 index 0000000..ca0090e --- /dev/null +++ b/wad/doom2/NESSUS.WAD Binary files differ diff --git a/wad/doom2/PARADOX.WAD b/wad/doom2/PARADOX.WAD new file mode 100644 index 0000000..c636cbc --- /dev/null +++ b/wad/doom2/PARADOX.WAD Binary files differ diff --git a/wad/doom2/SUBSPACE.WAD b/wad/doom2/SUBSPACE.WAD new file mode 100644 index 0000000..a052ecf --- /dev/null +++ b/wad/doom2/SUBSPACE.WAD Binary files differ diff --git a/wad/doom2/SUBTERRA.WAD b/wad/doom2/SUBTERRA.WAD new file mode 100644 index 0000000..e4c82be --- /dev/null +++ b/wad/doom2/SUBTERRA.WAD Binary files differ diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/builder/views/adminlist.txt.erb b/builder/views/adminlist.txt.erb deleted file mode 100644 index df3aa78..0000000 --- a/builder/views/adminlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @admin_list.nil? %> -<% @admin_list.each do |admin| %> -<%= admin.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/banlist.txt.erb b/builder/views/banlist.txt.erb deleted file mode 100644 index c10a138..0000000 --- a/builder/views/banlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -93.99.233.*:capodecima - 93.99.233.6 - DDOS - June 19th 2016 - Perm -<% unless @ban_list.nil? %> -<% @ban_list.each do |ban| %> -<%= ban.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/default.cfg.erb b/builder/views/default.cfg.erb deleted file mode 100644 index e69de29..0000000 --- a/builder/views/default.cfg.erb +++ /dev/null diff --git a/builder/views/summon.bash.erb b/builder/views/summon.bash.erb deleted file mode 100644 index 5eb9649..0000000 --- a/builder/views/summon.bash.erb +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port <%= @port.to_s %> \ - -iwad "/home/zandronum/iwads/<%= @iwad.to_s %>" \ - +exec "/home/zandronum/config/<%= @config.to_s %>" \ - +CrashLog_Dir "/home/zandronum/logs/<%= @server_name.to_s %>.log" \ - +CrashLogs 2 \ - +map <%= @start_map.to_s %> \ No newline at end of file diff --git a/builder/views/whitelist.txt.erb b/builder/views/whitelist.txt.erb deleted file mode 100644 index 203d1d0..0000000 --- a/builder/views/whitelist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @white_list.nil? %> -<% @white_list.each do |white| %> -<%= white.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/docker-doom.bash b/docker-doom.bash deleted file mode 100755 index d6dd3bb..0000000 --- a/docker-doom.bash +++ /dev/null @@ -1,9 +0,0 @@ -docker run \ - --name docker-doom \ - --restart always \ - -v ./iwad:/home/zandronum/iwad \ - -v ./wad:/home/zandronum/wad \ - -v ./config/:/home/zandronum/config \ - -v ./player/:/home/zandronum/player \ - -p 10666:10666 \ - -d docker-doom diff --git a/docker-doom.ps1 b/docker-doom.ps1 deleted file mode 100755 index 8110689..0000000 --- a/docker-doom.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -docker container run ` - --name docker-doom ` - --restart always ` - -v .\iwad:/home/zandronum/iwad ` - -v .\wad:/home/zandronum/wad ` - -v .\config:/home/zandronum/config ` - -v .\player:/home/zandronum/player ` - -p 10666:10666 ` - -d docker-doom diff --git a/wad/.gitignore b/wad/.gitignore deleted file mode 100644 index 9cba1a6..0000000 --- a/wad/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# directory for patch wads and newer GZDoom pk3 & pk7 mods - -*.WAD -*.wad -*.PK3 -*.pk3 -*.PK7 -*.pk7 diff --git a/wad/DWANGO20.WAD b/wad/DWANGO20.WAD new file mode 100644 index 0000000..dbdfc34 --- /dev/null +++ b/wad/DWANGO20.WAD Binary files differ diff --git a/wad/doom2/ATTACK.WAD b/wad/doom2/ATTACK.WAD new file mode 100644 index 0000000..abf8d39 --- /dev/null +++ b/wad/doom2/ATTACK.WAD Binary files differ diff --git a/wad/doom2/BLACKTWR.WAD b/wad/doom2/BLACKTWR.WAD new file mode 100644 index 0000000..5aec986 --- /dev/null +++ b/wad/doom2/BLACKTWR.WAD Binary files differ diff --git a/wad/doom2/BLOODSEA.WAD b/wad/doom2/BLOODSEA.WAD new file mode 100644 index 0000000..82d4c09 --- /dev/null +++ b/wad/doom2/BLOODSEA.WAD Binary files differ diff --git a/wad/doom2/CANYON.WAD b/wad/doom2/CANYON.WAD new file mode 100644 index 0000000..fd9d1c4 --- /dev/null +++ b/wad/doom2/CANYON.WAD Binary files differ diff --git a/wad/doom2/CATWALK.WAD b/wad/doom2/CATWALK.WAD new file mode 100644 index 0000000..7a0481e --- /dev/null +++ b/wad/doom2/CATWALK.WAD Binary files differ diff --git a/wad/doom2/COMBINE.WAD b/wad/doom2/COMBINE.WAD new file mode 100644 index 0000000..87c9d8c --- /dev/null +++ b/wad/doom2/COMBINE.WAD Binary files differ diff --git a/wad/doom2/FISTULA.WAD b/wad/doom2/FISTULA.WAD new file mode 100644 index 0000000..08d62d4 --- /dev/null +++ b/wad/doom2/FISTULA.WAD Binary files differ diff --git a/wad/doom2/GARRISON.WAD b/wad/doom2/GARRISON.WAD new file mode 100644 index 0000000..7f825dd --- /dev/null +++ b/wad/doom2/GARRISON.WAD Binary files differ diff --git a/wad/doom2/GERYON.WAD b/wad/doom2/GERYON.WAD new file mode 100644 index 0000000..d036bc6 --- /dev/null +++ b/wad/doom2/GERYON.WAD Binary files differ diff --git a/wad/doom2/MANOR.WAD b/wad/doom2/MANOR.WAD new file mode 100644 index 0000000..47fda46 --- /dev/null +++ b/wad/doom2/MANOR.WAD Binary files differ diff --git a/wad/doom2/MEPHISTO.WAD b/wad/doom2/MEPHISTO.WAD new file mode 100644 index 0000000..2f3f342 --- /dev/null +++ b/wad/doom2/MEPHISTO.WAD Binary files differ diff --git a/wad/doom2/MINOS.WAD b/wad/doom2/MINOS.WAD new file mode 100644 index 0000000..5bcf22a --- /dev/null +++ b/wad/doom2/MINOS.WAD Binary files differ diff --git a/wad/doom2/NESSUS.WAD b/wad/doom2/NESSUS.WAD new file mode 100644 index 0000000..ca0090e --- /dev/null +++ b/wad/doom2/NESSUS.WAD Binary files differ diff --git a/wad/doom2/PARADOX.WAD b/wad/doom2/PARADOX.WAD new file mode 100644 index 0000000..c636cbc --- /dev/null +++ b/wad/doom2/PARADOX.WAD Binary files differ diff --git a/wad/doom2/SUBSPACE.WAD b/wad/doom2/SUBSPACE.WAD new file mode 100644 index 0000000..a052ecf --- /dev/null +++ b/wad/doom2/SUBSPACE.WAD Binary files differ diff --git a/wad/doom2/SUBTERRA.WAD b/wad/doom2/SUBTERRA.WAD new file mode 100644 index 0000000..e4c82be --- /dev/null +++ b/wad/doom2/SUBTERRA.WAD Binary files differ diff --git a/wad/doom2/TEETH.WAD b/wad/doom2/TEETH.WAD new file mode 100644 index 0000000..e67a02b --- /dev/null +++ b/wad/doom2/TEETH.WAD Binary files differ diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/builder/views/adminlist.txt.erb b/builder/views/adminlist.txt.erb deleted file mode 100644 index df3aa78..0000000 --- a/builder/views/adminlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @admin_list.nil? %> -<% @admin_list.each do |admin| %> -<%= admin.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/banlist.txt.erb b/builder/views/banlist.txt.erb deleted file mode 100644 index c10a138..0000000 --- a/builder/views/banlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -93.99.233.*:capodecima - 93.99.233.6 - DDOS - June 19th 2016 - Perm -<% unless @ban_list.nil? %> -<% @ban_list.each do |ban| %> -<%= ban.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/default.cfg.erb b/builder/views/default.cfg.erb deleted file mode 100644 index e69de29..0000000 --- a/builder/views/default.cfg.erb +++ /dev/null diff --git a/builder/views/summon.bash.erb b/builder/views/summon.bash.erb deleted file mode 100644 index 5eb9649..0000000 --- a/builder/views/summon.bash.erb +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port <%= @port.to_s %> \ - -iwad "/home/zandronum/iwads/<%= @iwad.to_s %>" \ - +exec "/home/zandronum/config/<%= @config.to_s %>" \ - +CrashLog_Dir "/home/zandronum/logs/<%= @server_name.to_s %>.log" \ - +CrashLogs 2 \ - +map <%= @start_map.to_s %> \ No newline at end of file diff --git a/builder/views/whitelist.txt.erb b/builder/views/whitelist.txt.erb deleted file mode 100644 index 203d1d0..0000000 --- a/builder/views/whitelist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @white_list.nil? %> -<% @white_list.each do |white| %> -<%= white.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/docker-doom.bash b/docker-doom.bash deleted file mode 100755 index d6dd3bb..0000000 --- a/docker-doom.bash +++ /dev/null @@ -1,9 +0,0 @@ -docker run \ - --name docker-doom \ - --restart always \ - -v ./iwad:/home/zandronum/iwad \ - -v ./wad:/home/zandronum/wad \ - -v ./config/:/home/zandronum/config \ - -v ./player/:/home/zandronum/player \ - -p 10666:10666 \ - -d docker-doom diff --git a/docker-doom.ps1 b/docker-doom.ps1 deleted file mode 100755 index 8110689..0000000 --- a/docker-doom.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -docker container run ` - --name docker-doom ` - --restart always ` - -v .\iwad:/home/zandronum/iwad ` - -v .\wad:/home/zandronum/wad ` - -v .\config:/home/zandronum/config ` - -v .\player:/home/zandronum/player ` - -p 10666:10666 ` - -d docker-doom diff --git a/wad/.gitignore b/wad/.gitignore deleted file mode 100644 index 9cba1a6..0000000 --- a/wad/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# directory for patch wads and newer GZDoom pk3 & pk7 mods - -*.WAD -*.wad -*.PK3 -*.pk3 -*.PK7 -*.pk7 diff --git a/wad/DWANGO20.WAD b/wad/DWANGO20.WAD new file mode 100644 index 0000000..dbdfc34 --- /dev/null +++ b/wad/DWANGO20.WAD Binary files differ diff --git a/wad/doom2/ATTACK.WAD b/wad/doom2/ATTACK.WAD new file mode 100644 index 0000000..abf8d39 --- /dev/null +++ b/wad/doom2/ATTACK.WAD Binary files differ diff --git a/wad/doom2/BLACKTWR.WAD b/wad/doom2/BLACKTWR.WAD new file mode 100644 index 0000000..5aec986 --- /dev/null +++ b/wad/doom2/BLACKTWR.WAD Binary files differ diff --git a/wad/doom2/BLOODSEA.WAD b/wad/doom2/BLOODSEA.WAD new file mode 100644 index 0000000..82d4c09 --- /dev/null +++ b/wad/doom2/BLOODSEA.WAD Binary files differ diff --git a/wad/doom2/CANYON.WAD b/wad/doom2/CANYON.WAD new file mode 100644 index 0000000..fd9d1c4 --- /dev/null +++ b/wad/doom2/CANYON.WAD Binary files differ diff --git a/wad/doom2/CATWALK.WAD b/wad/doom2/CATWALK.WAD new file mode 100644 index 0000000..7a0481e --- /dev/null +++ b/wad/doom2/CATWALK.WAD Binary files differ diff --git a/wad/doom2/COMBINE.WAD b/wad/doom2/COMBINE.WAD new file mode 100644 index 0000000..87c9d8c --- /dev/null +++ b/wad/doom2/COMBINE.WAD Binary files differ diff --git a/wad/doom2/FISTULA.WAD b/wad/doom2/FISTULA.WAD new file mode 100644 index 0000000..08d62d4 --- /dev/null +++ b/wad/doom2/FISTULA.WAD Binary files differ diff --git a/wad/doom2/GARRISON.WAD b/wad/doom2/GARRISON.WAD new file mode 100644 index 0000000..7f825dd --- /dev/null +++ b/wad/doom2/GARRISON.WAD Binary files differ diff --git a/wad/doom2/GERYON.WAD b/wad/doom2/GERYON.WAD new file mode 100644 index 0000000..d036bc6 --- /dev/null +++ b/wad/doom2/GERYON.WAD Binary files differ diff --git a/wad/doom2/MANOR.WAD b/wad/doom2/MANOR.WAD new file mode 100644 index 0000000..47fda46 --- /dev/null +++ b/wad/doom2/MANOR.WAD Binary files differ diff --git a/wad/doom2/MEPHISTO.WAD b/wad/doom2/MEPHISTO.WAD new file mode 100644 index 0000000..2f3f342 --- /dev/null +++ b/wad/doom2/MEPHISTO.WAD Binary files differ diff --git a/wad/doom2/MINOS.WAD b/wad/doom2/MINOS.WAD new file mode 100644 index 0000000..5bcf22a --- /dev/null +++ b/wad/doom2/MINOS.WAD Binary files differ diff --git a/wad/doom2/NESSUS.WAD b/wad/doom2/NESSUS.WAD new file mode 100644 index 0000000..ca0090e --- /dev/null +++ b/wad/doom2/NESSUS.WAD Binary files differ diff --git a/wad/doom2/PARADOX.WAD b/wad/doom2/PARADOX.WAD new file mode 100644 index 0000000..c636cbc --- /dev/null +++ b/wad/doom2/PARADOX.WAD Binary files differ diff --git a/wad/doom2/SUBSPACE.WAD b/wad/doom2/SUBSPACE.WAD new file mode 100644 index 0000000..a052ecf --- /dev/null +++ b/wad/doom2/SUBSPACE.WAD Binary files differ diff --git a/wad/doom2/SUBTERRA.WAD b/wad/doom2/SUBTERRA.WAD new file mode 100644 index 0000000..e4c82be --- /dev/null +++ b/wad/doom2/SUBTERRA.WAD Binary files differ diff --git a/wad/doom2/TEETH.WAD b/wad/doom2/TEETH.WAD new file mode 100644 index 0000000..e67a02b --- /dev/null +++ b/wad/doom2/TEETH.WAD Binary files differ diff --git a/wad/doom2/TTRAP.WAD b/wad/doom2/TTRAP.WAD new file mode 100644 index 0000000..2b1b1e8 --- /dev/null +++ b/wad/doom2/TTRAP.WAD Binary files differ diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/builder/views/adminlist.txt.erb b/builder/views/adminlist.txt.erb deleted file mode 100644 index df3aa78..0000000 --- a/builder/views/adminlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @admin_list.nil? %> -<% @admin_list.each do |admin| %> -<%= admin.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/banlist.txt.erb b/builder/views/banlist.txt.erb deleted file mode 100644 index c10a138..0000000 --- a/builder/views/banlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -93.99.233.*:capodecima - 93.99.233.6 - DDOS - June 19th 2016 - Perm -<% unless @ban_list.nil? %> -<% @ban_list.each do |ban| %> -<%= ban.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/default.cfg.erb b/builder/views/default.cfg.erb deleted file mode 100644 index e69de29..0000000 --- a/builder/views/default.cfg.erb +++ /dev/null diff --git a/builder/views/summon.bash.erb b/builder/views/summon.bash.erb deleted file mode 100644 index 5eb9649..0000000 --- a/builder/views/summon.bash.erb +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port <%= @port.to_s %> \ - -iwad "/home/zandronum/iwads/<%= @iwad.to_s %>" \ - +exec "/home/zandronum/config/<%= @config.to_s %>" \ - +CrashLog_Dir "/home/zandronum/logs/<%= @server_name.to_s %>.log" \ - +CrashLogs 2 \ - +map <%= @start_map.to_s %> \ No newline at end of file diff --git a/builder/views/whitelist.txt.erb b/builder/views/whitelist.txt.erb deleted file mode 100644 index 203d1d0..0000000 --- a/builder/views/whitelist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @white_list.nil? %> -<% @white_list.each do |white| %> -<%= white.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/docker-doom.bash b/docker-doom.bash deleted file mode 100755 index d6dd3bb..0000000 --- a/docker-doom.bash +++ /dev/null @@ -1,9 +0,0 @@ -docker run \ - --name docker-doom \ - --restart always \ - -v ./iwad:/home/zandronum/iwad \ - -v ./wad:/home/zandronum/wad \ - -v ./config/:/home/zandronum/config \ - -v ./player/:/home/zandronum/player \ - -p 10666:10666 \ - -d docker-doom diff --git a/docker-doom.ps1 b/docker-doom.ps1 deleted file mode 100755 index 8110689..0000000 --- a/docker-doom.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -docker container run ` - --name docker-doom ` - --restart always ` - -v .\iwad:/home/zandronum/iwad ` - -v .\wad:/home/zandronum/wad ` - -v .\config:/home/zandronum/config ` - -v .\player:/home/zandronum/player ` - -p 10666:10666 ` - -d docker-doom diff --git a/wad/.gitignore b/wad/.gitignore deleted file mode 100644 index 9cba1a6..0000000 --- a/wad/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# directory for patch wads and newer GZDoom pk3 & pk7 mods - -*.WAD -*.wad -*.PK3 -*.pk3 -*.PK7 -*.pk7 diff --git a/wad/DWANGO20.WAD b/wad/DWANGO20.WAD new file mode 100644 index 0000000..dbdfc34 --- /dev/null +++ b/wad/DWANGO20.WAD Binary files differ diff --git a/wad/doom2/ATTACK.WAD b/wad/doom2/ATTACK.WAD new file mode 100644 index 0000000..abf8d39 --- /dev/null +++ b/wad/doom2/ATTACK.WAD Binary files differ diff --git a/wad/doom2/BLACKTWR.WAD b/wad/doom2/BLACKTWR.WAD new file mode 100644 index 0000000..5aec986 --- /dev/null +++ b/wad/doom2/BLACKTWR.WAD Binary files differ diff --git a/wad/doom2/BLOODSEA.WAD b/wad/doom2/BLOODSEA.WAD new file mode 100644 index 0000000..82d4c09 --- /dev/null +++ b/wad/doom2/BLOODSEA.WAD Binary files differ diff --git a/wad/doom2/CANYON.WAD b/wad/doom2/CANYON.WAD new file mode 100644 index 0000000..fd9d1c4 --- /dev/null +++ b/wad/doom2/CANYON.WAD Binary files differ diff --git a/wad/doom2/CATWALK.WAD b/wad/doom2/CATWALK.WAD new file mode 100644 index 0000000..7a0481e --- /dev/null +++ b/wad/doom2/CATWALK.WAD Binary files differ diff --git a/wad/doom2/COMBINE.WAD b/wad/doom2/COMBINE.WAD new file mode 100644 index 0000000..87c9d8c --- /dev/null +++ b/wad/doom2/COMBINE.WAD Binary files differ diff --git a/wad/doom2/FISTULA.WAD b/wad/doom2/FISTULA.WAD new file mode 100644 index 0000000..08d62d4 --- /dev/null +++ b/wad/doom2/FISTULA.WAD Binary files differ diff --git a/wad/doom2/GARRISON.WAD b/wad/doom2/GARRISON.WAD new file mode 100644 index 0000000..7f825dd --- /dev/null +++ b/wad/doom2/GARRISON.WAD Binary files differ diff --git a/wad/doom2/GERYON.WAD b/wad/doom2/GERYON.WAD new file mode 100644 index 0000000..d036bc6 --- /dev/null +++ b/wad/doom2/GERYON.WAD Binary files differ diff --git a/wad/doom2/MANOR.WAD b/wad/doom2/MANOR.WAD new file mode 100644 index 0000000..47fda46 --- /dev/null +++ b/wad/doom2/MANOR.WAD Binary files differ diff --git a/wad/doom2/MEPHISTO.WAD b/wad/doom2/MEPHISTO.WAD new file mode 100644 index 0000000..2f3f342 --- /dev/null +++ b/wad/doom2/MEPHISTO.WAD Binary files differ diff --git a/wad/doom2/MINOS.WAD b/wad/doom2/MINOS.WAD new file mode 100644 index 0000000..5bcf22a --- /dev/null +++ b/wad/doom2/MINOS.WAD Binary files differ diff --git a/wad/doom2/NESSUS.WAD b/wad/doom2/NESSUS.WAD new file mode 100644 index 0000000..ca0090e --- /dev/null +++ b/wad/doom2/NESSUS.WAD Binary files differ diff --git a/wad/doom2/PARADOX.WAD b/wad/doom2/PARADOX.WAD new file mode 100644 index 0000000..c636cbc --- /dev/null +++ b/wad/doom2/PARADOX.WAD Binary files differ diff --git a/wad/doom2/SUBSPACE.WAD b/wad/doom2/SUBSPACE.WAD new file mode 100644 index 0000000..a052ecf --- /dev/null +++ b/wad/doom2/SUBSPACE.WAD Binary files differ diff --git a/wad/doom2/SUBTERRA.WAD b/wad/doom2/SUBTERRA.WAD new file mode 100644 index 0000000..e4c82be --- /dev/null +++ b/wad/doom2/SUBTERRA.WAD Binary files differ diff --git a/wad/doom2/TEETH.WAD b/wad/doom2/TEETH.WAD new file mode 100644 index 0000000..e67a02b --- /dev/null +++ b/wad/doom2/TEETH.WAD Binary files differ diff --git a/wad/doom2/TTRAP.WAD b/wad/doom2/TTRAP.WAD new file mode 100644 index 0000000..2b1b1e8 --- /dev/null +++ b/wad/doom2/TTRAP.WAD Binary files differ diff --git a/wad/doom2/VESPERAS.WAD b/wad/doom2/VESPERAS.WAD new file mode 100644 index 0000000..6df038f --- /dev/null +++ b/wad/doom2/VESPERAS.WAD Binary files differ diff --git a/Dockerfile b/Dockerfile index 545d698..8f07552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update --yes RUN apt-get upgrade --yes RUN apt-get install --yes --quiet libsdl-image1.2 zandronum +RUN mkdir /usr/share/GeoIP/ #Create a non-privileged user RUN useradd -ms /bin/bash zandronum @@ -28,16 +29,15 @@ WORKDIR /home/zandronum #Build the application directory and add files -RUN mkdir /home/zandronum/config/ && \ - mkdir /home/zandronum/wad/ && \ - mkdir /home/zandronum/iwad/ && \ - mkdir /home/zandronum/bin/ -ADD /config/ /home/zandronum/config/ -ADD /bin/ /home/zandronum/bin/ -ADD /player/ /home/zandronum/player/ -ADD /iwad/ /home/zandronum/iwad/ -ADD /wad/ /home/zandronum/wad/ +RUN mkdir /home/zandronum/logs/ -CMD ["/home/zandronum/bin/summon.sh"] -ENTRYPOINT ["/home/zandronum/bin/summon.sh"] +VOLUME /home/zandronum/config/ \ + /home/zandronum/player/ \ + /home/zandronum/iwad/ \ + /home/zandronum/wad/ \ + /home/zandronum/bin/ +COPY GeoIP.dat /usr/share/GeoIP/GeoIP.dat + +CMD ["/home/zandronum/bin/start"] +ENTRYPOINT ["/home/zandronum/bin/start"] EXPOSE 10666 diff --git a/GeoIP.dat b/GeoIP.dat new file mode 100644 index 0000000..d780363 --- /dev/null +++ b/GeoIP.dat Binary files differ diff --git a/bin/GeoIP.dat b/bin/GeoIP.dat deleted file mode 100644 index d780363..0000000 --- a/bin/GeoIP.dat +++ /dev/null Binary files differ diff --git a/bin/start b/bin/start new file mode 100755 index 0000000..c0bed90 --- /dev/null +++ b/bin/start @@ -0,0 +1,10 @@ +#!/bin/bash + +zandronum-server \ + -host \ + -port 10666 \ + -iwad "/home/zandronum/iwad/doom1.wad" \ + +exec "/home/zandronum/config/default.cfg" \ + +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ + +CrashLogs 2 \ + +map E1M1 diff --git a/bin/summon.bash b/bin/summon.bash deleted file mode 100644 index 5709779..0000000 --- a/bin/summon.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port 10666 \ - -iwad "/home/zandronum/iwads/doom1.wad" \ - +exec "/home/zandronum/config/default.cfg" \ - +CrashLog_Dir "/home/zandronum/logs/docker-doom.log" \ - +CrashLogs 2 \ - +map E1M1 diff --git a/build-docker-doom.ps1 b/build-docker-doom.ps1 deleted file mode 100644 index 0bf5b46..0000000 --- a/build-docker-doom.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# This is needed to keep PoSh from displaying that ugly red error -$CurrentPreference = $ErrorActionPreference -$ErrorActionPreference = 'stop' - -try -{ - if(Get-Command docker) - { - if($args.Length -gt 0) { docker build . -t $args[0] } - else { docker build . -t docker-doom } - } -} -catch{"You have to install docker before you can build the container."} -Finally {$ErrorActionPreference=$CurrentPreference} diff --git a/builder/.rubocop.yml b/builder/.rubocop.yml deleted file mode 100644 index 9390dd8..0000000 --- a/builder/.rubocop.yml +++ /dev/null @@ -1,26 +0,0 @@ -AllCops: - Include: - - views/** - - ./ - Exclude: - - bin/** -Documentation: - Enabled: false -# Selenium page objects have late bindings that get erroneously detected. -Lint/UselessAssignment: - Enabled: false -# Drivers don't behave if 'self' isn't explicitly specified. -Style/RedundantSelf: - Enabled: false -# This isn't 1988. Nobody has 80 column displays anymore. -Metrics/LineLength: - Enabled: false -# We aren't writing an optimized enterprise script ffs -Metrics/AbcSize: - Enabled: false -Metrics/ModuleLength: - Enabled: false -Metrics/MethodLength: - Enabled: false -Metrics/ClassLength: - Enabled: false \ No newline at end of file diff --git a/builder/lib/zandronum_doom_vars.rb b/builder/lib/zandronum_doom_vars.rb deleted file mode 100644 index bf50f3e..0000000 --- a/builder/lib/zandronum_doom_vars.rb +++ /dev/null @@ -1,135 +0,0 @@ -# Class ZandronumDoomVars -# Management class for Zandronum server variables. -# Default values for the server variables pulled from -# https://wiki.zandronum.com/Server_Variables. -# Default values for the console commands pulled from -# Doomseeker source at https://bitbucket.org/Doomseeker/doomseeker -module DoomVars - class ZandronumDoomVars - def initialize(name) - @server_name = name # This is for the internal BUILDER reference, not sv_hostname - @max_players = '32' # Can be up to 64 but don't do that unless you have the bandwidth (you don't) - @server_variables = { - sv_adminlistfile: 'adminlist.txt', - sv_afk2spec: '0', - sv_aircontrol: '0.00390625', - sv_artifactreturntime: '30', - sv_banexemptionfile: 'whitelist.txt', - sv_banfile: 'banlist.txt', - sv_banlistreparsetime: '0', - sv_broadcast: 'true', - sv_cheats: 'false', - sv_colorstripmethod: '0', - sv_coop_damagefactor: '1.0', - sv_coopspawnvoodoodolls: 'true', - sv_coopunassignedvoodoodolls: 'true', - sv_coopunassignedvoodoodollsfornplayers: @max_players.to_s, - sv_defaultdmflags: 'true', - sv_disableautohealth: 'false', - sv_disallowbots: 'false', - sv_disallowspying: 'false', - sv_disallowsuicide: 'false', - sv_dropstyle: '0', - sv_duelcountdowntime: '10', - sv_enforcebans: 'true', - sv_enforcemasterbanlist: 'true', - sv_fastweapons: '0', - sv_flagreturntime: '15', - sv_forcejoinpassword: 'false', - sv_forcepassword: 'false', - sv_gravity: '800', - sv_hostemail: '', - sv_hostname: 'Unnamed Zandronum server', - sv_invasioncountdowntime: '10', - sv_joinpassword: 'password', - sv_killallmonsters_percentage: '100', - sv_limitcommands: 'true', - sv_limitnumvotes: 'true', - sv_lmscountdowntime: '10', - sv_logfile_append: 'false', - sv_logfilenametimestamp: 'true', - sv_logfiletimestamp: 'true', - sv_logfiletimestamp_usedate: 'false', - sv_measureoutboundtraffic: 'false', - sv_maprotation: 'true', - sv_markchatlines: 'false', - sv_maxclients: '32', - sv_maxclientsperip: '2', - sv_maxlives: '0', - sv_maxpacketsize: '1024', - sv_maxplayers: '32', - sv_maxteams: '2', - sv_minimizetosystray: 'true', - sv_minvoters: 'true', - sv_motd: '', - sv_nocallvote: '0', - sv_nochangemapvote: 'false', - sv_nodrop: 'false', - sv_noduellimitvote: 'false', - sv_noforcespecvote: 'false', - sv_nofraglimitvote: 'false', - sv_nokickvote: 'false', - sv_nokill: 'false', - sv_nomapvote: 'false', - sv_nopointlimitvote: 'false', - sv_notimelimitvote: 'false', - sv_nowinlimitvote: 'false', - sv_password: 'password', - sv_possessioncountdowntime: '10', - sv_possessionholdtime: '30', - sv_pure: 'true', - sv_queryignoretime: '10', - sv_randomcoopstarts: 'false', - sv_randommaprotation: 'false', - sv_rconpassword: '', - sv_showlauncherqueries: 'false', - sv_showwarnings: 'false', - sv_smartaim: '0', - sv_suddendeath: 'true', - sv_survivalcountdowntime: '10', - sv_timestamp: 'false', - sv_timestampformat: '0', - sv_unlimited_pickup: 'false', - sv_updatemaster: 'true', - sv_usemapsettingspossessionholdtime: 'true', - sv_usemapsettingswavelimit: 'true', - sv_useteamstartsindm: 'false', - sv_useticbuffer: 'true', - sv_website: '' - } - @console_variables = { - bot_allowchat: 'true', - botskill: '0', - buckshot: '0', - chat_sound: '1', - compatmode: '0', - crashlogs: '', - crashlog_dir: '', - displaynametags: '3', - domination: '0', - duellimit: '0', - fraglimit: '0', - handicap: '0', - instagib: '0', - invasion: '0', - lastmanstanding: '0', - lmsallowedweapons: '1023', - masterhostname: '', - maxviewpitch: '90', - pointlimit: '0', - possession: '0', - skill: '3', - skulltag: '0', - survival: '0', - switchonpickup: '0', - teamlms: '0', - terminator: '0', - timelimit: '0', - teamdamage: '0', - teampossession: '0', - turbo: '0', - win_limit: '0' - } - end - end -end diff --git a/builder/main.rb b/builder/main.rb deleted file mode 100644 index 367cb4a..0000000 --- a/builder/main.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'erb' -require 'ostruct' -require 'optparse' -require 'optparse/time' -require 'pry' -require 'pp' -require_relative 'lib/zandronum_doom_vars.rb' - -# Main module for the builder -module Main - class Options - def self.parse_arguments(args) - options = OpenStruct.new - options.verbose = false - options.instance_name = 'doom-server' - options.iwad_file = 'doom.wad' - options.ini_file = './doom-server.ini' - - opt_parser = OptionParser.new do |opts| - opts.banner = "#{__FILE__} [options]" - opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v| - options[:verbose] = v - end - opts.on('-n', '--name [NAME]', 'Logical name of the server instance (NOT the \'hostname\' var!)') do |instance_name| - options[:instance_name] = instance_name - end - opts.on('-i', '--ini-file [FILE]', '.ini file to populate settings from') do |ini| - options[:ini_file] = ini - end - opts.on_tail('-h', '--help', 'Show this message') do - puts opts - exit - end - end - opt_parser.parse!(args) - options - end - end - - # Adds'help' option if ARGV is empty - # because it's the polite thing to do - ARGV.empty? && ARGV.push('-h') - settings = Options.parse_arguments(ARGV) - - doom_vars = DoomVars::ZandronumDoomVars.new(settings.instance_name) - # TODO: process .ini file settings and kick off templating process - begin - erb :'summon.bash' - erb :'adminlist.txt' - erb :'banlist.txt' - erb :'default.cfg' - erb :'whitelist.txt' - rescue StandardError => se - puts "There was a problem creating the configuration files:\n#{se.message}" - end -end diff --git a/builder/templates/sample.ini b/builder/templates/sample.ini deleted file mode 100644 index d3172d9..0000000 --- a/builder/templates/sample.ini +++ /dev/null @@ -1,716 +0,0 @@ -# This file was generated by Zandronum 2.1.2 on Sun Feb 26 03:27:31 2017 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=~/.zandronum -Path=/usr/local/share/ - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Heretic.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Hexen.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Strife.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -[Chex.AutoExec] -Path=/home/mccarrmb/.zandronum/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under Doom.Autoload will be loaded for any version of Doom, -# but files listed under Doom2.Autoload will only load when you are -# playing Doom 2. - -[Doom.Autoload] - -[Doom1.Autoload] - -[Doom2.Autoload] - -[TNT.Autoload] - -[Plutonia.Autoload] - -[Freedoom.Autoload] - -[Freedoom1.Autoload] - -[FreeDM.Autoload] - -[Heretic.Autoload] - -[Hexen.Autoload] - -[HexenDK.Autoload] - -[HexenDemo.Autoload] - -[Strife.Autoload] - -[Chex.Autoload] - -[Chex3.Autoload] - -[UrbanBrawl.Autoload] - -[Harmony.Autoload] - -[LastRun] -Version=210 -Version-ZANDRONUM=181 - -[GlobalSettings] -vid_winscale=1 -fullscreen=true -vid_renderer=1 -mouse_capturemode=1 -sdl_nokeyrepeat=false -m_filter=false -m_noprescale=false -use_mouse=true -gl_vid_multisample=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_displaybits=8 -showendoom=0 -snd_announcervolume=1 -cl_allowmultipleannouncersounds=true -cl_alwaysplayfragsleft=false -con_ctrl_d= -demo_pure=true -defaultiwad=doom2 -queryiwad=true -cl_capfps=false -nofilecompression=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=true -invertmouse=false -cl_run=true -demo_compress=true -save_dir= -longsavemessages=true -storesavepic=true -use_joystick=false -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -vid_tft=false -show_messages=true -mouse_sensitivity=1 -png_gamma=0 -png_level=5 -authhostname=localhost -nomonsterinterpolation=false -chase_dist=90 -chase_height=-8 -telezoom=true -cl_spectatormove=1 -cl_noprediction=false -r_columnmethod=1 -r_fakecontrast=1 -snd_flipstereo=false -snd_channels=32 -r_drawspectatingstring=true -sv_showwarnings=false -masterhostname=master.zandronum.com -Gamma=1 -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=true -vid_defbits=8 -vid_defheight=1080 -vid_defwidth=1920 -cl_oldfreelooklimit=false -map_point_coordinates=true -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=1 -gl_cachetime=0.6 -gl_cachenodes=true -gl_usevbo=2 -gl_distfog=70 -gl_light_ambient=20 -gl_clamp_per_texture=false -gl_texture_format=0 -gl_texture_filter=0 -gl_texture_filter_anisotropic=1 -gl_usefb=false -gl_texture_hqresize_targets=7 -gl_texture_hqresize_maxinputsize=512 -gl_texture_hqresize=0 -gl_sort_textures=true -gl_enhanced_nv_stealth=3 -gl_billboard_mode=0 -gl_particles_style=2 -gl_sprite_blend=false -gl_spritebrightfog=false -gl_usecolorblending=true -gl_sky_detail=16 -gl_mask_sprite_threshold=0.5 -gl_mask_threshold=0.5 -gl_no_skyclear=false -gl_lights_additive=false -gl_light_particles=false -gl_light_sprites=false -gl_lights_size=1 -gl_lights_intensity=1 -gl_lights_checkside=false -gl_attachedlights=false -gl_dynlight_shader=false -gl_lights=false -gl_glow_shader=true -gl_brightmap_shader=false -gl_colormap_shader=false -gl_fog_shader=false -gl_warp_shader=false -gl_texture_useshaders=true -vid_contrast=1 -vid_brightness=0 -gl_vid_compatibility=false -gl_render_precise=false -gl_seamless=false -gl_render_segs=false -gl_mirror_envmap=true -gl_plane_reflection=true -r_mirror_recursions=4 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -snd_musicvolume=0.5 -snd_sfxvolume=1 -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=1 -mod_volramp=0 -mod_samplerate=0 -mod_dumb=true -spc_amp=1.875 -snd_mididevice=-1 -timidity_frequency=22050 -timidity_pipe=60 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -opl_onechip=false -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.9 -fluid_reverb_width=0.5 -fluid_reverb_damping=0 -fluid_reverb_roomsize=0.2 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -midi_timiditylike=false -midi_voices=32 -midi_config=timidity.cfg - -[GlobalSettings.Unknown] - -[Doom.Player] -cl_clientflags=3 -cl_connectiontype=1 -cl_ticsperupdate=3 -handicap=0 -railcolor=0 -playerclass=Doom Guy -stillbob=0 -movebob=0.25 -switchonpickup=1 -gender=Male -skin=base -color=ff ff ff -name=Velvet Pounder -autoaim=0 - -[Doom.Player.Mod] -lca_legweapmusic=true -lca_legmusic=true - -[Doom.ConsoleVariables] -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_showkeys=true -am_drawmapback=true -am_map_secrets=1 -am_ovsecretsectorcolor=00 ff ff -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovotherwallscolor=00 88 44 -am_ovthingcolor=e8 88 00 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 -cl_announcepickups=true -cl_announcer=0 -botdebug_shownodes=0 -botdebug_maxroamgiveupnodes=4096 -botdebug_maxgiveupnodes=512 -botdebug_maxsearchnodes=1024 -botdebug_showevents=0 -botdebug_showcosts=0 -botdebug_showgoal=0 -botdebug_showstackpushes=0 -botdebug_dataheaders=0 -botdebug_walktest=0 -botdebug_obstructiontest=0 -botdebug_commands=0 -botdebug_states=0 -botdebug_statechanges=0 -bot_allowchat=true -cl_showfullscreenvote=false -sv_limitnumvotes=true -sv_nopointlimitvote=false -sv_noduellimitvote=false -sv_nowinlimitvote=false -sv_notimelimitvote=false -sv_nofraglimitvote=false -sv_nochangemapvote=false -sv_nomapvote=false -sv_noforcespecvote=false -sv_nokickvote=false -sv_nocallvote=0 -sv_minvoters=1 -sv_logfile_append=false -sv_logfilenametimestamp=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=0 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_notifylines=4 -sv_logfiletimestamp_usedate=false -sv_logfiletimestamp=true -con_colorinmessages=1 -con_virtualheight=480 -con_virtualwidth=640 -con_alpha=0.75 -con_scaletext=true -con_centernotify=false -con_notifytime=3 -con_notablist=false -lookspring=true -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -cl_hitscandecalhack=false -cl_connect_flags=5 -cl_showspawnnames=0 -cl_showcommands=0 -cl_taunts=true -cl_motdtime=5 -cl_predict_players=true -cl_connectsound=true -compatmode=0 -wipetype=1 -cl_overrideplayercolors=0 -cl_enemycolor=70 70 70 -cl_allycolor=ff ff ff -cl_showlargefragmessages=true -cl_useoriginalweaponorder=false -cl_noammoswitch=true -language=auto -sv_duelcountdowntime=10 -displaynametags=3 -sv_usemapsettingswavelimit=true -sv_invasioncountdowntime=10 -sv_lmscountdowntime=10 -menu_modifier=0 -menu_dmflags2=512 -menu_dmflags=20612 -menu_teambotspawn19=-1 -menu_teambotspawn18=-1 -menu_teambotspawn17=-1 -menu_teambotspawn16=-1 -menu_teambotspawn15=-1 -menu_teambotspawn14=-1 -menu_teambotspawn13=-1 -menu_teambotspawn12=-1 -menu_teambotspawn11=-1 -menu_teambotspawn10=-1 -menu_teambotspawn9=-1 -menu_teambotspawn8=-1 -menu_teambotspawn7=-1 -menu_teambotspawn6=-1 -menu_teambotspawn5=-1 -menu_teambotspawn4=-1 -menu_teambotspawn3=-1 -menu_teambotspawn2=-1 -menu_teambotspawn1=-1 -menu_teambotspawn0=-1 -menu_botspawn15=-1 -menu_botspawn14=-1 -menu_botspawn13=-1 -menu_botspawn12=-1 -menu_botspawn11=-1 -menu_botspawn10=-1 -menu_botspawn9=-1 -menu_botspawn8=-1 -menu_botspawn7=-1 -menu_botspawn6=-1 -menu_botspawn5=-1 -menu_botspawn4=-1 -menu_botspawn3=-1 -menu_botspawn2=-1 -menu_botspawn1=-1 -menu_botspawn0=-1 -menu_botskill=0 -menu_skill=0 -menu_wavelimit=0 -menu_winlimit=0 -menu_duellimit=0 -menu_pointlimit=0 -menu_fraglimit=0 -menu_timelimit=0 -menu_gamemode=0 -menu_level=0 -menu_browser_showfull=true -menu_browser_showempty=true -menu_browser_sortby=0 -menu_browser_gametype=0 -menu_browser_servers=0 -menu_screenratios=1 -chat_sound=1 -show_obituaries=true -sv_randommaprotation=false -sv_maprotation=true -cl_icons=true -cl_medals=true -dlg_musicvolume=1 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_showspawns=false -cl_respawninvuleffect=1 -cl_grenadetrails=1 -cl_rockettrails=1 -cl_bloodsplats=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -secretmessage=A Secret is revealed! -sv_usemapsettingspossessionholdtime=true -sv_possessionholdtime=30 -sv_possessioncountdowntime=10 -r_drawtrans=true -screenblocks=10 -r_deathcamera=false -r_stretchsky=true -r_maxparticles=4000 -cl_skins=1 -r_drawfuzz=false -allcheats=false -sv_survivalcountdowntime=10 -sv_banexemptionfile=whitelist.txt -sv_banfile=banlist.txt -sv_enforcemasterbanlist=true -sv_banfilereparsetime=0 -sv_enforcebans=true -sv_limitcommands=true -sv_maxpacketsize=1024 -sv_rconpassword= -sv_joinpassword=password -sv_password=password -sv_maxplayers=32 -sv_maxclients=32 -sv_adminlistfile=adminlist.txt -sv_useticbuffer=true -sv_forcelogintojoin=false -sv_afk2spec=0 -sv_maxclientsperip=2 -sv_nodrop=false -sv_nokill=false -sv_markchatlines=false -sv_queryignoretime=10 -sv_minimizetosystray=true -sv_disallowbots=false -sv_colorstripmethod=0 -sv_timestampformat=0 -sv_timestamp=false -sv_showlauncherqueries=false -sv_forcejoinpassword=false -sv_forcepassword=false -sv_motd= -sv_hostemail= -sv_website= -sv_hostname=Unnamed Zandronum server -sv_broadcast=true -con_scaletext_usescreenratio=true -hud_scale=false -dimcolor=ff d7 00 -dimamount=-1 -preferoptionalwads=false -wi_autoscreenshot=0 -wi_noautostartmap=false -wi_showtotaltime=true -wi_percents=true -database_maxpagecount=32768 -databasefile=:memory: -transsouls=0.75 -cl_stfullscreenhud=true -cl_onekey=false -cl_maxdecals=1024 -cl_spreaddecals=true -pwo_switchonunknown=false -pwo_switchonsameweight=true -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showdmstats=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -blood_fade_scalar=0.5 -cl_identifytarget=true -st_scale=true -cl_drawcoopinfo=true -gl_lightmode=3 -gl_fogmode=2 -gl_enhanced_nightvision=true -gl_weaponlight=8 -gl_trimsprites=true -gl_precache=false -gl_texture_usehires=false -gl_sclipfactor=1.8 -gl_sclipthreshold=10 -gl_spriteclip=1 -cl_disallowfullpitch=false -gl_use_models=true -gl_light_models=true -gl_interpolate_model_frames=true -snd_pitched=false - -[Doom.LocalServerInfo] -sv_dropstyle=0 -sv_disableautohealth=false -sv_smartaim=0 -forcewater=false -sv_corpsequeuesize=64 -maxviewpitch=90 - -[Doom.LocalServerInfo.Mod] -cdm_invasiongate=true -cdm_bonuscrate=true -cdm_hard=false -cdm_cheats=false -cdm_playerboost=4 -cdm_manyplayers=11 -cdm_startlives=1 -cd_alwaysdrop=0 -cd_sharedkeys=0 - -[Doom.UnknownConsoleVariables] -PWO.Doom.Fist=0.1 -PWO.Doom.Chainsaw=0.2 -PWO.Doom.Pistol=0.3 -PWO.Doom.Shotgun=0.8 -PWO.Doom.SuperShotgun=0.9 -PWO.Doom.Chaingun=0.4 -PWO.Doom.RocketLauncher=0.5 -PWO.Doom.PlasmaRifle=0.6 -PWO.Doom.BFG9000=0.7 -PWO.Doom.Railgun=0.55 -PWO.Doom.BFG10K=0.75 -PWO.Doom.Minigun=0.85 -PWO.Doom.GrenadeLauncher=0.45 -cd_cl_vanillamode=0 - -[Doom.ConsoleAliases] - -[Doom.Complex-DooM_Actions.Bindings] -g=ThrowGrenade -f=DropMine -mouse5=RailgunZoom - -[Doom.Complex-DooM_Actions.DoubleBindings] - -[Doom.Complex-DooM_Hotkeys.Bindings] - -[Doom.Complex-DooM_Hotkeys.DoubleBindings] - -[Doom.Complex-DooM_VMode.Bindings] -l=ToggleEffects - -[Doom.Complex-DooM_VMode.DoubleBindings] - -[Doom.ComplexDoomInvasion.Bindings] - -[Doom.ComplexDoomInvasion.DoubleBindings] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -w=+forward -t=say -u=taunt -ctrl=+crouch -a=+moveleft -s=+back -d=+moveright -`=toggleconsole -\=+showscores -m=+showmedals -alt=+moveup -space=+jump -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -pgup=vote_yes -pgdn=vote_no -mouse1=+attack -mouse2=+altattack -mwheelup=weapnext -mwheeldown=weapprev -pad_start=pause -pad_back=menu_main -e=+use -p=spectate -z=invprev -x=invuse -c=invnext - -[Doom.DoubleBindings] - -[Doom.RevealedBotsAndSkins] - diff --git a/builder/templates/template.cfg b/builder/templates/template.cfg deleted file mode 100644 index 0fc8cce..0000000 --- a/builder/templates/template.cfg +++ /dev/null @@ -1,56 +0,0 @@ -//game options -dmflags 0 -dmflags2 0 -compatflags 0 -skill 4 -deathmatch 0 //coop -fraglimit 0 -timelimit 0 -winlimit 0 -pointlimit 0 -duellimit 0 - -//gameplay variables -sv_randomcoopstarts true -sv_disallowbots false -sv_defaultdmflags true -sv_killallmonsters_percentage 95 - -//community -sv_website "http://your.site" -sv_motd "Replace this with your MOTD text." -sv_hostemail your@email.address - -//host settings -sv_hostname "Hostname Here" -sv_maxplayers 12 -sv_maxclients 12 -sv_broadcast 0 //Broadbast to LAN? -sv_maprotation false -sv_randommaprotation false - -//master server settings -sv_updatemaster true -sv_masterip master.zandronum.com:15300 -sv_enforcemasterbanlist true - -//logging -logfile "/home/zandronum/log/gameplay.log" -sv_markchatlines true -sv_logfilenametimestamp true -sv_showlauncherqueries false - -//administration -sv_adminlistfile "/home/zandronum/log/adminlist" -sv_banexemptionfile "/home/zandronum/log/whitelist" -sv_banfile "/home/zandronum/log/bans" -sv_enforcebans true -sv_rconpassword "rcon password" -sv_password "server password" -sv_joinpassword "join password" -sv_forcejoinpassword false -sv_forcepassword false -sv_nocallvote false //Want people to be able to vote various things? - -//startup map -map E1M1 diff --git a/builder/views/adminlist.txt.erb b/builder/views/adminlist.txt.erb deleted file mode 100644 index df3aa78..0000000 --- a/builder/views/adminlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @admin_list.nil? %> -<% @admin_list.each do |admin| %> -<%= admin.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/banlist.txt.erb b/builder/views/banlist.txt.erb deleted file mode 100644 index c10a138..0000000 --- a/builder/views/banlist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -93.99.233.*:capodecima - 93.99.233.6 - DDOS - June 19th 2016 - Perm -<% unless @ban_list.nil? %> -<% @ban_list.each do |ban| %> -<%= ban.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/builder/views/default.cfg.erb b/builder/views/default.cfg.erb deleted file mode 100644 index e69de29..0000000 --- a/builder/views/default.cfg.erb +++ /dev/null diff --git a/builder/views/summon.bash.erb b/builder/views/summon.bash.erb deleted file mode 100644 index 5eb9649..0000000 --- a/builder/views/summon.bash.erb +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -/home/zandronum/zandronum-server \ - -host \ - -port <%= @port.to_s %> \ - -iwad "/home/zandronum/iwads/<%= @iwad.to_s %>" \ - +exec "/home/zandronum/config/<%= @config.to_s %>" \ - +CrashLog_Dir "/home/zandronum/logs/<%= @server_name.to_s %>.log" \ - +CrashLogs 2 \ - +map <%= @start_map.to_s %> \ No newline at end of file diff --git a/builder/views/whitelist.txt.erb b/builder/views/whitelist.txt.erb deleted file mode 100644 index 203d1d0..0000000 --- a/builder/views/whitelist.txt.erb +++ /dev/null @@ -1,6 +0,0 @@ -127.0.0.1 -<% unless @white_list.nil? %> -<% @white_list.each do |white| %> -<%= white.to_s %> -<% end %> -<% end %> \ No newline at end of file diff --git a/docker-doom.bash b/docker-doom.bash deleted file mode 100755 index d6dd3bb..0000000 --- a/docker-doom.bash +++ /dev/null @@ -1,9 +0,0 @@ -docker run \ - --name docker-doom \ - --restart always \ - -v ./iwad:/home/zandronum/iwad \ - -v ./wad:/home/zandronum/wad \ - -v ./config/:/home/zandronum/config \ - -v ./player/:/home/zandronum/player \ - -p 10666:10666 \ - -d docker-doom diff --git a/docker-doom.ps1 b/docker-doom.ps1 deleted file mode 100755 index 8110689..0000000 --- a/docker-doom.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -docker container run ` - --name docker-doom ` - --restart always ` - -v .\iwad:/home/zandronum/iwad ` - -v .\wad:/home/zandronum/wad ` - -v .\config:/home/zandronum/config ` - -v .\player:/home/zandronum/player ` - -p 10666:10666 ` - -d docker-doom diff --git a/wad/.gitignore b/wad/.gitignore deleted file mode 100644 index 9cba1a6..0000000 --- a/wad/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# directory for patch wads and newer GZDoom pk3 & pk7 mods - -*.WAD -*.wad -*.PK3 -*.pk3 -*.PK7 -*.pk7 diff --git a/wad/DWANGO20.WAD b/wad/DWANGO20.WAD new file mode 100644 index 0000000..dbdfc34 --- /dev/null +++ b/wad/DWANGO20.WAD Binary files differ diff --git a/wad/doom2/ATTACK.WAD b/wad/doom2/ATTACK.WAD new file mode 100644 index 0000000..abf8d39 --- /dev/null +++ b/wad/doom2/ATTACK.WAD Binary files differ diff --git a/wad/doom2/BLACKTWR.WAD b/wad/doom2/BLACKTWR.WAD new file mode 100644 index 0000000..5aec986 --- /dev/null +++ b/wad/doom2/BLACKTWR.WAD Binary files differ diff --git a/wad/doom2/BLOODSEA.WAD b/wad/doom2/BLOODSEA.WAD new file mode 100644 index 0000000..82d4c09 --- /dev/null +++ b/wad/doom2/BLOODSEA.WAD Binary files differ diff --git a/wad/doom2/CANYON.WAD b/wad/doom2/CANYON.WAD new file mode 100644 index 0000000..fd9d1c4 --- /dev/null +++ b/wad/doom2/CANYON.WAD Binary files differ diff --git a/wad/doom2/CATWALK.WAD b/wad/doom2/CATWALK.WAD new file mode 100644 index 0000000..7a0481e --- /dev/null +++ b/wad/doom2/CATWALK.WAD Binary files differ diff --git a/wad/doom2/COMBINE.WAD b/wad/doom2/COMBINE.WAD new file mode 100644 index 0000000..87c9d8c --- /dev/null +++ b/wad/doom2/COMBINE.WAD Binary files differ diff --git a/wad/doom2/FISTULA.WAD b/wad/doom2/FISTULA.WAD new file mode 100644 index 0000000..08d62d4 --- /dev/null +++ b/wad/doom2/FISTULA.WAD Binary files differ diff --git a/wad/doom2/GARRISON.WAD b/wad/doom2/GARRISON.WAD new file mode 100644 index 0000000..7f825dd --- /dev/null +++ b/wad/doom2/GARRISON.WAD Binary files differ diff --git a/wad/doom2/GERYON.WAD b/wad/doom2/GERYON.WAD new file mode 100644 index 0000000..d036bc6 --- /dev/null +++ b/wad/doom2/GERYON.WAD Binary files differ diff --git a/wad/doom2/MANOR.WAD b/wad/doom2/MANOR.WAD new file mode 100644 index 0000000..47fda46 --- /dev/null +++ b/wad/doom2/MANOR.WAD Binary files differ diff --git a/wad/doom2/MEPHISTO.WAD b/wad/doom2/MEPHISTO.WAD new file mode 100644 index 0000000..2f3f342 --- /dev/null +++ b/wad/doom2/MEPHISTO.WAD Binary files differ diff --git a/wad/doom2/MINOS.WAD b/wad/doom2/MINOS.WAD new file mode 100644 index 0000000..5bcf22a --- /dev/null +++ b/wad/doom2/MINOS.WAD Binary files differ diff --git a/wad/doom2/NESSUS.WAD b/wad/doom2/NESSUS.WAD new file mode 100644 index 0000000..ca0090e --- /dev/null +++ b/wad/doom2/NESSUS.WAD Binary files differ diff --git a/wad/doom2/PARADOX.WAD b/wad/doom2/PARADOX.WAD new file mode 100644 index 0000000..c636cbc --- /dev/null +++ b/wad/doom2/PARADOX.WAD Binary files differ diff --git a/wad/doom2/SUBSPACE.WAD b/wad/doom2/SUBSPACE.WAD new file mode 100644 index 0000000..a052ecf --- /dev/null +++ b/wad/doom2/SUBSPACE.WAD Binary files differ diff --git a/wad/doom2/SUBTERRA.WAD b/wad/doom2/SUBTERRA.WAD new file mode 100644 index 0000000..e4c82be --- /dev/null +++ b/wad/doom2/SUBTERRA.WAD Binary files differ diff --git a/wad/doom2/TEETH.WAD b/wad/doom2/TEETH.WAD new file mode 100644 index 0000000..e67a02b --- /dev/null +++ b/wad/doom2/TEETH.WAD Binary files differ diff --git a/wad/doom2/TTRAP.WAD b/wad/doom2/TTRAP.WAD new file mode 100644 index 0000000..2b1b1e8 --- /dev/null +++ b/wad/doom2/TTRAP.WAD Binary files differ diff --git a/wad/doom2/VESPERAS.WAD b/wad/doom2/VESPERAS.WAD new file mode 100644 index 0000000..6df038f --- /dev/null +++ b/wad/doom2/VESPERAS.WAD Binary files differ diff --git a/wad/doom2/VIRGIL.WAD b/wad/doom2/VIRGIL.WAD new file mode 100644 index 0000000..ab2ed9b --- /dev/null +++ b/wad/doom2/VIRGIL.WAD Binary files differ