From 46f5e1efa082d3d4a128f1af08d8cf952daff640 Mon Sep 17 00:00:00 2001
From: Stephan Reugels <s.reugels@netmountains.de>
Date: Tue, 30 Apr 2024 09:45:33 +0200
Subject: [PATCH 1/5] Added ability for mail to ticket import

---
 whmcs/compose/docker-compose.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/whmcs/compose/docker-compose.yml b/whmcs/compose/docker-compose.yml
index eafa89e..d7c5121 100644
--- a/whmcs/compose/docker-compose.yml
+++ b/whmcs/compose/docker-compose.yml
@@ -65,6 +65,9 @@ services:
       - "ofelia.enabled=true"
       - "ofelia.job-exec.whmcs.schedule=@every 5m"
       - "ofelia.job-exec.whmcs.command=php -q /var/www/whmcs_storage/crons/cron.php"
+     # Cronjobs for mail-to-ticket import. Uncomment to fetch new emails every minute.
+     # - "ofelia.job-exec.whmcs-mail-import.schedule=@every 1m"
+     # - "ofelia.job-exec.whmcs-mail-import.command=php -q /var/www/whmcs_storage/crons/pop.php"
 
   mysql:
     image: mysql:8

From bc9440ec7c0dfdc899fda89efe70331240c23bf3 Mon Sep 17 00:00:00 2001
From: Stephan Reugels <s.reugels@netmountains.de>
Date: Tue, 30 Apr 2024 10:44:56 +0200
Subject: [PATCH 2/5] Update Docs

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 5662d97..bfb56f0 100644
--- a/README.md
+++ b/README.md
@@ -103,6 +103,11 @@ Navigate to `whmcs/data/whmcs` and move `crons` directory to `whmcs/data/whmcs_s
 Navigate to `crons` and edit `config.php.new`, inside the config uncomment the `whmcspath` option and set the new path to `/var/www/html/`. <br />
 Rename the `config.php.new` to `config.php`. Navigate to `whmcs/data/whmcs/configuration.php` and add this line at the bottom of the configuration `$crons_dir = '/var/www/whmcs_storage/crons/';`
 
+### eMail Import Cron (optional)
+Official source: [docs.whmcs.com](https://docs.whmcs.com/Email_Importing) <br />
+Navigate to `whmcs/compose` and edit `docker-compose.yml`, inside the file uncomment the two commands under the ofelia-labels.<br />
+Rebuild stack with `docker-compose down && docker-compose up -d`.
+
 ## Setting update folder
 Official source: [help.whmcs.com](https://help.whmcs.com/m/updating/l/678178-configuring-the-temporary-path) <br />
 Setting update folder will allow you to automatically update WHMCS in the future. Similar to file storage the update folder will be located above the web root inside `whmcs_storage` directory.

From 8e3617a008d65e2cae2677e3acf78d3259776c56 Mon Sep 17 00:00:00 2001
From: Stephan Reugels <s.reugels@netmountains.de>
Date: Tue, 30 Apr 2024 10:53:13 +0200
Subject: [PATCH 3/5] Update docs

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index bfb56f0..9bbc793 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,11 @@ Navigate to `_base/data/traefik/` and run
 sudo chmod 600 acme.json
 ```
 
+<b>Create docker network</b><br />
+```
+docker network create docker-whmcs-network
+```
+
 <b>Generate .htpasswd user and pass</b><br />
 Navigate to `_base/data/traefik/.htpasswd` and place your generated user/pass in there
 

From 5a40f687386dbcf8aed583bccf7188507519f08c Mon Sep 17 00:00:00 2001
From: Stephan Reugels <s.reugels@netmountains.de>
Date: Tue, 30 Apr 2024 10:53:58 +0200
Subject: [PATCH 4/5] Changed network name

---
 _base/compose/docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/_base/compose/docker-compose.yml b/_base/compose/docker-compose.yml
index 4a69285..9d3ea92 100644
--- a/_base/compose/docker-compose.yml
+++ b/_base/compose/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.7'
 
 networks:
-  global:
+  docker-whmcs-network:
     external: true
 
 services:
@@ -11,7 +11,7 @@ services:
     env_file:
       - .env
     networks:
-      - global
+      - docker-whmcs-network
     restart: always
     ports:
       - "80:80"

From aa21e024c3c170dfc052875a1cc68d6e3ce05b80 Mon Sep 17 00:00:00 2001
From: Stephan Reugels <s.reugels@netmountains.de>
Date: Tue, 30 Apr 2024 10:55:12 +0200
Subject: [PATCH 5/5] Updated network namings

---
 whmcs/compose/docker-compose.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/whmcs/compose/docker-compose.yml b/whmcs/compose/docker-compose.yml
index d7c5121..5e0843c 100644
--- a/whmcs/compose/docker-compose.yml
+++ b/whmcs/compose/docker-compose.yml
@@ -1,9 +1,9 @@
 version: '3.5'
 
 networks:
-  local:
+  docker-whmcs-network-internal:
     external: false
-  global:
+  docker-whmcs-network:
     external: true 
 
 services:
@@ -28,10 +28,10 @@ services:
     depends_on:
       - php-fpm
     networks:
-      - local
-      - global
+      - docker-whmcs-network-internal
+      - docker-whmcs-network
     labels:
-      - "traefik.docker.network=global"
+      - "traefik.docker.network=docker-whmcs-network"
       # HTTP
       - "traefik.http.routers.whmcs.entrypoints=web"
       - "traefik.http.routers.whmcs.rule=Host(`${DOMAIN}`)"
@@ -60,7 +60,7 @@ services:
     environment:
       - PHP_IDE_CONFIG=xwhmcs
     networks:
-      - local
+      - docker-whmcs-network-internal
     labels:
       - "ofelia.enabled=true"
       - "ofelia.job-exec.whmcs.schedule=@every 5m"
@@ -79,5 +79,5 @@ services:
     volumes:
       - ${DATA_DIR}/mysql:/var/lib/mysql
     networks:
-      - local
+      - docker-whmcs-network-internal