From 790407f5522c95706d49fa6e464c17de8d18ef1f Mon Sep 17 00:00:00 2001 From: soneill Date: Sat, 31 Jul 2021 17:39:14 +1200 Subject: [PATCH] Updates websocket submodule and container --- .gitmodules | 4 ++-- config/pathfinder/pathfinder.ini | 11 +++++++++-- docker-compose.yml | 2 +- pathfinder | 2 +- websocket | 2 +- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index d1f2605..11263f1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "pathfinder"] path = pathfinder - url = https://github.com/samoneilll/pathfinder + url = https://github.com/goryn-clade/pathfinder [submodule "websocket"] path = websocket - url = https://github.com/exodus4d/pathfinder_websocket + url = https://github.com/goryn-clade/pathfinder_websocket diff --git a/config/pathfinder/pathfinder.ini b/config/pathfinder/pathfinder.ini index 282f1ac..0b5ebd9 100644 --- a/config/pathfinder/pathfinder.ini +++ b/config/pathfinder/pathfinder.ini @@ -70,14 +70,21 @@ COOKIE_EXPIRE = 30 ; Default: 0 MODE_MAINTENANCE = 0 +; Share maps between logged in characters in the same session +; If enabled this will grant the active character access to any maps +; that other characters from the "switch character" menu have access to +; Syntax 0 | 1 +; Default 0 +SESSION_SHARING = 1 + ; Login restrictions (white lists) ; Login/registration can be restricted to specific groups. ; Use comma separated strings for CCP Ids (e.g. 1000166,1000080). ; If no groups are specified, all characters are allowed. ; Syntax: String (comma separated) ; Default: -CHARACTER = 95277885,2112390934,1602326087,899403619,888617837 -CORPORATION = 98567606,98581604,98374903,98666711,98655726,98464278,98660608,98675758 +CHARACTER = +CORPORATION = ALLIANCE = [PATHFINDER.CHARACTER] diff --git a/docker-compose.yml b/docker-compose.yml index 0dce796..b1c6781 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ services: driver: none restart: always pf-socket: - image: composer:latest + image: composer:composer@sha256:d374b2e1f715621e9d9929575d6b35b11cf4a6dc237d4a08f2e6d1611f534675 container_name: "$CONTAINER_NAME-socket" command: ["sh","-c","composer install && php cmd.php --tcpHost 0.0.0.0"] hostname: socket diff --git a/pathfinder b/pathfinder index ccdb9b7..c3afe9c 160000 --- a/pathfinder +++ b/pathfinder @@ -1 +1 @@ -Subproject commit ccdb9b7f6c6b33fe95939a1bd79a3e89d2e5338f +Subproject commit c3afe9ce73bf4bfb484ed5ae02eb29b5a8427f5b diff --git a/websocket b/websocket index 505d3d1..f6b4f5a 160000 --- a/websocket +++ b/websocket @@ -1 +1 @@ -Subproject commit 505d3d163e9801835aeb508971a9b50278f0404b +Subproject commit f6b4f5ae309e21ad793197a77b5d095a33cfc9f1