From 7cd3d9e15f6bac658fce03eee48ab36aed767841 Mon Sep 17 00:00:00 2001
From: Ben Peddell <klightspeed@killerwolves.net>
Date: Tue, 17 Nov 2015 00:29:06 +1000
Subject: [PATCH 01/14] Add per-command multi-instance support

---
 tools/arkmanager | 267 ++++++++++++++++++++++++++++-------------------
 1 file changed, 159 insertions(+), 108 deletions(-)

diff --git a/tools/arkmanager b/tools/arkmanager
index 49db4b7..10be771 100755
--- a/tools/arkmanager
+++ b/tools/arkmanager
@@ -1484,6 +1484,48 @@ useConfig() {
   source "$1"
 }
 
+showUsage() {
+  echo -e "Usage: arkmanager [Commands]\n"
+  echo "Commands can be followed by one or more @instance arguments"
+  echo "The special '@all' instance selects all instances"
+  echo "Commands may also be followed by zero or more --options"
+  echo
+  echo "Commands that take no instances:"
+  echo "Command               Description"
+  echo "upgrade-tools         Check for a new ARK Server Tools version and upgrades it if needed"
+  echo "uninstall-tools       Uninstall the ARK Server Tools"
+  echo "useconfig <name>      Sets the default instance for the commands that follow"
+  echo "--help                Show this help"
+  echo "--version             Show the version info of ARK Server Tools"
+  echo
+  echo "Commands that take one or more instances:"
+  echo "Command               Description"
+  echo "backup                Saves a backup of your server inside the backup directory"
+  echo "broadcast <msg>       Sends a message to all users connected to server"
+  echo "saveworld             Saves the game world to disk"
+  echo "rconcmd <cmd>         Execute RCON command on server"
+  echo "checkupdate           Check for a new ARK server version"
+  echo "install               Install the ARK server files from steamcmd"
+  echo "installmod <modid>    Installs a mod from the Steam workshop"
+  echo "restart               Stops the server and then starts it"
+  echo "run                   Runs the server without daemonizing"
+  echo "start                 Starts the server"
+  echo "stop                  Stops the server"
+  echo "status                Returns the status of the current ARK server instance"
+  echo "update                Check for a new ARK server version, if needed, stops the server, updates it, and starts it again"
+  echo
+  echo "Update command takes the below options:"
+  echo "   --force            Apply update without checking the current version"
+  echo "   --safe             Wait for server to perform world save and update."
+  echo "   --warn             Warn players before updating server"
+  echo "   --validate         Validates all ARK server files"
+  echo "   --saveworld        Saves world before update"
+  echo "   --update-mods      Updates installed and requested mods"
+  echo "   --backup           Takes a backup of the save files before updating"
+  echo "   --downloadonly     Download the mod and/or server update without applying it"
+  echo "                      Requires arkStagingDir be set to a staging directory on the same filesystem as the server"
+}
+
 #---------------------
 # Main program
 #---------------------
@@ -1493,6 +1535,8 @@ checkConfig
 
 while true; do
   options=( )
+  allinstances=no
+  instances=( )
   args=( )
   command="$1"
   shift
@@ -1519,6 +1563,12 @@ while true; do
       --*)
         options+=( "$1" )
       ;;
+      @all)
+        allinstances=yes
+      ;;
+      @*)
+        instances+=( "${1#@}" )
+      ;;
       *)
         if [ $nrarg -gt 0 ]; then
           args+=( "$1" )
@@ -1531,75 +1581,19 @@ while true; do
     shift
   done
 
+  # handle non-instance separately
   case "$command" in
-    run)
-        doRun
-    ;;
-    start)
-        if [ " ${options[*]} " =~ " --all " ]; then
-          doStartAll
-        else
-          doStart
-        fi
-    ;;
-    stop)
-        if [ " ${options[*]} " =~ " --all " ]; then
-          doStopAll
-        else
-          doStop stop "${options[@]}"
-        fi
-    ;;
-    restart)
-        if [ " ${options[*]} " =~ " --all " ]; then
-	  doStopAll
-	else
-          doStop restart "${options[@]}"
-	fi
-        echo "`timestamp`: stop" >> "$logdir/$arkmanagerLog"
-        sleep 1
-        if [ " ${options[*]} " =~ " --all " ]; then
-          doStartAll
-	else
-	  doStart
-	fi
-        echo "`timestamp`: start" >> "$logdir/$arkmanagerLog"
-        echo "`timestamp`: restart" >> "$logdir/$arkmanagerLog"
-    ;;
-    install)
-        doInstall
-    ;;
-    update)
-	doUpdate "${options[@]}"
-    ;;
-    checkupdate)
-      checkForUpdate
-    ;;
-    installmod)
-      doInstallMod "${args[@]}"
-    ;;
-    backup)
-      doBackup
-    ;;
-    broadcast)
-      doBroadcast "${args[@]}"
-    ;;
-    saveworld)
-      doSaveWorld
-    ;;
-    rconcmd)
-      rconcmd "${args[@]}"
-    ;;
-    status)
-      printStatus
-    ;;
     upgrade-tools)
       doUpgradeTools
+      exit
     ;;
     uninstall-tools)
       doUninstallTools
+      exit
     ;;
     useconfig)
-      useConfig "${args[0]}"
+      defaultinstance="${args[0]}"
+      continue
     ;;
     --version)
       echo "Version: ${arkstVersion}"
@@ -1610,58 +1604,115 @@ while true; do
       exit 1
     ;;
     -h|--help)
-      echo -e "Usage: arkmanager [OPTION]\n"
-      echo "Option                Description"
-      echo "backup                Saves a backup of your server inside the backup directory"
-      echo "broadcast <msg>       Sends a message to all users connected to server"
-      echo "saveworld             Saves the game world to disk"
-      echo "rconcmd <cmd>         Execute RCON command on server"
-      echo "checkupdate           Check for a new ARK server version"
-      echo "install               Install the ARK server files from steamcmd"
-      echo "installmod <modid>    Installs a mod from the Steam workshop"
-      echo "restart               Stops the server and then starts it"
-      echo "restart --all         Restarts all servers specified in configfile_xxxxx"
-      echo "run                   Runs the server without daemonizing"
-      echo "start                 Starts the server"
-      echo "start --all           Starts all servers specified in configfile_xxxxx"
-      echo "stop                  Stops the server"
-      echo "stop --all            Stops all servers specified in configfile_xxxxx"
-      echo "status                Returns the status of the current ARK server instance"
-      echo "update [OPTION ...]   Check for a new ARK server version, if needed, stops the server, updates it, and starts it again"
-      echo "upgrade-tools         Check for a new ARK Server Tools version and upgrades it if needed"
-      echo "uninstall-tools       Uninstall the ARK Server Tools"
-      echo "useconfig <name>      Use the configuration overrides in the specified config name or file"
-      echo "--help                Show this help"
-      echo "--version             Show the version info of ARK Server Tools"
-      echo
-      echo "Update command takes the below options:"
-      echo "   --force            Apply update without checking the current version"
-      echo "   --safe             Wait for server to perform world save and update."
-      echo "   --warn             Warn players before updating server"
-      echo "   --validate         Validates all ARK server files"
-      echo "   --saveworld        Saves world before update"
-      echo "   --update-mods      Updates installed and requested mods"
-      echo "   --backup           Takes a backup of the save files before updating"
-      echo "   --downloadonly     Download the mod and/or server update without applying it"
-      echo "                      Requires arkStagingDir be set to a staging directory on the same filesystem as the server"
-      echo
-      echo "stop and restart commands take the below options:"
-      echo "   --warn             Warn players before shutting down the server"
-      echo "   --saveworld        Saves world before shutdown"
+      showUsage
       exit 1
     ;;
