remove pusher

cleanup .env files
change app to vito on docker-compose to make sail works
2025-07-01 14:06:15 +00:00 · 2023-09-17 18:37:59 +02:00 · 2023-09-17 18:22:17 +02:00 · 2023-09-17 18:17:27 +02:00 · 2023-09-17 18:10:57 +02:00 · 2023-09-17 11:08:47 +02:00
10 changed files with 58 additions and 228 deletions
--- a/.env.example
+++ b/.env.example
@ -2,7 +2,7 @@ APP_NAME=Vito
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
-APP_URL=http://localhost:2080
+APP_URL=http://vito.test

 LOG_CHANNEL=stack
 LOG_LEVEL=debug
@ -21,8 +21,6 @@ QUEUE_CONNECTION=sync
 SESSION_DRIVER=database
 SESSION_LIFETIME=120

-MEMCACHED_HOST=127.0.0.1
-
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
@ -36,31 +34,5 @@ MAIL_ENCRYPTION=null
 MAIL_FROM_ADDRESS=null
 MAIL_FROM_NAME="${APP_NAME}"

-AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
-AWS_DEFAULT_REGION=us-east-1
-AWS_BUCKET=
-AWS_USE_PATH_STYLE_ENDPOINT=false
-
-PUSHER_APP_ID=
-PUSHER_APP_KEY=
-PUSHER_APP_SECRET=
-PUSHER_APP_CLUSTER=mt1
-
-MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
-
-FORWARD_REDIS_PORT=2060
-FORWARD_DB_PORT=2070
-APP_PORT=2080
-HMR_PORT=2090
-
-SENTRY_LARAVEL_DSN=
-
-APP_SERVICE=vito
-
-GITHUB_CLIENT_ID=
-GITHUB_CLIENT_SECRET=
-
-ABLY_KEY=
-ABLY_PUBLIC_KEY=
+SSH_PUBLIC_KEY_NAME=ssh-public.key
+SSH_PRIVATE_KEY_NAME=ssh-private.pem
--- a/.env.prod
+++ b/.env.prod
@ -14,7 +14,7 @@ DB_DATABASE=
 DB_USERNAME=
 DB_PASSWORD=

-BROADCAST_DRIVER=pusher
+BROADCAST_DRIVER=null
 CACHE_DRIVER=file
 FILESYSTEM_DRIVER=local
 QUEUE_CONNECTION=default
@ -34,31 +34,5 @@ MAIL_ENCRYPTION=null
 MAIL_FROM_ADDRESS=null
 MAIL_FROM_NAME="${APP_NAME}"

-AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
-AWS_DEFAULT_REGION=us-east-1
-AWS_BUCKET=
-AWS_USE_PATH_STYLE_ENDPOINT=false
-
-PUSHER_APP_ID=app-id
-PUSHER_APP_KEY=app-key
-PUSHER_APP_SECRET=app-secret
-PUSHER_HOST=soketi
-PUSHER_PORT=6001
-PUSHER_SCHEME=http
-PUSHER_APP_CLUSTER=mt1
-
-VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-VITE_PUSHER_HOST="${PUSHER_HOST}"
-VITE_PUSHER_PORT="${PUSHER_PORT}"
-VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
-VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
-
 SSH_PUBLIC_KEY_NAME=ssh-public.key
 SSH_PRIVATE_KEY_NAME=ssh-private.pem
-
-GITHUB_CLIENT_ID=
-GITHUB_CLIENT_SECRET=
-
-ABLY_KEY=
-ABLY_PUBLIC_KEY=
--- a/.env.sail
+++ b/.env.sail
@ -0,0 +1,45 @@
+APP_NAME=Vito
+APP_ENV=local
+APP_KEY=
+APP_DEBUG=true
+APP_URL=http://vito.test
+
+LOG_CHANNEL=stack
+LOG_LEVEL=debug
+
+DB_CONNECTION=mysql
+DB_HOST=mysql
+DB_PORT=3306
+DB_DATABASE=vito
+DB_USERNAME=sail
+DB_PASSWORD=password
+
+BROADCAST_DRIVER=null
+CACHE_DRIVER=redis
+FILESYSTEM_DRIVER=local
+QUEUE_CONNECTION=default
+SESSION_DRIVER=database
+SESSION_LIFETIME=120
+
+REDIS_HOST=redis
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_MAILER=smtp
+MAIL_HOST=mailhog
+MAIL_PORT=1025
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS=null
+MAIL_FROM_NAME="${APP_NAME}"
+
+SSH_PUBLIC_KEY_NAME=ssh-public.key
+SSH_PRIVATE_KEY_NAME=ssh-private.pem
+
+APP_SERVICE=vito
+
+FORWARD_REDIS_PORT=2060
+FORWARD_DB_PORT=2070
+APP_PORT=2080
+HMR_PORT=2090
--- a/.env.testing
+++ b/.env.testing
@ -14,7 +14,7 @@ DB_DATABASE=vito_test
 DB_USERNAME=root
 DB_PASSWORD=

