update

Author: peter-mw

web/Modules/Caddy/App/Jobs/CaddyBuild.php

@@ -4,11 +4,13 @@
 
 use App\MasterDomain;
 use App\Models\Domain;
+use App\Models\HostingSubscription;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Modules\Microweber\App\Models\MicroweberInstallation;
 
 class CaddyBuild implements ShouldQueue
 {
@@ -197,7 +199,26 @@ protected function generateCaddyfile(): void
             shell_exec("sudo setfacl -R -m u:caddy:rx " . $domain->document_root);
             shell_exec("sudo setfacl -R -m u:caddy:rx " . $domain->domain_public);
             shell_exec("sudo setfacl -R -m u:caddy:rx " . $domain->home_root);
-//
+
+
+            /*       //fix permissions
+            shell_exec('chown -R ' . $chown_user . ':' . $chown_user . ' ' . $chown_path);
+
+            // chmod
+            shell_exec('chmod -R 755 ' . $chown_path);*/
+
+            $findHostingSubscription = HostingSubscription::where('id', $domain->id)->first();
+
+            $chown_user = $findHostingSubscription->system_username;
+
+            $chown_path = $domain->home_root;
+            //fix permissions
+           // shell_exec('chown -R ' . $chown_user . ':' . $chown_user . ' ' . $chown_path);
+
+            // chmod
+          //  shell_exec('chmod -R 755 ' . $chown_path);
+
+
 
             // Check current permissions using getfacl
 //            $homeRootPerms = shell_exec("getfacl " . escapeshellarg($domain->home_root));
@@ -218,6 +239,9 @@ protected function generateCaddyfile(): void
             shell_exec("chmod o+x {$domain->home_root}");
             shell_exec("chmod -R o+rX {$domain->document_root}");
 
+
+
+
             if (!file_exists($domainLog)) {
                 // Create log file for the domain if it doesn't exist
                 touch($domainLog);

web/Modules/Microweber/Listeners/DomainIsChangedListener.php

@@ -3,6 +3,7 @@
 namespace Modules\Microweber\Listeners;
 
 use App\Events\DomainIsChanged;
+use App\Models\HostingSubscription;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Queue\InteractsWithQueue;
 use Modules\Microweber\App\Models\MicroweberInstallation;
@@ -31,8 +32,27 @@ public function handle(DomainIsChanged $event): void
         if (!$findMicroweberInstallation) {
             return;
         }
+        $findHostingSubscription = HostingSubscription::where('id', $event->domain->id)->first();
+        if (!$findHostingSubscription) {
+            $this->info('Hosting subscription not found: ' . $event->domain->id);
+            return;
+        }
+        $findInstallation = MicroweberInstallation::where('domain_id', $event->domain->id)
+            ->first();
+        $chown_user = $findHostingSubscription->system_username;
+
+        $chown_path = $findMicroweberInstallation->installation_path;
+
+        shell_exec('php ' . $findMicroweberInstallation->installation_path . '/artisan cache:clear');
+
+        //fix permissions
+        shell_exec('chown -R ' . $chown_user . ':' . $chown_user . ' ' . $chown_path);
+
+        // chmod
+        shell_exec('chmod -R 755 ' . $chown_path);
+
+
 
-        shell_exec('php '. $findMicroweberInstallation->installation_path . '/artisan cache:clear');
 
     }
 }