From 28308e955ac3cbe534849f0c7bb8126a59a18eb5 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Tue, 27 Sep 2011 15:09:42 +0000
Subject: [PATCH] - Changed uninstall scripts - included nginx.
---
install/uninstall-fedora.php | 13 +++++++++++--
install/uninstall.php | 13 +++++++++++--
2 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/install/uninstall-fedora.php b/install/uninstall-fedora.php
index d8efc4fc78..4da434787a 100644
--- a/install/uninstall-fedora.php
+++ b/install/uninstall-fedora.php
@@ -60,8 +60,17 @@ exec("rm -rf /var/lib/mysql/".$conf["db_database"]);
exec("/etc/init.d/mysqld start");
// Deleting the symlink in /var/www
-unlink("/etc/httpd/conf/sites-enabled/000-ispconfig.vhost");
-unlink("/etc/httpd/conf/sites-available/ispconfig.vhost");
+// Apache
+@unlink("/etc/httpd/conf/sites-enabled/000-ispconfig.vhost");
+@unlink("/etc/httpd/conf/sites-available/ispconfig.vhost");
+@unlink("/etc/httpd/conf/sites-enabled/000-apps.vhost");
+@unlink("/etc/httpd/conf/sites-available/apps.vhost");
+
+// nginx
+@unlink("/etc/nginx/sites-enabled/000-ispconfig.vhost");
+@unlink("/etc/nginx/sites-available/ispconfig.vhost");
+@unlink("/etc/nginx/sites-enabled/000-apps.vhost");
+@unlink("/etc/nginx/sites-available/apps.vhost");
// Delete the ispconfig files
exec('rm -rf /usr/local/ispconfig');
diff --git a/install/uninstall.php b/install/uninstall.php
index 467772ae2c..415ecf4f0f 100644
--- a/install/uninstall.php
+++ b/install/uninstall.php
@@ -60,8 +60,17 @@ exec("rm -rf /var/lib/mysql/".$conf["db_database"]);
exec("/etc/init.d/mysql start");
// Deleting the symlink in /var/www
-unlink("/etc/apache2/sites-enabled/000-ispconfig.vhost");
-unlink("/etc/apache2/sites-available/ispconfig.vhost");
+// Apache
+@unlink("/etc/apache2/sites-enabled/000-ispconfig.vhost");
+@unlink("/etc/apache2/sites-available/ispconfig.vhost");
+@unlink("/etc/apache2/sites-enabled/000-apps.vhost");
+@unlink("/etc/apache2/sites-available/apps.vhost");
+
+// nginx
+@unlink("/etc/nginx/sites-enabled/000-ispconfig.vhost");
+@unlink("/etc/nginx/sites-available/ispconfig.vhost");
+@unlink("/etc/nginx/sites-enabled/000-apps.vhost");
+@unlink("/etc/nginx/sites-available/apps.vhost");
// Delete the ispconfig files
exec('rm -rf /usr/local/ispconfig');
--
GitLab