.app.env.example

@@ -16,5 +16,3 @@ MAIL_FROM_NAME=me
 
 DB_PASSWORD=secret_db_password
 MYSQL_PASSWORD=secret_db_password
-
-PUSHER_APP_HOST=socketi

.docker/nginx/nginx.conf

@@ -31,12 +31,6 @@ http {
         location = /favicon.ico { access_log off; log_not_found off; }
         location = /robots.txt  { access_log off; log_not_found off; }
         error_page 404 /index.php;
-        location = /.well-known/carddav {
-            return 301 $scheme://$host/dav;
-        }
-        location = /.well-known/caldav {
-            return 301 $scheme://$host/dav;
-        }
         location ~ /\.ht {
             deny  all;
         }

.drone.yml

@@ -93,30 +93,6 @@ steps:
       when:
           event: tag
 
-    - name: deploy
-      image: php:8.1.6
-      environment:
-          SSH_KEY:
-              from_secret: deploy_private_key
-      commands:
-          - apt-get update > /dev/null
-          - apt-get install -y openssh-client
-          - mkdir $HOME/.ssh
-          - echo "UserKnownHostsFile=/dev/null" >> $HOME/.ssh/config
-          - echo "StrictHostKeyChecking=no" >> $HOME/.ssh/config
-          - echo "$SSH_KEY" > $HOME/.ssh/id_rsa
-          - chmod 600 $HOME/.ssh/id_rsa
-          - ./vendor/bin/envoy run deploy
-      when:
-          event: tag
-
-    - name: github push
-      image: alpine/git
-      commands:
-      when:
-          branch: master
-          event: push
-
     - name: composer_no_dev
       image: composer:2.2.7
       commands:
@@ -141,6 +117,93 @@ steps:
       when:
           event: tag
 
+    - name: deploy silva
+      image: drillster/drone-rsync
+      settings:
+          hosts: ['zoomyboy.de']
+          user: stammsilva
+          source: ./
+          target: ~/nami
+          exclude: ['.git']
+          key:
+              from_secret: deploy_private_key
+          script:
+              - cd ~/nami
+              - /usr/bin/php8.1 artisan migrate --force
+      when:
+          branch: master
+          event: push
+
+    - name: deploy lennep
+      image: drillster/drone-rsync
+      settings:
+          hosts: ['zoomyboy.de']
+          user: dpsg-lennep
+          source: ./
+          target: ~/nami
+          exclude: ['.git']
+          key:
+              from_secret: deploy_private_key
+          script:
+              - cd ~/nami
+              - /usr/bin/php8.1 artisan migrate --force
+      when:
+          branch: master
+          event: push
+
+    - name: deploy dpsgkoeln
+      image: drillster/drone-rsync
+      settings:
+          hosts: ['dpsg-koeln.de']
+          user: dpsg-koeln
+          source: ./
+          target: ~/adrema
+          exclude: ['.git']
+          key:
+              from_secret: deploy_private_key
+          script:
+              - cd ~/adrema
+              - /usr/bin/php8.1 artisan migrate --force
+              - sudo systemctl restart adrema-horizon
+      when:
+          branch: master
+          event: push
+
+    - name: deploy dpsgbergischland
+      image: drillster/drone-rsync
+      settings:
+          hosts: ['zoomyboy.de']
+          user: dpsgbergischland
+          source: ./
+          target: ~/adrema
+          exclude: ['.git']
+          key:
+              from_secret: deploy_private_key
+          script:
+              - cd ~/adrema
+              - /usr/bin/php8.1 artisan migrate --force
+              - sudo systemctl restart adremabl-horizon
+      when:
+          branch: master
+          event: push
+
+    - name: github push
+      image: alpine/git
+      environment:
+          SSH_KEY:
+              from_secret: github_private_key
+      commands:
+          - mkdir $HOME/.ssh
+          - git config core.sshCommand "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
+          - echo "$SSH_KEY"
+          - echo "$SSH_KEY" > $HOME/.ssh/id_rsa
+          - chmod 600 $HOME/.ssh/id_rsa
+          - git remote add gh git@github.com:zoomyboy/adrema.git
+          - git push -f gh HEAD:master
+      when:
+          branch: master
+          event: push
+
 services:
     - name: db
       image: mariadb/server:10.3

Envoy.blade.php

@@ -1,8 +0,0 @@
-@servers(['docker' => ['stammsilva@zoomyboy.de']])
-
-@task('deploy', ['on' => 'docker'])
-cd $ADREMA_PATH
-docker compose down
-docker compose pull
-docker compose up -d
-@endtask

app/Http/Middleware/TrustProxies.php

@@ -12,7 +12,7 @@ class TrustProxies extends Middleware
      *
      * @var array<int, string>|string|null
      */
-    protected $proxies = '*';
+    protected $proxies;
 
     /**
      * The headers that should be used to detect proxies.

composer.json

@@ -42,20 +42,18 @@
         "monicahq/laravel-sabre": "^1.6",
         "nunomaduro/collision": "^6.1",
         "phake/phake": "^4.2",
-        "pusher/pusher-php-server": "^7.2",
         "spatie/laravel-data": "^3.0",
         "spatie/laravel-ignition": "^1.0",
         "spatie/laravel-medialibrary": "^10.0",
         "spatie/laravel-settings": "^2.2",
         "worksome/request-factories": "^2.5",
         "zoomyboy/laravel-nami": "dev-master",
-        "zoomyboy/osm": "^1.0",
         "zoomyboy/phone": "^1.0",
-        "zoomyboy/tex": "dev-main as 1.0"
+        "zoomyboy/tex": "dev-main as 1.0",
+        "zoomyboy/osm": "^1.0"
     },
     "require-dev": {
         "fakerphp/faker": "^1.9.1",
-        "laravel/envoy": "^2.8",
         "laravel/sail": "^1.0.1",
         "mockery/mockery": "^1.4.4",
         "nunomaduro/larastan": "^2.0",

config/broadcasting.php

@@ -14,7 +14,7 @@ return [
     |
     */
 
-    'default' => env('BROADCAST_DRIVER', 'pusher'),
+    'default' => env('BROADCAST_DRIVER', 'log'),
 
     /*
     |--------------------------------------------------------------------------
@@ -30,16 +30,12 @@ return [
     'connections' => [
         'pusher' => [
             'driver' => 'pusher',
-            'key' => 'adremakey',
+            'key' => env('PUSHER_APP_KEY'),
-            'app_id' => 'adremaid',
+            'secret' => env('PUSHER_APP_SECRET'),
-            'secret' => 'adremasecret',
+            'app_id' => env('PUSHER_APP_ID'),
             'options' => [
-                'cluster' => 'adrema',
+                'cluster' => env('PUSHER_APP_CLUSTER'),
-                'encrypted' => true,
-                'host' => env('PUSHER_APP_HOST', '127.0.0.1'),
                 'useTLS' => true,
-                'port' => 6001,
-                'scheme' => 'http',
             ],
         ],
 

docker-compose.prod.yml

@@ -13,7 +13,6 @@ services:
         image: zoomyboy/adrema-app:latest
         depends_on:
             - db
-        command: /bin/entrypoint app
         env_file:
             - .app.env
         environment:
@@ -33,27 +32,7 @@ services:
         depends_on:
             - db
             - php
-        command: /bin/entrypoint horizon
+        command: /bin/horizon-entrypoint
-        env_file:
-            - .app.env
-        environment:
-            DB_HOST: db
-            DB_DATABASE: db
-            DB_USERNAME: db
-            QUEUE_CONNECTION: redis
-            XELATEX_BIN: /usr/bin/xelatex
-            PDFLATEX_BIN: /usr/bin/pdflatex
-            REDIS_HOST: redis
-        volumes:
-            - ./data/storage:/app/storage/app
-            - ./cookies:/app/packages/laravel-nami/.cookies
-
-    schedule:
-        image: zoomyboy/adrema-app:latest
-        depends_on:
-            - db
-            - php
-        command: /bin/entrypoint schedule
         env_file:
             - .app.env
         environment:

docker-compose.yml

@@ -87,15 +87,6 @@ services:
         volumes:
             - ./data/db:/var/lib/mysql
 
-    socketi:
-        image: quay.io/soketi/soketi:89604f268623cf799573178a7ba56b7491416bde-16-debian
-        ports:
-            - '6001:6001'
-        environment:
-            SOKETI_DEFAULT_APP_ID: adremaid
-            SOKETI_DEFAULT_APP_KEY: adremakey
-            SOKETI_DEFAULT_APP_SECRET: adremasecret
-
     redis:
         image: redis:alpine3.18
         container_name: redis

package-lock.json

@@ -10,14 +10,12 @@
                 "@vitejs/plugin-vue": "^4.2.3",
                 "change-case": "^4.1.2",
                 "floating-vue": "^2.0.0-beta.24",
-                "laravel-echo": "^1.15.2",
                 "laravel-vite-plugin": "^0.7.8",
                 "lodash": "^4.17.21",
                 "merge": "^2.1.1",
                 "pinia": "^2.1.4",
                 "postcss-import": "^14.1.0",
                 "prettier": "^2.8.8",
-                "pusher-js": "^8.3.0",
                 "svg-sprite": "^2.0.2",
                 "vite": "^4.3.9",
                 "vue": "^3.3.4",
@@ -2446,14 +2444,6 @@
             "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz",
             "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="
         },
-        "node_modules/laravel-echo": {
-            "version": "1.15.2",
-            "resolved": "https://registry.npmjs.org/laravel-echo/-/laravel-echo-1.15.2.tgz",
-            "integrity": "sha512-FpbYv4hnAE/ck1ow2aLlx3wBuDRMNWBcSCpFmh9EkUxxBYZoaRt8rB4pKPnfAESvcaguohEesQ1naNM81zCWPQ==",
-            "engines": {
-                "node": ">=10"
-            }
-        },
         "node_modules/laravel-vite-plugin": {
             "version": "0.7.8",
             "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-0.7.8.tgz",
@@ -3175,14 +3165,6 @@
                 "node": ">=6"
             }
         },
-        "node_modules/pusher-js": {
-            "version": "8.3.0",
-            "resolved": "https://registry.npmjs.org/pusher-js/-/pusher-js-8.3.0.tgz",
-            "integrity": "sha512-6GohP06WlVeomAQQe9qWh1IDzd3+InluWt+ZUOcecVK1SEQkg6a8uYVsvxSJm7cbccfmHhE0jDkmhKIhue8vmA==",
-            "dependencies": {
-                "tweetnacl": "^1.0.3"
-            }
-        },
         "node_modules/qs": {
             "version": "6.11.2",
             "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
@@ -3763,11 +3745,6 @@
             "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
             "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
         },
-        "node_modules/tweetnacl": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz",
-            "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw=="
-        },
         "node_modules/type-check": {
             "version": "0.4.0",
             "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -5789,11 +5766,6 @@
             "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz",
             "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="
         },
-        "laravel-echo": {
-            "version": "1.15.2",
-            "resolved": "https://registry.npmjs.org/laravel-echo/-/laravel-echo-1.15.2.tgz",
-            "integrity": "sha512-FpbYv4hnAE/ck1ow2aLlx3wBuDRMNWBcSCpFmh9EkUxxBYZoaRt8rB4pKPnfAESvcaguohEesQ1naNM81zCWPQ=="
-        },
         "laravel-vite-plugin": {
             "version": "0.7.8",
             "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-0.7.8.tgz",
@@ -6290,14 +6262,6 @@
             "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
             "dev": true
         },
-        "pusher-js": {
-            "version": "8.3.0",
-            "resolved": "https://registry.npmjs.org/pusher-js/-/pusher-js-8.3.0.tgz",
-            "integrity": "sha512-6GohP06WlVeomAQQe9qWh1IDzd3+InluWt+ZUOcecVK1SEQkg6a8uYVsvxSJm7cbccfmHhE0jDkmhKIhue8vmA==",
-            "requires": {
-                "tweetnacl": "^1.0.3"
-            }
-        },
         "qs": {
             "version": "6.11.2",
             "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
@@ -6714,11 +6678,6 @@
             "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
             "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w=="
         },
-        "tweetnacl": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz",
-            "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw=="
-        },
         "type-check": {
             "version": "0.4.0",
             "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",

package.json

@@ -26,14 +26,12 @@
         "@vitejs/plugin-vue": "^4.2.3",
         "change-case": "^4.1.2",
         "floating-vue": "^2.0.0-beta.24",
-        "laravel-echo": "^1.15.2",
         "laravel-vite-plugin": "^0.7.8",
         "lodash": "^4.17.21",
         "merge": "^2.1.1",
         "pinia": "^2.1.4",
         "postcss-import": "^14.1.0",
         "prettier": "^2.8.8",
-        "pusher-js": "^8.3.0",
         "svg-sprite": "^2.0.2",
         "vite": "^4.3.9",
         "vue": "^3.3.4",

phpunit.xml

@@ -26,7 +26,6 @@
         <server name="APP_ENV" value="testing"/>
         <server name="BCRYPT_ROUNDS" value="4"/>
         <server name="CACHE_DRIVER" value="array"/>
-        <server name="BROADCAST_DRIVER" value="log"/>
         <server name="MAIL_MAILER" value="array"/>
         <server name="QUEUE_CONNECTION" value="sync"/>
         <server name="SESSION_DRIVER" value="array"/>

resources/js/app.js

@@ -4,7 +4,6 @@ import axios from 'axios';
 import VueAxios from 'vue-axios';
 import {Plugin as FloatingVue, options as FloatingVueOptions} from './lib/floatingVue.js';
 import {createPinia, PiniaVuePlugin} from 'pinia';
-import Echo from './lib/echo.js';
 import requireModules from './lib/requireModules.js';
 
 import AppLayout from './layouts/AppLayout.vue';
@@ -22,7 +21,6 @@ const pinia = createPinia();
 var views = import.meta.glob('./views/**/*.vue');
 
 axios.interceptors.response.use(...toastInterceptor);
-window.Echo = Echo;
 
 createInertiaApp({
     title: (title) => `${title} | Adrema`,

resources/js/lib/echo.js

@@ -1,14 +0,0 @@
-import Pusher from 'pusher-js';
-import Echo from 'laravel-echo';
-
-window.Pusher = Pusher;
-export default new Echo({
-    broadcaster: 'pusher',
-    key: 'adremakey',
-    wsHost: window.location.hostname,
-    wsPort: 6001,
-    forceTLS: false,
-    disableStats: true,
-    cluster: 'adrema',
-    enabledTransports: ['ws', 'wss'],
-});