- drop mongodb code

Marius Burkard · Marius Burkard · commit ad5661d87239 · 2018-11-12T22:09:50.000+01:00
diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
@@ -104,3 +104,8 @@ ALTER TABLE `client`
 ALTER TABLE `xmpp_domain`
   ADD COLUMN `use_webpresence` enum('n','y') NOT NULL DEFAULT 'y',
   ADD COLUMN `use_http_upload` enum('n','y') NOT NULL DEFAULT 'n';
+
+
+-- STRIPDOWN!
+ALTER TABLE `web_backup` CHANGE `backup_type` `backup_type` enum('web','mysql') NOT NULL DEFAULT 'web';
+ALTER TABLE `web_database_user` DROP COLUMN `database_password_mongo`;
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
@@ -1927,7 +1927,7 @@ CREATE TABLE `web_backup` (
   `backup_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `server_id` int(10) unsigned NOT NULL DEFAULT '0',
   `parent_domain_id` int(10) unsigned NOT NULL DEFAULT '0',
-  `backup_type` enum('web','mysql','mongodb') NOT NULL DEFAULT 'web',
+  `backup_type` enum('web','mysql') NOT NULL DEFAULT 'web',
   `backup_mode` varchar(64) NOT NULL DEFAULT  '',
   `tstamp` int(10) unsigned NOT NULL DEFAULT '0',
   `filename` varchar(255) NOT NULL DEFAULT '',
@@ -1986,7 +1986,6 @@ CREATE TABLE IF NOT EXISTS `web_database_user` (
   `database_user` varchar(64) DEFAULT NULL,
   `database_user_prefix` varchar(50) NOT NULL default '',
   `database_password` varchar(64) DEFAULT NULL,
-  `database_password_mongo` varchar(32) DEFAULT NULL,
   PRIMARY KEY (`database_user_id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
diff --git a/interface/lib/classes/tools_monitor.inc.php b/interface/lib/classes/tools_monitor.inc.php
@@ -504,39 +504,6 @@ function showFail2ban() {
 		return $html;
 	}
 
-	function showMongoDB() {
-		global $app;
-
-		/* fetch the Data from the DB */
-		$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'log_mongodb' and server_id = ? ORDER BY created DESC", $_SESSION['monitor']['server_id']);
-
-		if(isset($record['data'])) {
-			$html =
-				'<div class="systemmonitor-state state-'.$record['state'].'">
-                <div class="systemmonitor-content icons32 ico-'.$record['state'].'">';
-
-			/*
-             * First, we have to detect, if there is any monitoring-data.
-             * If not (because mongodb is not installed) show this.
-            */
-			$data = unserialize($record['data']);
-			if ($data == '') {
-				$html .= '<p>'.
-					'MongoDB is not installed on this server.<br />' .
-					'</p>';
-			}
-			else {
-				$html .= nl2br($data);
-			}
-			$html .= '</div></div>';
-
-		} else {
-			$html = '<p>There is no data available at the moment.</p>';
-		}
-
-		return $html;
-	}
-
 	function showIPTables() {
 		global $app;
 		$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'iptables_rules' and server_id = ? ORDER BY created DESC", $_SESSION['monitor']['server_id']);
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
@@ -1858,12 +1858,6 @@
 			'default' => 'n',
 			'value' => array(0 => 'n', 1 => 'y')
 		),
-		'do_not_try_rescue_mongodb' => array(
-			'datatype' => 'VARCHAR',
-			'formtype' => 'CHECKBOX',
-			'default' => 'n',
-			'value' => array(0 => 'n', 1 => 'y')
-		),
 		'do_not_try_rescue_mysql' => array(
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',
diff --git a/interface/web/admin/templates/server_config_rescue_edit.htm b/interface/web/admin/templates/server_config_rescue_edit.htm
@@ -17,14 +17,6 @@ <h1><tmpl_var name="list_head_txt"> {tmpl_var name='server_name'}</h1>
                     {tmpl_var name='do_not_try_rescue_httpd'}
                 </div>
             </div>
-<!--
-            <div class="form-group">
-                <label class="col-sm-3 control-label">{tmpl_var name='do_not_try_rescue_mongodb_txt'}</label>
-                <div class="col-sm-9">
-                    {tmpl_var name='do_not_try_rescue_mongodb'}
-                </div>
-            </div>
--->
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='do_not_try_rescue_mysql_txt'}</label>
                 <div class="col-sm-9">
diff --git a/interface/web/monitor/lib/module.conf.php b/interface/web/monitor/lib/module.conf.php
@@ -201,12 +201,6 @@
 	'link' => 'monitor/show_data.php?type=fail2ban',
 	'html_id' => 'fai2ban');
 