-    *)
-      echo -n "arkmanager v${arkstVersion}: "
-      if [ $# -eq 0 ]; then
-        echo "no command specified"
-      else
-        echo "unknown command '$1' specified"
-      fi
-      echo "Try 'arkmanager -h' or 'arkmanager --help' for more information."
+    "")
+      echo "arkmanager v${arkstVersion}: no command specified"
+      showUsage
       exit 1
     ;;
   esac
-  status=$?
+
+  # Handle no instances being specified
+  if [[ "${#instances[@]}" == 0 && "$allinstances" == "no" ]]; then
+    if [ -n "$defaultinstance" ]; then
+      instances=( "$defaultinstance" )
+    else
+      echo "No instances supplied for command ${command} ${options[*]} ${args[*]}"
+      read -p "Do you wish to run this command for all instances?" -n 1 -r
+      echo
+      if [[ "$REPLY" =~ ^[Yy]$ ]]; then
+        allinstances=yes
+      else
+        exit 1
+      fi
+    fi
+  fi
+
+  # Handle all instances being requested
+  if [[ "$allinstances" == "yes" ]]; then
+    instances=( )
+    for varname in "${!configfile_@}"; do
+      instances+=( "${varname#configfile_}" )
+    done
+  fi
+
+  # Run the command for each instance requested
+  for instance in "${instances[@]}"; do
+  (
+    echo "Running command '${command}' for instance '${instance}'"
+    useConfig "$instance"
+
+    case "$command" in
+      run)
+        doRun
+      ;;
+      start)
+        doStart
+      ;;
+      stop)
+        doStop shutdown "${options[@]}"
+      ;;
+      restart)
+        doStop restart "${options[@]}"
+        echo "`timestamp`: stop" >> "$logdir/$arkmanagerLog"
+      ;;
+      install)
+        doInstall
+      ;;
+      update)
+        doUpdate "${options[@]}"
+      ;;
+      checkupdate)
+        checkForUpdate
+      ;;
+      installmod)
+        doInstallMod "${args[@]}"
+      ;;
+      backup)
+        doBackup
+      ;;
+      broadcast)
+        doBroadcast "${args[@]}"
+      ;;
+      saveworld)
+        doSaveWorld
+      ;;
+      rconcmd)
+        rconcmd "${args[@]}"
+      ;;
+      status)
+        printStatus
+      ;;
+      *)
+        echo -n "arkmanager v${arkstVersion}: unknown command '$command' specified"
+        showUsage
+        exit 255
+      ;;
+    esac
+  )
+  laststatus=$?
+  if [ $laststatus -eq 255 ]; then
+    exit 1
+  elif [ $laststatus -ne 0 ]; then
+    status=$laststatus
+  fi
+  done
+
+  # Perform the restart portion of the restart command
+  if [[ "$command" == "restart" ]]; then
+    sleep 1
+    for instance in "${instances[@]}"; do
+    (
+      useConfig "$instance"
+      doStart
+      echo "`timestamp`: start" >> "$logdir/$arkmanagerLog"
+      echo "`timestamp`: restart" >> "$logdir/$arkmanagerLog"
+    )
+    done
+  fi
+
   if [ $# -eq 0 ]; then
     break
   fi

From 33b94c63a1d1e80b7fb66ca3bdd66fb8ff8eaf84 Mon Sep 17 00:00:00 2001
From: Ben Peddell <klightspeed@killerwolves.net>
Date: Sat, 21 Nov 2015 22:30:44 +1000
Subject: [PATCH 02/14] Add support for instance config files

Imports settings from
/etc/arkmanager/instances/instancename.cfg
and
$HOME/.config/arkmanager/instances/instancename.cfg
if those files exist.
---
 tools/arkmanager | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/arkmanager b/tools/arkmanager
index 10be771..dd5934e 100755
--- a/tools/arkmanager
+++ b/tools/arkmanager
@@ -1472,6 +1472,12 @@ printStatus(){
 }
 
 useConfig() {
+  if [ -f "/etc/arkmanager/instances/${1}.cfg" ]; then
+    source "/etc/arkmanager/instances/${1}.cfg"
+  fi
+  if [ -f "${HOME}/.config/arkmanager/instances/${1}.cfg" ]; then
+    source "${HOME}/.config/arkmanager/instances/${1}.cfg"
+  fi
   if [ "$1" == "main" ]; then
     return
   fi

From 80fd25a33db5f822964b96c8539ece74ad82f9ee Mon Sep 17 00:00:00 2001
From: Ben Peddell <klightspeed@killerwolves.net>
Date: Sat, 21 Nov 2015 22:39:46 +1000
Subject: [PATCH 03/14] Move config file migration to separate install-time
 script

---
 tools/install.sh        | 40 ++--------------------------------------
 tools/migrate-config.sh | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 38 deletions(-)
 create mode 100755 tools/migrate-config.sh

diff --git a/tools/install.sh b/tools/install.sh
index 3c3fbbc..f81348d 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -168,25 +168,7 @@ if [ "$userinstall" == "yes" ]; then
 
     # Copy arkmanager.cfg to ~/.arkmanager.cfg if it doesn't already exist
     if [ -f "${INSTALL_ROOT}${PREFIX}/.arkmanager.cfg" ]; then
-      newopts=( arkbackupdir arkautorestartfile install_bindir install_libexecdir install_datadir mod_appid )
-      newopt_steamcmd_appinfocache="${PREFIX}/Steam/appcache/appinfo.vdf"
-      newopt_arkbackupdir="${PREFIX}/ARK-Backups"
-      newopt_arkautorestartfile="ShooterGame/Saved/.autorestart"
-      newopt_install_bindir="${BINDIR}"
-      newopt_install_libexecdir="${LIBEXECDIR}"
-      newopt_install_datadir="${DATADIR}"
-      newopt_mod_appid=346110
-
-      if grep '^\(servermail\|arkstVersion\)=' "${INSTALL_ROOT}${PREFIX}/.arkmanager.cfg" >/dev/null 2>&1; then
-        sed -i '/^\(servermail\|arkstVersion\)=/d' "${INSTALL_ROOT}${PREFIX}/.arkmanager.cfg"
-      fi
-
-      for optname in "${newopts[@]}"; do
-        if ! grep "^${optname}=" "${INSTALL_ROOT}${PREFIX}/.arkmanager.cfg" >/dev/null 2>&1; then
-	  noptname="newopt_${optname}"
-	  echo "${optname}='${!noptname}'" >>"${INSTALL_ROOT}${PREFIX}/.arkmanager.cfg"
-	fi
-      done
+      bash ./migrate-config.sh "${INSTALL_ROOT}${PREFIX}/.arkmanager.cfg"
 
       echo "A previous version of ARK Server Tools was detected in your system, your old configuration was not overwritten. You may need to manually update it."
       echo "A copy of the new configuration file was included in '${INSTALL_ROOT}${PREFIX}/.arkmanager.cfg.NEW'. Make sure to review any changes and update your config accordingly!"
@@ -303,25 +285,7 @@ else
            "${INSTALL_ROOT}/etc/arkmanager/arkmanager.cfg.NEW"
 
     if [ -f "${INSTALL_ROOT}/etc/arkmanager/arkmanager.cfg" ]; then
-      newopts=( arkbackupdir arkautorestartfile install_bindir install_libexecdir install_datadir mod_appid )
-      newopt_steamcmd_appinfocache="/home/${steamcmd_user}/Steam/appcache/appinfo.vdf"
-      newopt_arkbackupdir="/home/${steamcmd_user}/ARK-Backups"
-      newopt_arkautorestartfile="ShooterGame/Saved/.autorestart"
-      newopt_install_bindir="${BINDIR}"
-      newopt_install_libexecdir="${LIBEXECDIR}"
-      newopt_install_datadir="${DATADIR}"
-      newopt_mod_appid=346110
-
-      if grep '^\(servermail\|arkstVersion\)=' "${INSTALL_ROOT}/etc/arkmanager/arkmanager.cfg" >/dev/null 2>&1; then
-        sed -i '/^\(servermail\|arkstVersion\)=/d' "${INSTALL_ROOT}/etc/arkmanager/arkmanager.cfg"
-      fi
-
-      for optname in "${newopts[@]}"; do
-        if ! grep "^${optname}=" "${INSTALL_ROOT}/etc/arkmanager/arkmanager.cfg" >/dev/null 2>&1; then
-	  noptname="newopt_${optname}"
-	  echo "${optname}='${!noptname}'" >>"${INSTALL_ROOT}/etc/arkmanager/arkmanager.cfg"
-	fi
-      done
+      bash ./migrate-config.sh "${INSTALL_ROOT}/etc/arkmanager/arkmanager.cfg"
 
       echo "A previous version of ARK Server Tools was detected in your system, your old configuration was not overwritten. You may need to manually update it."
       echo "A copy of the new configuration file was included in /etc/arkmanager. Make sure to review any changes and update your config accordingly!"
diff --git a/tools/migrate-config.sh b/tools/migrate-config.sh
new file mode 100755
index 0000000..e7bd017
--- /dev/null
+++ b/tools/migrate-config.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+configfile="$1"
+newopts=( arkbackupdir arkautorestartfile install_bindir install_libexecdir install_datadir mod_appid )
+newopt_steamcmd_appinfocache="${PREFIX}/Steam/appcache/appinfo.vdf"
+newopt_arkbackupdir="${PREFIX}/ARK-Backups"
+newopt_arkautorestartfile="ShooterGame/Saved/.autorestart"
+newopt_install_bindir="${BINDIR}"
+newopt_install_libexecdir="${LIBEXECDIR}"
+newopt_install_datadir="${DATADIR}"
+newopt_mod_appid=346110
+
+if grep '^\(servermail\|arkstVersion\)=' "${configfile}" >/dev/null 2>&1; then
+  sed -i '/^\(servermail\|arkstVersion\)=/d' "${configfile}"
+fi
+
+for optname in "${newopts[@]}"; do
+  if ! grep "^${optname}=" "${configfile}" >/dev/null 2>&1; then
+    noptname="newopt_${optname}"
+    echo "${optname}='${!noptname}'" >>"${configfile}"
+  fi
+done
+

From 627220de57e8808940fad649cf843842731bf71a Mon Sep 17 00:00:00 2001
From: Ben Peddell <klightspeed@killerwolves.net>
Date: Sat, 21 Nov 2015 22:44:58 +1000
Subject: [PATCH 04/14] Create instance config directory during install

---
 tools/install.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/install.sh b/tools/install.sh
index f81348d..99696dd 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -155,6 +155,9 @@ if [ "$userinstall" == "yes" ]; then
     # Create a folder in ~/logs to let Ark tools write its own log files
     mkdir -p "${INSTALL_ROOT}${PREFIX}/logs/arktools"
 
+    # Create a folder in ~/.config/arkamanger to hold instance configs
+    mkdir -p "${INSTALL_ROOT}${PREFIX}/.config/arkmanager/instances"
+
     # Copy arkmanager.cfg to ~/.arkmanager.cfg.NEW
     cp arkmanager.cfg "${INSTALL_ROOT}${PREFIX}/.arkmanager.cfg.NEW"
     # Change the defaults in the new config file
@@ -273,6 +276,10 @@ else
     mkdir -p "${INSTALL_ROOT}/var/log/arktools"
     chown "$steamcmd_user" "${INSTALL_ROOT}/var/log/arktools"
 
+    # Create a folder in /etc/arkmanager to hold instance config files
+    mkdir -p "${INSTALL_ROOT}/etc/arkmanager/instances"
+    chown "$steamcmd_user" "${INSTALL_ROOT}/etc/arkmanager/instances"
+
     # Copy arkmanager.cfg inside linux configuation folder if it doesn't already exists
     mkdir -p "${INSTALL_ROOT}/etc/arkmanager"
     cp arkmanager.cfg "${INSTALL_ROOT}/etc/arkmanager/arkmanager.cfg.NEW"

From 15162c50fef5ebd1ac3bcb842f73fd6cadff1a36 Mon Sep 17 00:00:00 2001
From: Ben Peddell <klightspeed@killerwolves.net>
Date: Sat, 21 Nov 2015 22:53:41 +1000
Subject: [PATCH 05/14] Move instance-specific settings to instance.cfg.example

---
 tools/arkmanager.cfg       |  9 +++------
 tools/install.sh           |  6 ++++++
 tools/instance.cfg.example | 28 ++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 tools/instance.cfg.example

diff --git a/tools/arkmanager.cfg b/tools/arkmanager.cfg
index 96c8c05..7210555 100644
--- a/tools/arkmanager.cfg
+++ b/tools/arkmanager.cfg
@@ -11,7 +11,6 @@ steamcmd_appinfocache="/home/steam/Steam/appcache/appinfo.vdf"      # cache of t
 #steamlogin="anonymous"                                             # Uncomment this to specify steam login instead of using anonymous login
 
 # config environment
-arkserverroot="/home/steam/ARK"                                     # path of your ARK server files (default ~/ARK)
 arkserverexec="ShooterGame/Binaries/Linux/ShooterGameServer"        # name of ARK server executable
 arkbackupdir="/home/steam/ARK-Backups"                              # path to backup directory
 arkwarnminutes="60"                                                 # number of minutes to warn players when using update --warn
@@ -29,17 +28,13 @@ msgWarnRestartSeconds="This ARK server will shutdown for a restart in %d seconds
 msgWarnShutdownMinutes="This ARK server will shutdown in %d minutes"
 msgWarnShutdownSeconds="This ARK server will shutdown in %d seconds"
 
-# ARK server options - use ark_<optionname>=<value>
+# ARK server common options - use ark_<optionname>=<value>
 # comment out these values if you want to define them
 # inside your GameUserSettings.ini file
 serverMap="TheIsland"                                               # server map (default TheIsland)
 #serverMapModId="469987622"                                         # Uncomment this to specify the Map Mod Id (<fileid> in http://steamcommunity.com/sharedfiles/filedetails/?id=<fileid>)
 #ark_TotalConversionMod="496735411"                                 # Uncomment this to specify a total-conversion mod
 ark_RCONEnabled="True"                                              # Enable RCON Protocol
-ark_RCONPort="32330"                                                # RCON Port
-ark_SessionName="ARK Server Tools"                                  # if your session name needs special characters please use the .ini instead
-ark_Port="7778"                                                     # ARK server port (default 7778)
-ark_QueryPort="27015"                                               # ARK query port (default 27015)
 ark_ServerPassword=""                                               # ARK server password, empty: no password required to login
 ark_ServerAdminPassword="keyboardcat"                               # ARK server admin password, KEEP IT SAFE!
 ark_MaxPlayers="70"
@@ -69,3 +64,5 @@ mod_branch=Windows
 # alternate configs
 # example for config name "ark1":
 #configfile_ark1="/path/to/config/file"
+
+#defaultinstance="main"
diff --git a/tools/install.sh b/tools/install.sh
index 99696dd..c28e712 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -158,6 +158,9 @@ if [ "$userinstall" == "yes" ]; then
     # Create a folder in ~/.config/arkamanger to hold instance configs
     mkdir -p "${INSTALL_ROOT}${PREFIX}/.config/arkmanager/instances"
 
+    # Copy example instance config
+    cp instance.cfg.example "${INSTALL_ROOT}/${PREFIX}/.config/arkamanger/instances/instance.cfg.example"
+
     # Copy arkmanager.cfg to ~/.arkmanager.cfg.NEW
     cp arkmanager.cfg "${INSTALL_ROOT}${PREFIX}/.arkmanager.cfg.NEW"
     # Change the defaults in the new config file
@@ -280,6 +283,9 @@ else
     mkdir -p "${INSTALL_ROOT}/etc/arkmanager/instances"
     chown "$steamcmd_user" "${INSTALL_ROOT}/etc/arkmanager/instances"
 
+    # Copy example instance config
+    cp instance.cfg.example "${INSTALL_ROOT}/etc/arkamanger/instances/instance.cfg.example"
+
     # Copy arkmanager.cfg inside linux configuation folder if it doesn't already exists
     mkdir -p "${INSTALL_ROOT}/etc/arkmanager"
     cp arkmanager.cfg "${INSTALL_ROOT}/etc/arkmanager/arkmanager.cfg.NEW"
diff --git a/tools/instance.cfg.example b/tools/instance.cfg.example
new file mode 100644
index 0000000..0513b44
--- /dev/null
+++ b/tools/instance.cfg.example
@@ -0,0 +1,28 @@
+# config environment
+arkserverroot="/home/steam/ARK"                                     # path of your ARK server files (default ~/ARK)
+
+# ARK server options - use ark_<optionname>=<value>
+# comment out these values if you want to define them
+# inside your GameUserSettings.ini file
+serverMap="TheIsland"                                               # server map (default TheIsland)
+#serverMapModId="469987622"                                         # Uncomment this to specify the Map Mod Id (<fileid> in http://steamcommunity.com/sharedfiles/filedetails/?id=<fileid>)
+#ark_TotalConversionMod="496735411"                                 # Uncomment this to specify a total-conversion mod
+ark_RCONEnabled="True"                                              # Enable RCON Protocol
+ark_RCONPort="32330"                                                # RCON Port
+ark_SessionName="ARK Server Tools"                                  # if your session name needs special characters please use the .ini instead
+ark_Port="7778"                                                     # ARK server port (default 7778)
+ark_QueryPort="27015"                                               # ARK query port (default 27015)
+ark_ServerPassword=""                                               # ARK server password, empty: no password required to login
+ark_ServerAdminPassword="keyboardcat"                               # ARK server admin password, KEEP IT SAFE!
+ark_MaxPlayers="70"
+#ark_GameModIds="487516323,487516324,487516325"                     # Uncomment to specify additional mods by Mod Id separated by commas
+#ark_AltSaveDirectoryName="SotF"                                    # Uncomment to specify a different save directory name
+
+# ARK server flags - use arkflag_<optionname>=true
+#arkflag_OnlyAdminRejoinAsSpectator=true                            # Uncomment to only allow admins to rejoin as spectator
+#arkflag_DisableDeathSpectator=true                                 # Uncomment to disable players from becoming spectators when they die
+
+# ARK server options - i.e. for -optname=val, use arkopt_optname=val
+#arkopt_StructureDestructionTag=DestroySwampSnowStructures
+
+

From 61446ab88c986da27694b14a3192aa53b37cd152 Mon Sep 17 00:00:00 2001
From: Ben Peddell <klightspeed@killerwolves.net>
Date: Sat, 21 Nov 2015 23:12:34 +1000
Subject: [PATCH 06/14] Add CONFIGFILE and INSTANCEDIR variables in install.sh

---
 tools/install.sh | 41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index c28e712..5c66dab 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -99,10 +99,14 @@ if [ "$userinstall" == "yes" ]; then
   PREFIX="${PREFIX:-${HOME}}"
   EXECPREFIX="${EXECPREFIX:-${PREFIX}}"
   DATAPREFIX="${DATAPREFIX:-${PREFIX}/.local/share}"
+  CONFIGFILE="${PREFIX}/.arkmanager.cfg"
+  INSTANCEDIR="${PREFIX}/.config/arkmanager/instances"
 else
   PREFIX="${PREFIX:-/usr/local}"
   EXECPREFIX="${EXECPREFIX:-${PREFIX}}"
   DATAPREFIX="${DATAPREFIX:-${PREFIX}/share}"
+  CONFIGFILE="/etc/arkmanager/.arkmanager.cfg"
+  INSTANCEDIR="/etc/arkmanager/instances"
 fi
 
 BINDIR="${BINDIR:-${EXECPREFIX}/bin}"
@@ -156,13 +160,16 @@ if [ "$userinstall" == "yes" ]; then
     mkdir -p "${INSTALL_ROOT}${PREFIX}/logs/arktools"
 
     # Create a folder in ~/.config/arkamanger to hold instance configs
-    mkdir -p "${INSTALL_ROOT}${PREFIX}/.config/arkmanager/instances"
+    mkdir -p "${INSTALL_ROOT}${INSTANCEDIR}"
 
     # Copy example instance config
-    cp instance.cfg.example "${INSTALL_ROOT}/${PREFIX}/.config/arkamanger/instances/instance.cfg.example"
+    cp instance.cfg.example "${INSTALL_ROOT}/${INSTANCEDIR}/instance.cfg.example"
+    # Change the defaults in the new instance config template
+    sed -i -e "s|\"/home/steam|\"${PREFIX}|" \
+           "${INSTALL_ROOT}${INSTANCEDIR}/instance.cfg.example"
 
     # Copy arkmanager.cfg to ~/.arkmanager.cfg.NEW
-    cp arkmanager.cfg "${INSTALL_ROOT}${PREFIX}/.arkmanager.cfg.NEW"
+    cp arkmanager.cfg "${INSTALL_ROOT}${CONFIGFILE}.NEW"
     # Change the defaults in the new config file
     sed -i -e "s|^steamcmd_user=\"steam\"|steamcmd_user=\"--me\"|" \
            -e "s|\"/home/steam|\"${PREFIX}|" \
@@ -170,17 +177,17 @@ if [ "$userinstall" == "yes" ]; then
            -e "s|^install_bindir=.*|install_bindir=\"${BINDIR}\"|" \
            -e "s|^install_libexecdir=.*|install_libexecdir=\"${LIBEXECDIR}\"|" \
            -e "s|^install_datadir=.*|install_datadir=\"${DATADIR}\"|" \
-           "${INSTALL_ROOT}${PREFIX}/.arkmanager.cfg.NEW"
+           "${INSTALL_ROOT}${CONFIGFILE}.NEW"
 
     # Copy arkmanager.cfg to ~/.arkmanager.cfg if it doesn't already exist
-    if [ -f "${INSTALL_ROOT}${PREFIX}/.arkmanager.cfg" ]; then
-      bash ./migrate-config.sh "${INSTALL_ROOT}${PREFIX}/.arkmanager.cfg"
+    if [ -f "${INSTALL_ROOT}${CONFIGFILE}" ]; then
+      bash ./migrate-config.sh "${INSTALL_ROOT}${CONFIGFILE}"
 
       echo "A previous version of ARK Server Tools was detected in your system, your old configuration was not overwritten. You may need to manually update it."
-      echo "A copy of the new configuration file was included in '${INSTALL_ROOT}${PREFIX}/.arkmanager.cfg.NEW'. Make sure to review any changes and update your config accordingly!"
+      echo "A copy of the new configuration file was included in '${CONFIGFILE}.NEW'. Make sure to review any changes and update your config accordingly!"
       exit 2
     else
-      mv -n "${INSTALL_ROOT}${PREFIX}/.arkmanager.cfg.NEW" "${INSTALL_ROOT}${PREFIX}/.arkmanager.cfg"
+      mv -n "${INSTALL_ROOT}${CONFIGFILE}.NEW" "${INSTALL_ROOT}${CONFIGFILE}"
     fi
 else
     # Copy arkmanager to /usr/bin and set permissions
@@ -280,31 +287,31 @@ else
     chown "$steamcmd_user" "${INSTALL_ROOT}/var/log/arktools"
 
     # Create a folder in /etc/arkmanager to hold instance config files
-    mkdir -p "${INSTALL_ROOT}/etc/arkmanager/instances"
-    chown "$steamcmd_user" "${INSTALL_ROOT}/etc/arkmanager/instances"
+    mkdir -p "${INSTALL_ROOT}${INSTANCEDIR}"
+    chown "$steamcmd_user" "${INSTALL_ROOT}${INSTANCEDIR}"
 
     # Copy example instance config
-    cp instance.cfg.example "${INSTALL_ROOT}/etc/arkamanger/instances/instance.cfg.example"
+    cp instance.cfg.example "${INSTALL_ROOT}${INSTANCEDIR}/instance.cfg.example"
 
     # Copy arkmanager.cfg inside linux configuation folder if it doesn't already exists
     mkdir -p "${INSTALL_ROOT}/etc/arkmanager"
-    cp arkmanager.cfg "${INSTALL_ROOT}/etc/arkmanager/arkmanager.cfg.NEW"
-    chown "$steamcmd_user" "${INSTALL_ROOT}/etc/arkmanager/arkmanager.cfg.NEW"
+    cp arkmanager.cfg "${INSTALL_ROOT}${CONFIGFILE}.NEW"
+    chown "$steamcmd_user" "${INSTALL_ROOT}${CONFIGFILE}.NEW"
     sed -i -e "s|^steamcmd_user=\"steam\"|steamcmd_user=\"$steamcmd_user\"|" \
            -e "s|\"/home/steam|\"/home/$steamcmd_user|" \
            -e "s|^install_bindir=.*|install_bindir=\"${BINDIR}\"|" \
            -e "s|^install_libexecdir=.*|install_libexecdir=\"${LIBEXECDIR}\"|" \
            -e "s|^install_datadir=.*|install_datadir=\"${DATADIR}\"|" \
-           "${INSTALL_ROOT}/etc/arkmanager/arkmanager.cfg.NEW"
+           "${INSTALL_ROOT}${CONFIGFILE}.NEW"
 
-    if [ -f "${INSTALL_ROOT}/etc/arkmanager/arkmanager.cfg" ]; then
-      bash ./migrate-config.sh "${INSTALL_ROOT}/etc/arkmanager/arkmanager.cfg"
+    if [ -f "${INSTALL_ROOT}${CONFIGFILE}" ]; then
+      bash ./migrate-config.sh "${INSTALL_ROOT}${CONFIGFILE}"
 
       echo "A previous version of ARK Server Tools was detected in your system, your old configuration was not overwritten. You may need to manually update it."
       echo "A copy of the new configuration file was included in /etc/arkmanager. Make sure to review any changes and update your config accordingly!"
       exit 2
     else
-      mv -n "${INSTALL_ROOT}/etc/arkmanager/arkmanager.cfg.NEW" "${INSTALL_ROOT}/etc/arkmanager/arkmanager.cfg"
+      mv -n "${INSTALL_ROOT}${CONFIGFILE}.NEW" "${INSTALL_ROOT}${CONFIGFILE}.cfg"
     fi
 fi
 

From b2ae770b994763c400ffb2503bd9d3332d817b4a Mon Sep 17 00:00:00 2001
From: Ben Peddell <klightspeed@killerwolves.net>
Date: Sat, 21 Nov 2015 23:14:53 +1000
Subject: [PATCH 07/14] Add script to migrate main instance

---
 tools/install.sh               |  2 ++
 tools/migrate-main-instance.sh | 10 ++++++++++
 2 files changed, 12 insertions(+)
 create mode 100755 tools/migrate-main-instance.sh

diff --git a/tools/install.sh b/tools/install.sh
index 5c66dab..73bfb98 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -182,6 +182,7 @@ if [ "$userinstall" == "yes" ]; then
     # Copy arkmanager.cfg to ~/.arkmanager.cfg if it doesn't already exist
     if [ -f "${INSTALL_ROOT}${CONFIGFILE}" ]; then
       bash ./migrate-config.sh "${INSTALL_ROOT}${CONFIGFILE}"
+      bash ./migrate-main-instance.sh "${INSTALL_ROOT}${CONFIGFILE}" "${INSTALL_ROOT}${INSTANCEDIR}/main.cfg"
 
       echo "A previous version of ARK Server Tools was detected in your system, your old configuration was not overwritten. You may need to manually update it."
       echo "A copy of the new configuration file was included in '${CONFIGFILE}.NEW'. Make sure to review any changes and update your config accordingly!"
@@ -306,6 +307,7 @@ else
 
     if [ -f "${INSTALL_ROOT}${CONFIGFILE}" ]; then
       bash ./migrate-config.sh "${INSTALL_ROOT}${CONFIGFILE}"
+      bash ./migrate-main-instance.sh "${INSTALL_ROOT}${CONFIGFILE}" "${INSTALL_ROOT}${INSTANCEDIR}/main.cfg"
 
       echo "A previous version of ARK Server Tools was detected in your system, your old configuration was not overwritten. You may need to manually update it."
       echo "A copy of the new configuration file was included in /etc/arkmanager. Make sure to review any changes and update your config accordingly!"
diff --git a/tools/migrate-main-instance.sh b/tools/migrate-main-instance.sh
new file mode 100755
index 0000000..79cdfd6
--- /dev/null
+++ b/tools/migrate-main-instance.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+configfile="$1"
+instancefile="$2"
+
+if grep "^arkserverroot=" <"$configfile" >/dev/null 2>&1 && [ ! -f "$instancefile" ]; then
+  sed -n '/^#*\(ark\(\|flag\|opt\)_[^=]*\|arkserverroot\|serverMap\(\|ModId\)\)=/p' <"$configfile" >"$instancefile"
+  sed -i '/^ark\(serverroot\|_\(RCONPort\|Port\|QueryPort\)\)=/d' "$configfile"
+  echo 'defaultinstance="main"' >>"$configfile"
+fi

From f158b943e2079c2aaefcddcbb032b9e258a2d737 Mon Sep 17 00:00:00 2001
From: Ben Peddell <klightspeed@killerwolves.net>
Date: Sat, 21 Nov 2015 23:15:26 +1000
Subject: [PATCH 08/14] Remove support for main instance in core config

---
 tools/arkmanager | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tools/arkmanager b/tools/arkmanager
index dd5934e..6e4553a 100755
--- a/tools/arkmanager
+++ b/tools/arkmanager
@@ -1478,9 +1478,6 @@ useConfig() {
   if [ -f "${HOME}/.config/arkmanager/instances/${1}.cfg" ]; then
     source "${HOME}/.config/arkmanager/instances/${1}.cfg"
   fi
-  if [ "$1" == "main" ]; then
-    return
-  fi
   for varname in "${!configfile_@}"; do
     if [ "configfile_$1" == "$varname" ]; then
       source "${!varname}"

From 3f1110bd0a448edcb4e1ae4e6a5fd4d04bdcec5d Mon Sep 17 00:00:00 2001
From: Ben Peddell <klightspeed@killerwolves.net>
Date: Sat, 21 Nov 2015 23:25:54 +1000
Subject: [PATCH 09/14] Give steamcmd_user ownership of /etc/arkmanager

---
 tools/install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/install.sh b/tools/install.sh
index 73bfb98..e2f526b 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -296,6 +296,7 @@ else
 
     # Copy arkmanager.cfg inside linux configuation folder if it doesn't already exists
     mkdir -p "${INSTALL_ROOT}/etc/arkmanager"
+    chown "$steamcmd_user" "${INSTALL_ROOT}/etc/arkmanager"
     cp arkmanager.cfg "${INSTALL_ROOT}${CONFIGFILE}.NEW"
     chown "$steamcmd_user" "${INSTALL_ROOT}${CONFIGFILE}.NEW"
     sed -i -e "s|^steamcmd_user=\"steam\"|steamcmd_user=\"$steamcmd_user\"|" \

From f7e8b1ada9ae920ea016bf8397b5bbeabe975fa9 Mon Sep 17 00:00:00 2001
From: Ben Peddell <klightspeed@killerwolves.net>
Date: Sat, 21 Nov 2015 23:37:52 +1000
Subject: [PATCH 10/14] Error out if arkserverroot is not set

---
 tools/arkmanager | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/arkmanager b/tools/arkmanager
index 6e4553a..d2c9f9a 100755
--- a/tools/arkmanager
+++ b/tools/arkmanager
@@ -1484,7 +1484,10 @@ useConfig() {
       return
     fi
   done
-  source "$1"
+  if [ -z "$arkserverroot" ]; then
+    echo "Error: arkserverroot not set"
+    exit 1
+  fi
 }
 
 showUsage() {

From 95cd1002e18035024ffab98b6b19d93bafd9e85c Mon Sep 17 00:00:00 2001
From: Ben Peddell <klightspeed@killerwolves.net>
Date: Sat, 21 Nov 2015 23:52:29 +1000
Subject: [PATCH 11/14] Enumerate all instances in @all; add list-instances
 command

---
 tools/arkmanager | 45 +++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 4 deletions(-)

diff --git a/tools/arkmanager b/tools/arkmanager
index d2c9f9a..a26c7b2 100755
--- a/tools/arkmanager
+++ b/tools/arkmanager
@@ -1471,6 +1471,41 @@ printStatus(){
   echo -e "$NORMAL" "Server version: " "$GREEN" $instver "$NORMAL"
 }
 
+getAllInstanceNames(){
+  declare -A instancenames
+  for varname in "${!configfile_@}"; do
+    instancename="${varname#configfile_}"
+    instancenames[${instancename}]="${instancename}"
+  done
+  for f in /etc/arkmanager/instances/*.cfg; do
+    if [ -f "${f}" ]; then
+      instancename="${f##*/}"
+      instancename="${instancename%.cfg}"
+      instancenames[${instancename}]="${instancename}"
+    fi
+  done
+  for f in ${HOME}/.config/arkmanager/instances/*.cfg; do
+    if [ -f "${f}" ]; then
+      instancename="${f##*/}"
+      instancename="${instancename%.cfg}"
+      instancenames[${instancename}]="${instancename}"
+    fi
+  done
+
+  echo "${instancenames[@]}"
+}
+
+doListAllInstances(){
+  echo "The following instances are available:"
+  for n in $(getAllInstanceNames); do
+    (
+      echo -n "  @${n}: "
+      useConfig "$n"
+      echo "${arkserverroot}"
+    )
+  done
+}
+
 useConfig() {
   if [ -f "/etc/arkmanager/instances/${1}.cfg" ]; then
     source "/etc/arkmanager/instances/${1}.cfg"
@@ -1501,6 +1536,7 @@ showUsage() {
   echo "upgrade-tools         Check for a new ARK Server Tools version and upgrades it if needed"
   echo "uninstall-tools       Uninstall the ARK Server Tools"
   echo "useconfig <name>      Sets the default instance for the commands that follow"
+  echo "list-instances        Lists all available instances"
   echo "--help                Show this help"
   echo "--version             Show the version info of ARK Server Tools"
   echo
@@ -1601,6 +1637,10 @@ while true; do
       defaultinstance="${args[0]}"
       continue
     ;;
+    list-instances)
+      doListAllInstances
+      exit
+    ;;
     --version)
       echo "Version: ${arkstVersion}"
       echo "Channel: ${arkstChannel}"
@@ -1638,10 +1678,7 @@ while true; do
 
   # Handle all instances being requested
   if [[ "$allinstances" == "yes" ]]; then
-    instances=( )
-    for varname in "${!configfile_@}"; do
-      instances+=( "${varname#configfile_}" )
-    done
+    instances=( $(getAllInstanceNames) )
   fi
 
   # Run the command for each instance requested

From 94854f8d09c0336efb53a4e66bdabc8201069422 Mon Sep 17 00:00:00 2001
From: Ben Peddell <klightspeed@killerwolves.net>
Date: Sun, 22 Nov 2015 00:04:18 +1000
Subject: [PATCH 12/14] Move check for ARK server exec to instance execution

---
 tools/arkmanager | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/arkmanager b/tools/arkmanager
index a26c7b2..9a8d6a5 100755
--- a/tools/arkmanager
+++ b/tools/arkmanager
@@ -191,7 +191,7 @@ checkConfig() {
 
   # Environment configuration
   # arkserverexec
-  if [ ! -f "$arkserverroot/$arkserverexec" ] ; then
+  if [ -n "$arkserverroot" ] && [ ! -f "$arkserverroot/$arkserverexec" ] ; then
     echo -e "[" "$YELLOW" "WARN" "$NORMAL" "]" "\tYour ARK server exec could not be found."
   fi
 
@@ -1516,7 +1516,7 @@ useConfig() {
   for varname in "${!configfile_@}"; do
     if [ "configfile_$1" == "$varname" ]; then
       source "${!varname}"
-      return
+      break
     fi
   done
   if [ -z "$arkserverroot" ]; then
@@ -1686,6 +1686,7 @@ while true; do
   (
     echo "Running command '${command}' for instance '${instance}'"
     useConfig "$instance"
+    checkConfig
 
     case "$command" in
       run)

From 92acb88fd5c474c05c84bbfba90969bda10c4a5f Mon Sep 17 00:00:00 2001
From: Ben Peddell <klightspeed@killerwolves.net>
Date: Sun, 22 Nov 2015 18:33:46 +1000
Subject: [PATCH 13/14] Update systemd and upstart scripts with multi-instance
 support

---
 tools/arkmanager              | 22 +++++++++++++---------
 tools/install.sh              |  3 +++
 tools/systemd/arkmanager.init | 13 +++++++++++--
 tools/upstart/arkmanager.conf |  6 ++++--
 4 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/tools/arkmanager b/tools/arkmanager
index 9a8d6a5..c672f1a 100755
--- a/tools/arkmanager
+++ b/tools/arkmanager
@@ -1496,14 +1496,18 @@ getAllInstanceNames(){
 }
 
 doListAllInstances(){
-  echo "The following instances are available:"
-  for n in $(getAllInstanceNames); do
-    (
-      echo -n "  @${n}: "
-      useConfig "$n"
-      echo "${arkserverroot}"
-    )
-  done
+  if [ "$1" == "--brief" ]; then
+    getAllInstanceNames
+  else
+    echo "The following instances are available:"
+    for n in $(getAllInstanceNames); do
+      (
+        echo -n "  @${n}: "
+        useConfig "$n"
+        echo "${arkserverroot}"
+      )
+    done
+  fi
 }
 
 useConfig() {
@@ -1638,7 +1642,7 @@ while true; do
       continue
     ;;
     list-instances)
-      doListAllInstances
+      doListAllInstances "${options[@]}"
       exit
     ;;
     --version)
diff --git a/tools/install.sh b/tools/install.sh
index e2f526b..3ac4df4 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -210,6 +210,7 @@ else
       if [ -f /etc/systemd/system.conf ]; then   # used by systemd
         mkdir -p "${INSTALL_ROOT}${LIBEXECDIR}"
         cp systemd/arkmanager.init "${INSTALL_ROOT}${LIBEXECDIR}/arkmanager.init"
+        sed -i "s|^DAEMON=\"/usr/bin/|DAEMON=\"${BINDIR}/|" "${INSTALL_ROOT}${LIBEXECDIR}/arkmanager.init"
         chmod +x "${INSTALL_ROOT}${LIBEXECDIR}/arkmanager.init"
         cp systemd/arkmanager.service "${INSTALL_ROOT}/etc/systemd/system/arkmanager.service"
         sed -i "s|=/usr/libexec/arkmanager/|=${LIBEXECDIR}/|" "${INSTALL_ROOT}/etc/systemd/system/arkmanager.service"
@@ -237,6 +238,7 @@ else
       if [ -f /etc/systemd/system.conf ]; then   # used by systemd
         mkdir -p "${INSTALL_ROOT}${LIBEXECDIR}"
         cp systemd/arkmanager.init "${INSTALL_ROOT}${LIBEXECDIR}/arkmanager.init"
+        sed -i "s|^DAEMON=\"/usr/bin/|DAEMON=\"${BINDIR}/|" "${INSTALL_ROOT}${LIBEXECDIR}/arkmanager.init"
         chmod +x "${INSTALL_ROOT}${LIBEXECDIR}/arkmanager.init"
         cp systemd/arkmanager.service "${INSTALL_ROOT}/etc/systemd/system/arkmanager.service"
         sed -i "s|=/usr/libexec/arkmanager/|=${LIBEXECDIR}/|" "${INSTALL_ROOT}/etc/systemd/system/arkmanager.service"
@@ -270,6 +272,7 @@ else
     elif [ -f /etc/systemd/system.conf ]; then   # used by systemd
       mkdir -p "${INSTALL_ROOT}${LIBEXECDIR}"
       cp systemd/arkmanager.init "${INSTALL_ROOT}${LIBEXECDIR}/arkmanager.init"
+      sed -i "s|^DAEMON=\"/usr/bin/|DAEMON=\"${BINDIR}/|" "${INSTALL_ROOT}${LIBEXECDIR}/arkmanager.init"
       chmod +x "${INSTALL_ROOT}${LIBEXECDIR}/arkmanager.init"
       cp systemd/arkmanager.service "${INSTALL_ROOT}/etc/systemd/system/arkmanager.service"
       sed -i "s|=/usr/libexec/arkmanager/|=${LIBEXECDIR}/|" "${INSTALL_ROOT}/etc/systemd/system/arkmanager.service"
diff --git a/tools/systemd/arkmanager.init b/tools/systemd/arkmanager.init
index be25029..fa760d2 100755
--- a/tools/systemd/arkmanager.init
+++ b/tools/systemd/arkmanager.init
@@ -1,5 +1,14 @@
 #!/bin/bash
 
-for service in main $(grep -o '^configfile_[^=]*' /etc/arkmanager/arkmanager.cfg); do
-  systemctl start arkmanager@${service#configfile_}
+DAEMON=/usr/bin/arkmanager
+
+for service in $(${DAEMON} list-instances --brief); do
+  case "$1" in
+    start)
+      systemctl start arkmanager@${service}
+    ;;
+    stop)
+      systemctl stop arkmanager@${service}
+    ;;
+  esac
 done
diff --git a/tools/upstart/arkmanager.conf b/tools/upstart/arkmanager.conf
index 688cbe8..5cc8008 100644
--- a/tools/upstart/arkmanager.conf
+++ b/tools/upstart/arkmanager.conf
@@ -1,8 +1,10 @@
 start on runlevel [345]
 stop on runlevel [!345]
 
+env DAEMON="/usr/bin/arkmanager"
+
 script
-  for service in main $(grep -o '^configfile_[^=]*' /etc/arkmanager/arkmanager.cfg); do
-    start arkmanager-instance service=${service#configfile_}
+  for service in $(${DAEMON} list-instances --brief); do
+    start arkmanager-instance service=${service}
   done
 end script

From 237fff6bc4e63cd0eb846713f3fea70b9535d08e Mon Sep 17 00:00:00 2001
From: Ben Peddell <klightspeed@killerwolves.net>
Date: Sun, 22 Nov 2015 19:40:25 +1000
Subject: [PATCH 14/14] Add multi-instance support to init scripts

---
 tools/lsb/arkdaemon    |  93 ++++++++++++++++++++++++++++--------
 tools/openrc/arkdaemon |  22 ++++-----
 tools/redhat/arkdaemon | 105 ++++++++++++++++++++++++++++++-----------
 3 files changed, 160 insertions(+), 60 deletions(-)

diff --git a/tools/lsb/arkdaemon b/tools/lsb/arkdaemon
index 484d5d8..6390f59 100755
--- a/tools/lsb/arkdaemon
+++ b/tools/lsb/arkdaemon
@@ -20,46 +20,99 @@ NAME="ShooterGameServer"
 LOGFILE="${logdir}/${NAME}.log"
 DAEMON="/usr/bin/arkmanager"
 
+SVCNAME="${0##*/}"
+INSTANCE="${SVCNAME#*.}"
+
+if [ "$INSTANCE" == "$SVCNAME" ]; then
+  INSTANCE="$2"
+fi
+
 set -e
 
 # If the daemon is not there, then exit.
 test -x $DAEMON || exit 5
 
+function start_instance(){
+  local INSTANCE="$1"
+  PID="$(<"/var/run/arkmanager.${INSTANCE}.pid")"
+  if [ -n "$PID" ] && kill -0 "$PID" >/dev/null 2>&1; then
+    if grep " ${PID} .* ${DAEMON}" <(ps -ef) >/dev/null 2>&1; then
+      echo "$NAME @${INSTANCE} is already running"
+      return 0
+    fi
+  fi
+  log_daemon_msg "Starting" "$NAME @${INSTANCE}"
+  ulimit -n 100000
+  "${DAEMON}" run "@${INSTANCE}" &
+  PID="$!"
+
+  sleep 5
+  if kill -0 "$PID" >/dev/null 2>&1; then
+    echo "$PID" >"/var/run/arkmanager.${INSTANCE}.pid"
+    log_end_msg 0
+    return 0
+  else
+    log_end_msg 1
+    return 1
+  fi
+}
+
+function start_all_instances(){
+  local nosuccess=0
+  local anyfailure=0
+  for instance in $("${DAEMON}" list-instances --brief); do
+    if start_instance "$instance"; then
+      nosuccess=0
+    else
+      anyfailure=1
+    fi
+  done
+
+  return $nosuccess
+}
+
+function stop_instance(){
+  local INSTANCE="$1"
+  log_daemon_msg "Stopping $NAME @${INSTANCE}: "
+  "${DAEMON}" stop "@${INSTANCE}" &
+  rm -f "/var/run/arkmanager.${INSTANCE}.pid"
+  log_end_msg 0
+  return 0
+}
+
 case "$1" in
   start)
-    log_daemon_msg "Starting" "$NAME"
-    ulimit -n 100000
-    su -s /bin/sh -c "$DAEMON start --all" $steamcmd_user
-    sleep 5
-    PID=`ps -ef | grep $NAME | grep -v grep | awk '{print $2}'`
-    if  [ -n "$PID" ];  then
-      echo "$PID" >/var/run/arkmanager.pid
-      log_end_msg 0
+    if [ -n "$INSTANCE" ]; then
+      start_instance "$INSTANCE"
+      exit $?
     else
-      log_end_msg 1
+      if start_all_instances; then
+        exit 0
+      else
+        exit 1
+      fi
     fi
   ;;
 
   stop)
-    log_daemon_msg "Stopping" "$NAME"
-    su -s /bin/sh -c "$DAEMON stop --all" $steamcmd_user
-    sleep 5
-    PID=`ps -ef | grep $NAME | grep -v grep | awk '{print $2}'`
-    if  [ -n "$PID" ];  then
-      log_end_msg 1
+    if [ -n "$INSTANCE" ]; then
+      stop_instance "$INSTANCE"
+      exit $?
     else
-      rm /var/run/arkmanager.pid
-      log_end_msg 0
+      for instance in $("${DAEMON}" list-instances --brief); do
+        stop_instance "$instance"
+      done
+      exit $?
     fi
   ;;
 
   restart)
