master Delete:470 execute proxy command only if instance is up

conceptsandtraining · Oct 10, 2024 · 768e5f7 · 768e5f7
1 parent c882210
commit 768e5f7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/app/src/Commands/Instances/DeleteCommand.php b/app/src/Commands/Instances/DeleteCommand.php
@@ -139,10 +139,12 @@ protected function deleteInstance(
         $this->docker->removeContainer($instance . "_" . $suffix);
 
         $this->docker->executeCommand(self::SALT_MAIN, "doil_saltmain", "salt-key", "-d", "$instance.$suffix", "-y", "-q");
-        $this->docker->executeDockerCommand(
-            "doil_proxy",
-            "rm -f /etc/nginx/conf.d/sites/$instance.conf &&  /root/generate_index_html.sh"
-        );
+        if ($this->docker->isInstanceUp($path)) {
+            $this->docker->executeDockerCommand(
+                "doil_proxy",
+                "rm -f /etc/nginx/conf.d/sites/$instance.conf &&  /root/generate_index_html.sh"
+            );
+        }
 
         if ($this->docker->hasVolume($instance)) {
             $this->docker->removeVolume($instance);

diff --git a/app/tests/Commands/Instances/DeleteCommandTest.php b/app/tests/Commands/Instances/DeleteCommandTest.php
@@ -180,6 +180,12 @@ public function test_execute() : void
                 ["/usr/local/lib/doil/server/mail/", "doil_mail", "/bin/bash", "-c", "/root/delete-postbox-configuration.sh $instance &>/dev/null"]
             )
         ;
+        $docker
+            ->expects($this->once())
+            ->method("isInstanceUp")
+            ->with("/usr/local/share/doil/instances/master")
+            ->willReturn(true)
+        ;
         $docker
             ->expects($this->once())
             ->method("executeDockerCommand")