-/*
-$items[] = array( 'title'  => "Show MongoDB-Log",
-	'target'  => 'content',
-	'link' => 'monitor/show_data.php?type=mongodb',
-	'html_id' => 'mongodb');
-*/
 $items[] = array( 'title'  => "Show IPTables",
 	'target'  => 'content',
 	'link' => 'monitor/show_data.php?type=iptables',
diff --git a/interface/web/monitor/show_data.php b/interface/web/monitor/show_data.php
@@ -138,15 +138,6 @@
 	$description = '';
 	$add_padding = true;
 	break;
-/*
-case 'mongodb':
-	$template = 'templates/show_data.htm';
-	$output .= $app->tools_monitor->showMongoDB();
-	$time = $app->tools_monitor->getDataTime('log_mongodb');
-	$title = $app->lng("monitor_title_mongodb_txt") . ' (' . $monTransSrv . ' : ' . $_SESSION['monitor']['server_name'] . ')';
-	$description = '';
-	break;
-*/
 case 'iptables':
 	$template = 'templates/show_data.htm';
 	$output .= $app->tools_monitor->showIPTables();
diff --git a/interface/web/sites/database_user_edit.php b/interface/web/sites/database_user_edit.php
@@ -168,14 +168,6 @@ function onBeforeUpdate() {
 			$this->dataRecord['database_user'] = substr($dbuser_prefix . $this->dataRecord['database_user'], 0, 16);
 		}
 
-		/* prepare password for MongoDB */
-		// TODO: this still doens't work as when only the username changes we have no database_password.
-		// taking the one from oldData doesn't work as it's encrypted...shit!
-/*
-		$this->dataRecord['database_password_mongo'] = $this->dataRecord['database_user'].":mongo:".$this->dataRecord['database_password'];
-
-		$this->dataRecord['server_id'] = 0; // we need this on all servers
-*/
 		parent::onBeforeUpdate();
 	}
 
@@ -211,9 +203,6 @@ function onBeforeInsert() {
 
 		$this->dataRecord['server_id'] = 0; // we need this on all servers
 
-		/* prepare password for MongoDB */
-//		$this->dataRecord['database_password_mongo'] = $this->dataRecord['database_user'].":mongo:".$this->dataRecord['database_password'];
-
 		parent::onBeforeInsert();
 	}
 
diff --git a/interface/web/sites/form/database.tform.php b/interface/web/sites/form/database.tform.php
@@ -90,7 +90,6 @@
 			'formtype' => 'SELECT',
 			'default' => 'mysql',
 			'value'  => array(
-				/*'mongo' => 'MongoDB',*/
 				'mysql' => 'MySQL'
 			)
 		),
diff --git a/interface/web/sites/form/database_user.tform.php b/interface/web/sites/form/database_user.tform.php
@@ -115,15 +115,7 @@
 			'value'  => '',
 			'width'  => '30',
 			'maxlength' => '255'
-		),
-		'database_password_mongo' => array (
-			'datatype' => 'VARCHAR',
-			'formtype' => 'PASSWORD',
-			'default' => '',
-			'value'  => '',
-			'width'  => '30',
-			'maxlength' => '255'
-		),
+		)
 		//#################################
 		// ENDE Datatable fields
 		//#################################
diff --git a/interface/web/sites/list/database.list.php b/interface/web/sites/list/database.list.php
@@ -78,7 +78,6 @@
 	'suffix' => "",
 	'width'  => "",
 	'value'  => array(
-		'mongo' => "MongoDB",
 		'mysql' => "MySQL"
 	)
 );
diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php
@@ -454,16 +454,6 @@ public function monitorServices() {
 				$state = 'error'; // because service is down
 			}
 		}
-/*
-		$data['mongodbserver'] = -1;
-		if ($this->_checkTcp('localhost', 27017)) {
-			$data['mongodbserver'] = 1;
-		} else {
-			$data['mongodbserver'] = 0;
-*/
-			//$state = 'error'; // because service is down
-			/* TODO!!! check if this is a mongodbserver at all, otherwise it will always throw an error state!!! */
-//		}
 
 		/*
 		 * Return the Result
@@ -598,9 +588,6 @@ public function _getLogData($log) {
 				$logfile = '/var/log/fail2ban.log';
 			}
 			break;
-		case 'log_mongodb':
-			$logfile = '/var/log/mongodb/mongodb.log';
-			break;
 		case 'log_ispconfig':
 			if ($dist == 'debian') {
 				$logfile = $conf['ispconfig_log_dir'] . '/ispconfig.log';
diff --git a/server/mods-available/rescue_core_module.inc.php b/server/mods-available/rescue_core_module.inc.php
@@ -94,11 +94,6 @@ private function _doRescue() {
 		 */
 		$this->_rescueData = $this->_getRescueData();
 
-		/*
-		 * rescue MongoDB if needed
-		 */
-//		$this->_rescueMongoDB();
-
 		/*
 		 * rescue mysql if needed (maybe httpd depends on mysql, so try this first!)
 		 */
@@ -311,73 +306,6 @@ private function _rescueHttpd(){
 		$this->_rescueDaemon($daemon);
 	}
 
-
-	/**
-	 * restarts MongoDB, if needed
-	 */
-//	private function _rescueMongoDB(){
-//		global $app, $conf;
-
-		/*
-		 * do nothing, if it is not allowed to rescue mysql
-		 */
-//		if ((isset($conf['serverconfig']['rescue']['do_not_try_rescue_mongodb']) && ($conf['serverconfig']['rescue']['do_not_try_rescue_mongodb']) == 'y')){
-//			return;
-//		}
-
-		/*
-		 * if the service is up and running, or the service is not installed there is nothing to do...
-		 */
-//		if ($this->_monitoringData[0][0]['data']['mongodbserver'] != 0){
-//			/* Clear the try counter, because we do not have to try to rescue the service */
-//			$this->_rescueData['mongodbserver']['try_counter'] = 0;
-//			return;
-//		}
-
-		/*
-		 * OK, the service is installed and down.
-		 * Maybe this is because of a restart of the service by the admin.
-		 * This means, we check the data 1 minute ago
-		 */
-//		if ((!isset($this->_monitoringData[1][0]['data']['mongodbserver'])) ||
-//			((isset($this->_monitoringData[1][0]['data']['mongodbserver'])) && ($this->_monitoringData[1][0]['data']['mongodbserver'] != 0))){
-			/*
-			 * We do NOT have this data or we have this data, but the webserver was not down 1 minute ago.
-			 * This means, it could be, that the admin is restarting the server.
-			 * We wait one more minute...
-			 */
-//			return;
-//		}
-
-		/*#####
-		 * The service is down and it was down 1 minute ago.
-		 * We try to rescue it
-		 *#####*/
-
-		/* Get the try counter */
-//		$tryCount = (!isset($this->_rescueData['mongodbserver']['try_counter']))? 1 : $this->_rescueData['mongodbserver']['try_counter'] + 1;
-
-		/* Set the new try counter */
-//		$this->_rescueData['mongodbserver']['try_counter'] = $tryCount;
-
-		/* if 5 times will not work, we have to give up... */
-//		if ($tryCount > 5){
-//			$app->log('MongoDB is down! Rescue will not help!', LOGLEVEL_ERROR);
-//			return;
-//		}
-
-
-//		$app->log('MongoDB is down! Try rescue MongoDB (try:' . $tryCount . ')...', LOGLEVEL_WARN);
-
-//		if(is_file($conf['init_scripts'] . '/' . 'mongodb')) {
-//			$daemon = 'mongodb';
-//		} else {
-//			$daemon = 'mongodb';
-//		}
-
-//		$this->_rescueDaemon($daemon);
-//	}
-
 	/**
 	 * restarts mysql, if needed
 	 */