-    ulimit -n 100000
-    su -s /bin/sh -c "$DAEMON restart --all" $steamcmd_user
+    "$0" stop
+    "$0" start
   ;;
 
   status)
-    su -s /bin/sh -c "$DAEMON status" $steamcmd_user
+    "$DAEMON" status "@${INSTANCE:-all}"
   ;;
 
   *)
diff --git a/tools/openrc/arkdaemon b/tools/openrc/arkdaemon
index 5aa9340..ac47eb1 100644
--- a/tools/openrc/arkdaemon
+++ b/tools/openrc/arkdaemon
@@ -13,27 +13,25 @@ depend(){
 }
 
 start(){
+    INSTANCE="${RC_SVCNAME#*.}"
     ebegin "Starting ARK manager daemon"
     ulimit -n 100000
-    su -s /bin/sh -c "$DAEMON start --all" $steamcmd_user
-    sleep 5
-    PID=`ps -ef | grep $NAME | grep -v grep | awk '{print $2}'`
-    if  [ -n "$PID" ];  then
-        eend 0
+    if [ "$INSTANCE" != "$RC_SVCNAME" ]; then
+        "$DAEMON" start "@${INSTANCE}"
     else
-        eend 1
+        "$DAEMON" start "@all"
     fi
+    eend $?
 }
 
 stop(){
+    INSTANCE="${RC_SVCNAME#*.}"
     ebegin "Stopping ARK manager daemon"
-    su -s /bin/sh -c "$DAEMON stop --all" $steamcmd_user
-    sleep 5
-    PID=`ps -ef | grep $NAME | grep -v grep | awk '{print $2}'`
-    if  [ -n "$PID" ];  then
-        eend 0
+    if [ "$INSTANCE" != "$RC_SVCNAME" ]; then
+        "$DAEMON" stop "@${INSTANCE}"
     else
-        eend 1
+        "$DAEMON" stop "@all"
     fi
+    eend $?
 }
 
