Skip to content

Commit d24bb48

Browse files
author
Florian Schaal
committed
add DROP DATABASE and DROP USER
1 parent ea1e356 commit d24bb48

File tree

2 files changed

+47
-45
lines changed

2 files changed

+47
-45
lines changed

‎install/uninstall-fedora.php‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,22 @@
4949

5050
require "/usr/local/ispconfig/server/lib/config.inc.php";
5151
require "/usr/local/ispconfig/server/lib/app.inc.php";
52+
require "/usr/local/ispconfig/server/mysql_clientdb.conf";
5253

5354
// Delete the ISPConfig database
54-
// $app->db->query("DROP DATABASE '".$conf["db_database"]."'");
55-
// $app->db->query("DELETE FROM mysql.user WHERE User = 'ispconfig'");
56-
57-
58-
exec("/etc/init.d/mysqld stop");
59-
exec("rm -rf /var/lib/mysql/".$conf["db_database"]);
60-
exec("/etc/init.d/mysqld start");
55+
//exec("/etc/init.d/mysqld stop");
56+
//exec("rm -rf /var/lib/mysql/".$conf["db_database"]);
57+
//exec("/etc/init.d/mysqld start");
58+
$link = mysql_connect($clientdb_host, $clientdb_user, $clientdb_password);
59+
if (!$link) {
60+
echo "Unable to connect to the database'.mysql_error($link)";
61+
} else {
62+
$result=mysql_query("DROP DATABASE ".$conf['db_database']."';", $link);
63+
if (!$result) echo "Unable to remove the ispconfig-database ".$conf['db_database']." ".mysql_error($link)."\n";
64+
$result=mysql_query("DROP USER '".$conf['db_user'] ."';");
65+
if (!$result) echo "Unable to remove the ispconfig-database-user ".$conf['db_user']." ".mysql_error($link)."\n";
66+
}
67+
mysql_close($link);
6168

6269
// Deleting the symlink in /var/www
6370
// Apache

‎install/uninstall.php‎

Lines changed: 33 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@
3434

3535
error_reporting(E_ALL|E_STRICT);
3636

37-
require_once "/usr/local/ispconfig/server/lib/config.inc.php";
38-
require_once "/usr/local/ispconfig/server/lib/app.inc.php";
39-
4037
//** The banner on the command line
4138
echo "\n\n".str_repeat('-', 80)."\n";
4239
echo " _____ ___________ _____ __ _ ____
@@ -50,45 +47,43 @@
5047
echo "\n".str_repeat('-', 80)."\n";
5148
echo "\n\n>> Uninstall \n\n";
5249

53-
echo "Are you sure you want to uninsatll ISPConfig? [no]";
54-
$input = fgets(STDIN);
55-
$do_uninstall = rtrim($input);
50+
require "/usr/local/ispconfig/server/lib/config.inc.php";
51+
require "/usr/local/ispconfig/server/lib/app.inc.php";
52+
require "/usr/local/ispconfig/server/mysql_clientdb.conf";
53+
54+
// Delete the ISPConfig database
55+
//exec("/etc/init.d/mysql stop");
56+
//exec("rm -rf /var/lib/mysql/".$conf["db_database"]);
57+
//exec("/etc/init.d/mysql start");
58+
$link = mysql_connect($clientdb_host, $clientdb_user, $clientdb_password);
59+
if (!$link) {
60+
echo "Unable to connect to the database'.mysql_error($link)";
61+
} else {
62+
$result=mysql_query("DROP DATABASE ".$conf['db_database']."';", $link);
63+
if (!$result) echo "Unable to remove the ispconfig-database ".$conf['db_database']." ".mysql_error($link)."\n";
64+
$result=mysql_query("DROP USER '".$conf['db_user'] ."';");
65+
if (!$result) echo "Unable to remove the ispconfig-database-user ".$conf['db_user']." ".mysql_error($link)."\n";
66+
}
67+
mysql_close($link);
5668

69+
// Deleting the symlink in /var/www
70+
// Apache
71+
@unlink("/etc/apache2/sites-enabled/000-ispconfig.vhost");
72+
@unlink("/etc/apache2/sites-available/ispconfig.vhost");
73+
@unlink("/etc/apache2/sites-enabled/000-apps.vhost");
74+
@unlink("/etc/apache2/sites-available/apps.vhost");
5775

58-
if($do_uninstall == 'yes') {
76+
// nginx
77+
@unlink("/etc/nginx/sites-enabled/000-ispconfig.vhost");
78+
@unlink("/etc/nginx/sites-available/ispconfig.vhost");
79+
@unlink("/etc/nginx/sites-enabled/000-apps.vhost");
80+
@unlink("/etc/nginx/sites-available/apps.vhost");
5981

60-
echo "\n\n>> Uninstalling ISPConfig 3... \n\n";
82+
// Delete the ispconfig files
83+
exec('rm -rf /usr/local/ispconfig');
6184

62-
// Delete the ISPConfig database
63-
// $app->db->query("DROP DATABASE '".$conf["db_database"]."'");
64-
// $app->db->query("DELETE FROM mysql.user WHERE User = 'ispconfig'");
65-
66-
67-
exec("/etc/init.d/mysql stop");
68-
exec("rm -rf /var/lib/mysql/".$conf["db_database"]);
69-
exec("/etc/init.d/mysql start");
70-
71-
// Deleting the symlink in /var/www
72-
// Apache
73-
@unlink("/etc/apache2/sites-enabled/000-ispconfig.vhost");
74-
@unlink("/etc/apache2/sites-available/ispconfig.vhost");
75-
@unlink("/etc/apache2/sites-enabled/000-apps.vhost");
76-
@unlink("/etc/apache2/sites-available/apps.vhost");
77-
78-
// nginx
79-
@unlink("/etc/nginx/sites-enabled/000-ispconfig.vhost");
80-
@unlink("/etc/nginx/sites-available/ispconfig.vhost");
81-
@unlink("/etc/nginx/sites-enabled/000-apps.vhost");
82-
@unlink("/etc/nginx/sites-available/apps.vhost");
83-
84-
// Delete the ispconfig files
85-
exec('rm -rf /usr/local/ispconfig');
86-
87-
echo "Please do not forget to delete the ispconfig user in the mysql.user table.\n\n";
88-
echo "Finished uninstalling.\n";
85+
//echo "Please do not forget to delete the ispconfig user in the mysql.user table.\n\n";
8986

90-
} else {
91-
echo "\n\n>> Canceled uninstall. \n\n";
92-
}
87+
echo "Finished.\n";
9388

9489
?>

0 commit comments

Comments
 (0)