-BROADCAST_DRIVER=pusher
+BROADCAST_DRIVER=null
 CACHE_DRIVER=array
 FILESYSTEM_DRIVER=local
 QUEUE_CONNECTION=database
@ -23,19 +23,5 @@ SESSION_LIFETIME=120

 MAIL_MAILER=array

-PUSHER_APP_ID=app-id
-PUSHER_APP_KEY=app-key
-PUSHER_APP_SECRET=app-secret
-PUSHER_HOST=soketi
-PUSHER_PORT=6001
-PUSHER_SCHEME=http
-PUSHER_APP_CLUSTER=mt1
-
-VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-VITE_PUSHER_HOST="${PUSHER_HOST}"
-VITE_PUSHER_PORT="${PUSHER_PORT}"
-VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
-VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
-
 SSH_PUBLIC_KEY_NAME=ssh-public.key
 SSH_PRIVATE_KEY_NAME=ssh-private.pem
--- a/app/Listeners/BroadcastListener.php
+++ b/app/Listeners/BroadcastListener.php
@ -13,7 +13,7 @@ public function __construct()

    public function handle(Broadcast $event): void
    {
-        Cache::set('broadcast', [
+        Cache::put('broadcast', [
            'type' => $event->type,
            'data' => $event->data,
        ], now()->addMinutes(5));
--- a/app/ServerTypes/Regular.php
+++ b/app/ServerTypes/Regular.php
@ -2,6 +2,7 @@

 namespace App\ServerTypes;

+use App\Enums\ServerStatus;
 use App\Events\Broadcast;
 use App\Jobs\Installation\Initialize;
 use App\Jobs\Installation\InstallCertbot;
@ -79,7 +80,7 @@ public function install(): void

        $jobs[] = function () {
            $this->server->update([
-                'status' => 'ready',
+                'status' => ServerStatus::READY,
                'progress' => 100,
            ]);
            event(
--- a/composer.json
+++ b/composer.json
@ -15,8 +15,7 @@
        "laravel/socialite": "^5.2",
        "laravel/tinker": "^2.8",
        "livewire/livewire": "^2.12",
-        "phpseclib/phpseclib": "~3.0",
-        "pusher/pusher-php-server": "^7.2"
+        "phpseclib/phpseclib": "~3.0"
    },
    "require-dev": {
        "fakerphp/faker": "^1.9.1",
--- a/composer.lock
+++ b/composer.lock
@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "0f725da8271d545b318e319f7b616053",
+    "content-hash": "41386d67a21e3c07c635228527722815",
    "packages": [
        {
            "name": "aws/aws-crt-php",
@ -3198,92 +3198,6 @@
            },
            "time": "2020-10-15T08:29:30+00:00"
        },
-        {
-            "name": "paragonie/sodium_compat",
-            "version": "v1.19.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/paragonie/sodium_compat.git",
-                "reference": "cb15e403ecbe6a6cc515f855c310eb6b1872a933"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/cb15e403ecbe6a6cc515f855c310eb6b1872a933",
-                "reference": "cb15e403ecbe6a6cc515f855c310eb6b1872a933",
-                "shasum": ""
-            },
-            "require": {
-                "paragonie/random_compat": ">=1",
-                "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^3|^4|^5|^6|^7|^8|^9"
-            },
-            "suggest": {
-                "ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.",
-                "ext-sodium": "PHP >= 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "autoload.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "ISC"
-            ],
-            "authors": [
-                {
-                    "name": "Paragon Initiative Enterprises",
-                    "email": "security@paragonie.com"
-                },
-                {
-                    "name": "Frank Denis",
-                    "email": "jedisct1@pureftpd.org"
-                }
-            ],
-            "description": "Pure PHP implementation of libsodium; uses the PHP extension if it exists",
-            "keywords": [
-                "Authentication",
-                "BLAKE2b",
-                "ChaCha20",
-                "ChaCha20-Poly1305",
-                "Chapoly",
-                "Curve25519",
-                "Ed25519",
-                "EdDSA",
-                "Edwards-curve Digital Signature Algorithm",
-                "Elliptic Curve Diffie-Hellman",
-                "Poly1305",
-                "Pure-PHP cryptography",
-                "RFC 7748",
-                "RFC 8032",
-                "Salpoly",
-                "Salsa20",
-                "X25519",
-                "XChaCha20-Poly1305",
-                "XSalsa20-Poly1305",
-                "Xchacha20",
-                "Xsalsa20",
-                "aead",
-                "cryptography",
-                "ecdh",
-                "elliptic curve",
-                "elliptic curve cryptography",
-                "encryption",
-                "libsodium",
-                "php",
-                "public-key cryptography",
-                "secret-key cryptography",
-                "side-channel resistant"
-            ],
-            "support": {
-                "issues": "https://github.com/paragonie/sodium_compat/issues",
-                "source": "https://github.com/paragonie/sodium_compat/tree/v1.19.0"
-            },
-            "time": "2022-09-26T03:40:35+00:00"
-        },
        {
            "name": "phpoption/phpoption",
            "version": "1.9.1",
@ -3961,67 +3875,6 @@
            },
            "time": "2023-04-07T21:57:09+00:00"
        },
-        {
-            "name": "pusher/pusher-php-server",
-            "version": "7.2.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/pusher/pusher-http-php.git",
-                "reference": "4ace4873873b06c25cecb2dd6d9fdcbf2f20b640"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/pusher/pusher-http-php/zipball/4ace4873873b06c25cecb2dd6d9fdcbf2f20b640",
-                "reference": "4ace4873873b06c25cecb2dd6d9fdcbf2f20b640",
-                "shasum": ""
-            },
-            "require": {
-                "ext-curl": "*",
-                "ext-json": "*",
-                "guzzlehttp/guzzle": "^7.2",
-                "paragonie/sodium_compat": "^1.6",
-                "php": "^7.3|^8.0",
-                "psr/log": "^1.0|^2.0|^3.0"
-            },
-            "require-dev": {
-                "overtrue/phplint": "^2.3",
-                "phpunit/phpunit": "^9.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Pusher\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Library for interacting with the Pusher REST API",
-            "keywords": [
-                "events",
-                "messaging",
-                "php-pusher-server",
-                "publish",
-                "push",
-                "pusher",
-                "real time",
-                "real-time",
-                "realtime",
-                "rest",
-                "trigger"
-            ],
-            "support": {
-                "issues": "https://github.com/pusher/pusher-http-php/issues",
-                "source": "https://github.com/pusher/pusher-http-php/tree/7.2.2"
-            },
-            "time": "2022-12-20T19:52:36+00:00"
-        },
        {
            "name": "ralouphie/getallheaders",
            "version": "3.0.3",
--- a/config/core.php
+++ b/config/core.php
@ -36,8 +36,8 @@
     * SSH
     */
    'ssh_user' => env('SSH_USER', 'vito'),
-    'ssh_public_key_name' => env('SSH_PUBLIC_KEY_NAME'),
-    'ssh_private_key_name' => env('SSH_PRIVATE_KEY_NAME'),
+    'ssh_public_key_name' => env('SSH_PUBLIC_KEY_NAME', 'ssh-public.key'),
+    'ssh_private_key_name' => env('SSH_PRIVATE_KEY_NAME', 'ssh-private.pem'),
    'logs_disk' => env('SERVER_LOGS_DISK', 'server-logs-local'),
    'key_pairs_disk' => env('KEY_PAIRS_DISK', 'key-pairs-local'),

--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,6 +1,6 @@
 version: '3'
 services:
-    app:
+    vito:
        build:
            context: ./docker/8.1
            dockerfile: Dockerfile
Author	SHA1	Message	Date
Saeed Vaziry	b990f9ce32	remove pusher	2023-09-17 18:37:59 +02:00
Saeed Vaziry	a6727ff459	cleanup .env files	2023-09-17 18:22:17 +02:00
Saeed Vaziry	170535760f	change app to vito on docker-compose to make sail works	2023-09-17 18:17:27 +02:00
Saeed Vaziry	648529c3bd	add sails env	2023-09-17 18:10:57 +02:00
Saeed Vaziry	84192b7cb7	fix default key names	2023-09-17 11:08:47 +02:00