Просмотр исходного кода

move userdel to the end of the actions

andre 8 месяцев назад
Родитель
Сommit
75f39989e0
1 измененных файлов с 9 добавлено и 9 удалено
  1. 9 9
      controllers/DeployDevController.php

+ 9 - 9
controllers/DeployDevController.php

@@ -331,15 +331,6 @@ class DeployDevController {
             echo json_encode(['error' => 'Unknown user']);
             echo json_encode(['error' => 'Unknown user']);
             return;
             return;
         }
         }
-        // Remove user and files
-        if ($GLOBALS['debug'] == true) {error_log("Remove User: " . $username); }
-        exec("sudo /usr/sbin/userdel -r -f $username  2>&1", $userOutput, $userReturnCode);
-        if ($userReturnCode !== 0) {
-            error_log("deploy: ERROR: Userdel for  $username failed, details => " . implode("\n", $userOutput));
-            http_response_code(500);
-            echo json_encode(['error' => 'Failed to remove user', 'details' => implode("\n", $userOutput)]);
-            return;
-        }
         // remove PHP-FPM User
         // remove PHP-FPM User
         if ($GLOBALS['debug'] == true) {error_log("Removing PHP-FPM Config for : " . $username); }
         if ($GLOBALS['debug'] == true) {error_log("Removing PHP-FPM Config for : " . $username); }
         $configName = "/etc/php/8.2/fpm/pool.d/" . $username . ".conf";
         $configName = "/etc/php/8.2/fpm/pool.d/" . $username . ".conf";
@@ -372,6 +363,15 @@ class DeployDevController {
                 return;
                 return;
             }   
             }   
         }
         }
+        // Remove user and files
+        if ($GLOBALS['debug'] == true) {error_log("Remove User: " . $username); }
+        exec("sudo /usr/sbin/userdel -r -f $username  2>&1", $userOutput, $userReturnCode);
+        if ($userReturnCode !== 0) {
+            error_log("deploy: ERROR: Userdel for  $username failed, details => " . implode("\n", $userOutput));
+            http_response_code(500);
+            echo json_encode(['error' => 'Failed to remove user', 'details' => implode("\n", $userOutput)]);
+            return;
+        }
         echo json_encode(['success' => 'Removing user ' . $username . ' successfully']);
         echo json_encode(['success' => 'Removing user ' . $username . ' successfully']);
     }
     }