diff --git a/tools/redhat/arkdaemon b/tools/redhat/arkdaemon
index fa0ed1a..48f0594 100755
--- a/tools/redhat/arkdaemon
+++ b/tools/redhat/arkdaemon
@@ -34,54 +34,103 @@ GREEN="\\033[1;32m"
 RED="\\033[1;31m"
 NORMAL="\\033[0;39m"
 
+SVCNAME="${0##*/}"
+INSTANCE="${SVCNAME#*.}"
+
+if [ "$INSTANCE" == "$SVCNAME" ]; then
+  INSTANCE="$2"
+fi
+
 set -e
 
 # If the daemon is not there, then exit.
 test -x $DAEMON || exit 5
 
+function start_instance(){
+  local INSTANCE="$1"
+  PID="$(<"/var/run/arkmanager.${INSTANCE}.pid")"
+  if [ -n "$PID" ] && kill -0 "$PID" >/dev/null 2>&1; then
+    if grep " ${PID} .* ${DAEMON}" <(ps -ef) >/dev/null 2>&1; then
+      echo "$NAME @${INSTANCE} is already running"
+      return 0
+    fi
+  fi
+  echo -n "Starting $NAME @${INSTANCE}: "
+  ulimit -n 100000
+  "${DAEMON}" run "@${INSTANCE}" &
+  PID="$!"
+
+  sleep 5
+  if kill -0 "$PID" >/dev/null 2>&1; then
+    echo "$PID" >"/var/run/arkmanager.${INSTANCE}.pid"
+    touch "/var/lock/subsys/arkmanager.${INSTANCE}"
+    echo "[" "$GREEN" " OK " "$NORMAL" "]"
+    return 0
+  else
+    echo "[" "$RED" " FAILED " "$NORMAL" "]"
+    return 1
+  fi
+}
+
+function start_all_instances(){
+  local nosuccess=0
+  local anyfailure=0
+  for instance in $("${DAEMON}" list-instances --brief); do
+    if start_instance "$instance"; then
+      nosuccess=0
+    else
+      anyfailure=1
+    fi
+  done
+
+  return $nosuccess
+}
+
+function stop_instance(){
+  local INSTANCE="$1"
+  echo -n "Stopping $NAME @${INSTANCE}: "
+  "${DAEMON}" stop "@${INSTANCE}" &
+  rm -f "/var/lock/subsys/arkmanager.${INSTANCE}"
+  rm -f "/var/run/arkmanager.${INSTANCE}.pid"
+  echo "[" "$GREEN" " OK " "$NORMAL" "]"
+  return 0
+}
+
 case "$1" in
   start)
