From 74bf4c10fa39ac059b2a7bf971077f752d36fb36 Mon Sep 17 00:00:00 2001
From: soneill <sam@adcurve.com>
Date: Fri, 2 Oct 2020 10:41:49 +1300
Subject: [PATCH 1/4] updates pathfinder.ini for connection counting

---
 config/pathfinder/pathfinder.ini | 12 ++++++++++++
 docker-compose.yml               | 15 ++++++---------
 pathfinder                       |  2 +-
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/config/pathfinder/pathfinder.ini b/config/pathfinder/pathfinder.ini
index 0500cf5..af81077 100644
--- a/config/pathfinder/pathfinder.ini
+++ b/config/pathfinder/pathfinder.ini
@@ -395,3 +395,15 @@ GIT_HUB                     =   https://api.github.com
 ; Syntax:   0 | 1
 ; Default:  0
 PERSISTENT_DB_CONNECTIONS   =   1
+
+[PATHFINDER.SYSTEMTAG]
+; Systemtag status
+;           If enabled new systems will be tagged using the defined style
+; Syntax:   0 | 1
+; Default:  0
+STATUS                      =   1
+
+; Naming scheme to use
+; Syntax:   String
+; Default:  countConnections
+STYLE                       =   countConnections
diff --git a/docker-compose.yml b/docker-compose.yml
index 25d4a9c..9a89797 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -46,15 +46,11 @@ services:
     build: '.'
     env_file:
     - .env
-    labels:
-      caddy: map.goryn.wtf
-      caddy.reverse_proxy: "{{upstreams 80}}"
     networks:
       - pf
-      - caddy
-#    ports:
-#      - 80:80
-#      - 8030:8030
+      - web
+    ports:
+      - 80:80
     healthcheck:
       disable: true
     volumes:
@@ -68,9 +64,10 @@ services:
     restart: always
 
 volumes:
+     data:
      db_data:
      redis_data:
 networks:
     pf:
-    caddy:
-
+    web:
+       external: true
diff --git a/pathfinder b/pathfinder
index 450fc64..5aa8cfe 160000
--- a/pathfinder
+++ b/pathfinder
@@ -1 +1 @@
-Subproject commit 450fc640f05e8d30e585519b65bc6f4a0eeef4dc
+Subproject commit 5aa8cfed3273676c956615873d914c1e888546c3

From 842ef0afe90d72be6a3cac78ff373de8e3b06bc7 Mon Sep 17 00:00:00 2001
From: soneill <sam@adcurve.com>
Date: Fri, 20 Nov 2020 21:23:58 +1300
Subject: [PATCH 2/4] adds tags plugin to ini

---
 config/pathfinder/plugin.ini | 7 +++++++
 docker-compose.yml           | 2 +-
 pathfinder                   | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 config/pathfinder/plugin.ini

diff --git a/config/pathfinder/plugin.ini b/config/pathfinder/plugin.ini
new file mode 100644
index 0000000..ef86bc0
--- /dev/null
+++ b/config/pathfinder/plugin.ini
@@ -0,0 +1,7 @@
+[PLUGIN]
+MODULES_ENABLED             =   1
+
+[PLUGIN.MODULES]
+DOTLAN                      =   ./app/ui/module/dotlan
+TAGS                        =   ./app/ui/module/tags
+
diff --git a/docker-compose.yml b/docker-compose.yml
index 9a89797..cfabb52 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -56,7 +56,7 @@ services:
     volumes:
       - ${path}/config/pathfinder/config.ini:/var/www/html/pathfinder/app/templateConfig.ini
       - ${path}/config/pathfinder/pathfinder.ini:/var/www/html/pathfinder/app/pathfinder.ini
-      - ${path}/config/pathfinder/plugins.ini:/var/www/html/pathfinder/app/plugins.ini
+      - ${path}/config/pathfinder/plugin.ini:/var/www/html/pathfinder/app/plugin.ini
     depends_on:
       - pfdb   
       - pf-redis
diff --git a/pathfinder b/pathfinder
index 5aa8cfe..c2003b5 160000
--- a/pathfinder
+++ b/pathfinder
@@ -1 +1 @@
-Subproject commit 5aa8cfed3273676c956615873d914c1e888546c3
+Subproject commit c2003b5fbcc80eee55b308a11862119760feba55

From f12e86c088a43c91da7c4229ac0b52e12c93c973 Mon Sep 17 00:00:00 2001
From: soneill <sam@adcurve.com>
Date: Tue, 8 Dec 2020 23:59:58 +1300
Subject: [PATCH 3/4] updates gitignore

---
 .gitignore | 3 ++-
 pathfinder | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2eea525..4264f2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-.env
\ No newline at end of file
+.env
+*.sql
\ No newline at end of file
diff --git a/pathfinder b/pathfinder
index c2003b5..7c53f0b 160000
--- a/pathfinder
+++ b/pathfinder
@@ -1 +1 @@
-Subproject commit c2003b5fbcc80eee55b308a11862119760feba55
+Subproject commit 7c53f0b2a0853989d2163a41383bc6887717e5f6

From 57a1a347483095a7995d15762211338be3cbfa3c Mon Sep 17 00:00:00 2001
From: soneill <sam@adcurve.com>
Date: Wed, 9 Dec 2020 00:15:58 +1300
Subject: [PATCH 4/4] restores docker-compose.yml

---
 docker-compose.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index cfabb52..2a2c8c9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -46,17 +46,21 @@ services:
     build: '.'
     env_file:
     - .env
+    labels:
+      caddy: map.goryn.wtf
+      caddy.reverse_proxy: "{{upstreams 80}}"
     networks:
       - pf
-      - web
-    ports:
-      - 80:80
+      - caddy
+#    ports:
+#      - 80:80
+#      - 8030:8030
     healthcheck:
       disable: true
     volumes:
       - ${path}/config/pathfinder/config.ini:/var/www/html/pathfinder/app/templateConfig.ini
       - ${path}/config/pathfinder/pathfinder.ini:/var/www/html/pathfinder/app/pathfinder.ini
-      - ${path}/config/pathfinder/plugin.ini:/var/www/html/pathfinder/app/plugin.ini
+      - ${path}/config/pathfinder/plugins.ini:/var/www/html/pathfinder/app/plugins.ini
     depends_on:
       - pfdb   
       - pf-redis
@@ -64,10 +68,8 @@ services:
     restart: always
 
 volumes:
-     data:
      db_data:
      redis_data:
 networks:
     pf:
-    web:
-       external: true
+    caddy: