From 66587d864a86dad9ec674398216171e3c87db571 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 5 Dec 2023 14:52:19 +0100
Subject: [PATCH] wip

---
 .env.production           |  4 ++++
 docker-compose.custom.yml |  8 ++++++++
 docker-compose.dev.yml    | 19 ++++++++++---------
 scripts/install.sh        |  6 +++---
 4 files changed, 25 insertions(+), 12 deletions(-)
 create mode 100644 docker-compose.custom.yml

diff --git a/.env.production b/.env.production
index f15a8b0e9..cffc760a0 100644
--- a/.env.production
+++ b/.env.production
@@ -8,3 +8,7 @@ REDIS_PASSWORD=
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
+
+PUSHER_HOST=
+PUSHER_PORT=
+PUSHER_SCHEME=
diff --git a/docker-compose.custom.yml b/docker-compose.custom.yml
new file mode 100644
index 000000000..5fb299b2a
--- /dev/null
+++ b/docker-compose.custom.yml
@@ -0,0 +1,8 @@
+# This is for running Coolfiy behind Cloudflare Tunnel
+# You need to expose the soketi port to the host and map it to a hostname
+# For more details go to https://coolify.io/docs/cloudflare-tunnel
+version: '3.8'
+services:
+  soketi:
+    ports:
+      - 6001:6001
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 9fe2c5b31..4c5e98d55 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -23,6 +23,7 @@ services:
       AUTORUN_LARAVEL_MIGRATION: "false"
       PUSHER_HOST: "${PUSHER_HOST}"
       PUSHER_PORT: "${PUSHER_PORT:-6001}"
+      PUSHER_SCHEME: "${PUSHER_SCHEME:-http}"
       PUSHER_APP_ID: "${PUSHER_APP_ID:-coolify}"
       PUSHER_APP_KEY: "${PUSHER_APP_KEY:-coolify}"
       PUSHER_APP_SECRET: "${PUSHER_APP_SECRET:-coolify}"
@@ -63,7 +64,7 @@ services:
     image: node:20
     working_dir: /var/www/html
     # environment:
-      # VITE_PUSHER_APP_KEY: "${PUSHER_APP_KEY:-coolify}"
+    # VITE_PUSHER_APP_KEY: "${PUSHER_APP_KEY:-coolify}"
     ports:
       - "${VITE_PORT:-5173}:${VITE_PORT:-5173}"
     volumes:
@@ -77,14 +78,14 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
       - /data/coolify/:/data/coolify
       # - coolify-data-dev:/data/coolify
-  # remote-host:
-  #   <<: *testing-host-base
-  #   container_name: coolify-remote-host
-  #   volumes:
-  #     - /:/host
-  #     - /var/run/docker.sock:/var/run/docker.sock
-  #     - /data/coolify/:/data/coolify
-  #     # - coolify-data-dev:/data/coolify
+      # remote-host:
+      #   <<: *testing-host-base
+      #   container_name: coolify-remote-host
+      #   volumes:
+      #     - /:/host
+      #     - /var/run/docker.sock:/var/run/docker.sock
+      #     - /data/coolify/:/data/coolify
+      #     # - coolify-data-dev:/data/coolify
   mailpit:
     image: "axllent/mailpit:latest"
     container_name: coolify-mail
diff --git a/scripts/install.sh b/scripts/install.sh
index bfbc65cf1..b7afeaefb 100644
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -137,9 +137,9 @@ if [ ! -f /data/coolify/source/.env ]; then
     sed -i "s|APP_KEY=.*|APP_KEY=base64:$(openssl rand -base64 32)|g" /data/coolify/source/.env
     sed -i "s|DB_PASSWORD=.*|DB_PASSWORD=$(openssl rand -base64 32)|g" /data/coolify/source/.env
     sed -i "s|REDIS_PASSWORD=.*|REDIS_PASSWORD=$(openssl rand -base64 32)|g" /data/coolify/source/.env
-    # sed -i "s|PUSHER_APP_ID=.*|PUSHER_APP_ID=$(openssl rand -hex 32)|g" /data/coolify/source/.env
-    # sed -i "s|PUSHER_APP_KEY=.*|PUSHER_APP_KEY=$(openssl rand -hex 32)|g" /data/coolify/source/.env
-    # sed -i "s|PUSHER_APP_SECRET=.*|PUSHER_APP_SECRET=$(openssl rand -hex 32)|g" /data/coolify/source/.env
+    sed -i "s|PUSHER_APP_ID=.*|PUSHER_APP_ID=$(openssl rand -hex 32)|g" /data/coolify/source/.env
+    sed -i "s|PUSHER_APP_KEY=.*|PUSHER_APP_KEY=$(openssl rand -hex 32)|g" /data/coolify/source/.env
+    sed -i "s|PUSHER_APP_SECRET=.*|PUSHER_APP_SECRET=$(openssl rand -hex 32)|g" /data/coolify/source/.env
 fi
 
 # Merge .env and .env.production. New values will be added to .env