-    echo -n "Starting $NAME: "
-    ulimit -n 100000
-    su -s /bin/sh -c "$DAEMON start --all" $steamcmd_user > /dev/null
-    sleep 5
-    PID=`ps -ef | grep $NAME | grep -v grep | awk '{print $2}'`
-    if  [ -n "$PID" ];  then
-      echo "${PID}" >/var/run/arkmanager.pid
-      touch /var/lock/subsys/arkmanager
-      echo "[" "$GREEN" " OK " "$NORMAL" "]"
-      exit 0
+    if [ -n "$INSTANCE" ]; then
+      start_instance "$INSTANCE"
+      exit $?
     else
-      echo "[" "$RED" " FAILED " "$NORMAL" "]"
-      exit 1
+      if start_all_instances; then
+        touch /var/lock/subsys/arkmanager
+        exit 0
+      else
+        exit 1
+      fi
     fi
   ;;
 
   stop)
-    echo -n "Stopping $NAME: "
-    su -s /bin/sh -c "$DAEMON stop --all" $steamcmd_user > /dev/null
-    sleep 5
-    PID=`ps -ef | grep $NAME | grep -v grep | awk '{print $2}'`
-    if  [ -n "$PID" ];  then
-      echo "[" "$RED" " FAILED " "$NORMAL" "]"
-      exit 1
+    if [ -n "$INSTANCE" ]; then
+      stop_instance "$INSTANCE"
+      exit $?
     else
-      echo "[" "$GREEN" " OK " "$NORMAL" "]"
-      rm -f /var/lock/subsys/arkmanager
-      rm -f /var/run/arkmanager.pid
-      exit 0
+      for instance in $("${DAEMON}" list-instances --brief); do
+        stop_instance "$instance"
+      done
+      rm -f "/var/lock/subsys/arkmanager"
+      exit $?
     fi
   ;;
 
   restart)
-    echo -n "Restarting $NAME: "
-    ulimit -n 100000
-    su -s /bin/sh -c "$DAEMON restart --all" $steamcmd_user > /dev/null
-    echo "OK"
+    "$0" stop
+    "$0" start
   ;;
 
   status)
-    su -s /bin/sh -c "$DAEMON status" $steamcmd_user
+    "$DAEMON" status "@${INSTANCE:-all}"
     exit 0
   ;;