539 Commits

Author SHA1 Message Date
Ben Peddell
237fff6bc4 Add multi-instance support to init scripts 2015-12-13 06:32:53 +10:00
Ben Peddell
92acb88fd5 Update systemd and upstart scripts with multi-instance support 2015-12-13 06:32:53 +10:00
Ben Peddell
94854f8d09 Move check for ARK server exec to instance execution 2015-12-13 06:32:53 +10:00
Ben Peddell
95cd1002e1 Enumerate all instances in @all; add list-instances command 2015-12-13 06:32:53 +10:00
Ben Peddell
f7e8b1ada9 Error out if arkserverroot is not set 2015-12-13 06:32:53 +10:00
Ben Peddell
3f1110bd0a Give steamcmd_user ownership of /etc/arkmanager 2015-12-13 06:32:53 +10:00
Ben Peddell
f158b943e2 Remove support for main instance in core config 2015-12-13 06:32:52 +10:00
Ben Peddell
b2ae770b99 Add script to migrate main instance 2015-12-13 06:32:52 +10:00
Ben Peddell
61446ab88c Add CONFIGFILE and INSTANCEDIR variables in install.sh 2015-12-13 06:32:52 +10:00
Ben Peddell
15162c50fe Move instance-specific settings to instance.cfg.example 2015-12-13 06:32:52 +10:00
Ben Peddell
627220de57 Create instance config directory during install 2015-12-13 06:32:52 +10:00
Ben Peddell
80fd25a33d Move config file migration to separate install-time script 2015-12-13 06:32:52 +10:00
Ben Peddell
33b94c63a1 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.
2015-12-13 06:32:52 +10:00
Ben Peddell
7cd3d9e15f Add per-command multi-instance support 2015-12-13 06:32:52 +10:00
Ben Peddell
6a6c1e7fa7 Remove unnecessary shifts from command processing 2015-12-13 06:26:41 +10:00
Fez Vrasta
3d7f975037 Merge pull request #329 from klightspeed/1.5-dev#restarttimer
Add --saveworld to stop and restart; fix useconfig
2015-12-12 20:23:08 +01:00
Fez Vrasta
753c523ff3 Merge pull request #330 from klightspeed/1.5-dev#fixsyntax
Fix annoying syntax highlighting issue
2015-12-12 09:51:34 +01:00
Ben Peddell
73a85935e9 Add stop and restart options to help 2015-12-12 07:11:25 +10:00
Ben Peddell
de298e8a2d Fix useconfig 2015-12-12 07:02:48 +10:00
Ben Peddell
448945ac05 Add --saveworld option to stop and restart 2015-12-12 06:40:41 +10:00
Ben Peddell
0dc4439c4c Fix annoying syntax highlighting issue 2015-12-12 06:38:44 +10:00
Fez Vrasta
dd41a24a3c Merge pull request #326 from klightspeed/1.5-dev#restarttimer
Add option to warn on shutdown and restart
2015-12-11 14:49:40 +01:00
Ben Peddell
c13afcb0d8 Add restart / shutdown warning text to config 2015-12-11 11:34:40 +10:00
Ben Peddell
45ace77565 Add the option to warn on shutdown and restart 2015-12-11 06:00:00 +10:00
Ben Peddell
6606ed3cd2 Allow all commands to take options 2015-12-11 05:41:19 +10:00
Fez Vrasta
2907c51250 Merge pull request #320 from FezVrasta/master
Pull fixes from master
2015-12-08 21:16:32 +01:00
Fez Vrasta
0977cb00be Merge pull request #319 from klightspeed/1.4#waitformodupdate
Wait for SteamCMD to download mod
2015-12-08 20:04:48 +01:00
Ben Peddell
d2e8f30e3c Wait for SteamCMD to download mod
When `workshop_download_item` is executed, the Steam API will
download not just the specified mod, but also every other
mod that has ever been installed by that SteamCMD instance.
Wait for those to download and update when downloading the mod.
2015-12-09 04:40:31 +10:00
Fez Vrasta
c0204f23bf Merge pull request #318 from klightspeed/1.4#fixrconport
Take RCONPort from GameUserSettings.ini with default
2015-12-08 19:35:32 +01:00
Ben Peddell
8aa42357c9 Take RCONPort from GameUserSettings.ini with default 2015-12-09 03:33:43 +10:00
Fez Vrasta
47e1b3e828 Merge pull request #316 from FezVrasta/master
Pull fixes from master
2015-12-07 19:10:56 +01:00
Fez Vrasta
43977a1521 Merge pull request #315 from klightspeed/1.4#fixinisupport
Fix retrieving settings from ini file
2015-12-07 18:44:42 +01:00
Ben Peddell
2d30e7bbc2 Fix retrieving settings from ini file
The `sed -n` was missed, thus causing arkmanager to be unable
to get the password or RCON port from GameUserSettings.ini