diff --git a/server/plugins-available/backup_plugin.inc.php b/server/plugins-available/backup_plugin.inc.php
@@ -93,32 +93,6 @@ public function backup_action($action_name, $data) {
 					}
 				}
 
-				//* Restore a MongoDB backup
-				if($action_name == 'backup_restore' && $backup['backup_type'] == 'mongodb') {
-					if(file_exists($backup_dir.'/'.$backup['filename'])) {
-						//$parts = explode('_',$backup['filename']);
-						//$db_name = $parts[1];
-						preg_match('@^db_(.+)_\d{4}-\d{2}-\d{2}_\d{2}-\d{2}\.tar\.gz$@', $backup['filename'], $matches);
-						$db_name = $matches[1];
-
-						// extract tar.gz archive
-						$dump_directory = str_replace(".tar.gz", "", $backup['filename']);
-						$extracted = "/usr/local/ispconfig/server/temp";
-						exec("tar -xzvf ".escapeshellarg($backup_dir.'/'.$backup['filename'])." --directory=".escapeshellarg($extracted));
-						$restore_directory = $extracted."/".$dump_directory."/".$db_name;
-
-						// mongorestore -h 127.0.0.1 -u root -p 123456 --authenticationDatabase admin -d c1debug --drop ./toRestore
-						$command = "mongorestore -h 127.0.0.1 --port 27017 -u root -p 123456 --authenticationDatabase admin -d ".$db_name." --drop ".escapeshellarg($restore_directory);
-						exec($command);
-						exec("rm -rf ".escapeshellarg($extracted."/".$dump_directory));
-					}
-
-					unset($clientdb_host);
-					unset($clientdb_user);
-					unset($clientdb_password);
-					$app->log('Restored MongoDB backup '.$backup_dir.'/'.$backup['filename'], LOGLEVEL_DEBUG);
-				}
-
 				//* Restore a mysql backup
 				if($action_name == 'backup_restore' && $backup['backup_type'] == 'mysql') {
 					//* Load sql dump into db

Original file line number	Diff line number	Diff line change
`@@ -168,14 +168,6 @@ function onBeforeUpdate() {`
`168`	`168`	`$this->dataRecord['database_user'] = substr($dbuser_prefix . $this->dataRecord['database_user'], 0, 16);`
`169`	`169`	`}`
`170`	`170`
`171`		`- /* prepare password for MongoDB */`
`172`		`- // TODO: this still doens't work as when only the username changes we have no database_password.`
`173`		`- // taking the one from oldData doesn't work as it's encrypted...shit!`
`174`		`-/*`
`175`		`- $this->dataRecord['database_password_mongo'] = $this->dataRecord['database_user'].":mongo:".$this->dataRecord['database_password'];`
`176`		`-`
`177`		`- $this->dataRecord['server_id'] = 0; // we need this on all servers`
`178`		`-*/`
`179`	`171`	`parent::onBeforeUpdate();`
`180`	`172`	`}`
`181`	`173`
`@@ -211,9 +203,6 @@ function onBeforeInsert() {`
`211`	`203`
`212`	`204`	`$this->dataRecord['server_id'] = 0; // we need this on all servers`
`213`	`205`
`214`		`- /* prepare password for MongoDB */`
`215`		`-// $this->dataRecord['database_password_mongo'] = $this->dataRecord['database_user'].":mongo:".$this->dataRecord['database_password'];`
`216`		`-`
`217`	`206`	`parent::onBeforeInsert();`
`218`	`207`	`}`
`219`	`208`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,6 @@`
`90`	`90`	`'formtype' => 'SELECT',`
`91`	`91`	`'default' => 'mysql',`
`92`	`92`	`'value' => array(`
`93`		`- /'mongo' => 'MongoDB',/`
`94`	`93`	`'mysql' => 'MySQL'`
`95`	`94`	`)`
`96`	`95`	`),`