From e6e720beaecc195e61a3b37db5c4022b3daf8ff0 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sat, 12 Feb 2022 13:18:28 -0500
Subject: [PATCH] Get dev environment into working order

---
 build/panel/entrypoint |  3 +--
 docker-compose.yml     | 14 +++++++-------
 setup.sh               |  4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/build/panel/entrypoint b/build/panel/entrypoint
index dde82d3..6d174ae 100644
--- a/build/panel/entrypoint
+++ b/build/panel/entrypoint
@@ -21,8 +21,7 @@ if [ -d "/etc/certs" ]; then
 fi
 
 cd /var/www/html || exit 1
-#sudo chown -R pterodactyl:pterodactyl *
-#sudo chown -R www-data:pterodactyl storage
+sudo chown -R www-data:pterodactyl storage
 sudo chmod -R 775 storage/* bootstrap/cache
 
 if [ $# -gt 0 ]; then
diff --git a/docker-compose.yml b/docker-compose.yml
index 558dfc6..056f9a6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,11 +40,11 @@ services:
       - "traefik.http.routers.app.entrypoints=https"
       - "traefik.http.routers.app.service=app"
       - "traefik.http.services.app.loadbalancer.server.port=80"
-      - "traefik.http.routers.hmr.tls=true"
-      - "traefik.http.routers.hmr.rule=Host(`hmr.pterodactyl.test`)"
-      - "traefik.http.routers.hmr.entrypoints=https"
-      - "traefik.http.routers.hmr.service=hmr"
-      - "traefik.http.services.hmr.loadbalancer.server.port=8080"
+      - "traefik.http.routers.webpack-dev-server.tls=true"
+      - "traefik.http.routers.webpack-dev-server.rule=Host(`pterodactyl.test`) && PathPrefix(`/webpack@hmr`, `/sockjs-node`)"
+      - "traefik.http.routers.webpack-dev-server.entrypoints=https"
+      - "traefik.http.routers.webpack-dev-server.service=webpack-dev-server"
+      - "traefik.http.services.webpack-dev-server.loadbalancer.server.port=8080"
   wings:
     build:
       context: ./build/wings
@@ -54,8 +54,8 @@ services:
     stdin_open: true
     networks:
       - pterodactyl
-    ports:
-      - "2022:2022"
+#    ports:
+#      - "2022:2022"
     volumes:
       - ./code/wings:/home/root/wings
       - wings_data:/var/lib/pterodactyl
diff --git a/setup.sh b/setup.sh
index a0e93c1..260214b 100755
--- a/setup.sh
+++ b/setup.sh
@@ -13,7 +13,7 @@ do
 done
 
 mkcert -install
-mkcert pterodactyl.test hmr.pterodactyl.test minio.pterodactyl.test s3.minio.pterodactyl.test
+mkcert pterodactyl.test wings.pterodactyl.test minio.pterodactyl.test s3.minio.pterodactyl.test
 
 mv -v *pterodactyl.test*-key.pem docker/certificates/pterodactyl.test-key.pem || exit 1
 mv -v *pterodactyl.test*.pem docker/certificates/pterodactyl.test.pem || exit 1
@@ -23,7 +23,7 @@ echo ""
 if [ ! -f "/etc/hosts" ]; then
   echo "no system hosts file found, please manually configure your system"
 else
-  for DOMAIN in "pterodactyl.test" "hmr.pterodactyl.test" "minio.pterodactyl.test" "s3.minio.pterodactyl.test"
+  for DOMAIN in "pterodactyl.test" "wings.pterodactyl.test" "minio.pterodactyl.test" "s3.minio.pterodactyl.test"
   do
     ESCAPED_DOMAIN=$(echo $DOMAIN | sed "s/\./\\\./g")
     if ! grep -q -E "127\.0\.0\.1\s+$ESCAPED_DOMAIN\s*$" /etc/hosts; then