Fixes: 30aea93bd6572df640d04951617bbe477571dea7
2015-12-08 02:57:40 +10:00
Fez Vrasta
720027f574 Merge pull request #308 from klightspeed/1.4#versionoption
Add --version option
2015-12-02 14:09:41 +01:00
Fez Vrasta
c62b3b4a14 Merge pull request #309 from klightspeed/1.4#cmdstatus
Return the status from the last command run
2015-12-02 14:09:06 +01:00
Ben Peddell
349aca899b Return 1 from checkupdate when an update is required 2015-12-02 20:12:39 +10:00
Ben Peddell
d09ac2b8d7 Return the status of the last command 2015-12-02 20:12:01 +10:00
Ben Peddell
ecfb7027c5 Add --version option 2015-12-02 20:04:58 +10:00
Fez Vrasta
aefe19d482 Merge pull request #301 from klightspeed/1.4#defaultports
Add defaults for Port, QueryPort, RCONPort and serverMap
2015-11-26 11:43:31 +01:00
Ben Peddell
30aea93bd6 Add defaults for Port, QueryPort, RCONPort and serverMap 2015-11-26 16:48:29 +10:00
Fez Vrasta
577a0cc244 Merge pull request #297 from FezVrasta/master
Pull fixes from master
2015-11-23 16:04:25 +01:00
Fez Vrasta
d7fc3bb3a2 Merge pull request #296 from klightspeed/1.4#lockupdate
Prevent multiple updates from occurring concurrently
2015-11-23 15:37:23 +01:00
Ben Peddell
f859df13ac Prevent multiple updates from occurring concurrently 2015-11-24 00:09:32 +10:00
Fez Vrasta
2b71aba765 Merge pull request #281 from klightspeed/1.5-dev#downloadupdate
Add support for downloading updates before applying
2015-11-16 12:46:49 +01:00
Fez Vrasta
c6fc1d84e5 Merge pull request #287 from klightspeed/1.5-dev#updatewarnfixes1
Fix a couple of bugs in update --warn
2015-11-14 17:23:26 +01:00
Ben Peddell
0b5a6f0cba Fix a couple of bugs in update --warn
* Due to a bug in the minutes remaining check,
  the warning period was defaulting to 90 seconds,
  when it should have defaulted to 60 minutes.
* The time between 2 minutes and 90 seconds was
  60 seconds, when it should be 30 seconds
2015-11-15 00:23:32 +10:00
Fez Vrasta
ffd8f65715 Merge pull request #286 from klightspeed/1.5-dev#updateifempty2
When warning players, update now if nobody's there
2015-11-14 08:32:26 +01:00
Ben Peddell
d315512035 When warning players, update now if nobody's there 2015-11-14 02:18:13 +10:00
Fez Vrasta
0bcf20d222 Merge pull request #285 from klightspeed/1.5-dev#updateifempty
Add support for updating when nobody is connected
2015-11-13 15:24:22 +01:00
Ben Peddell
c267cdf434 Add support for updating when nobody is connected 2015-11-14 00:10:24 +10:00