- install unbound instead of bind with --use-unbound, fixes #5

lib/class.ISPConfig.inc.php

@@ -157,6 +157,14 @@ class ISPConfig {
 		}
 	}
 
+	public static function wantsUnbound() {
+		if(isset($_GET['use-unbound']) && $_GET['use-unbound']) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
 	public static function wantsAmavis() {
 		if(isset($_GET['use-amavis']) && $_GET['use-amavis']) {
 			return true;
@@ -215,6 +223,7 @@ Possible arguments are:
 	--interactive	->Don\'t install ISPConfig in non-interactive mode. This is needed if you want to use expert mode, e. g. to install a slave server that shall be integrated into an existing multiserver setup.
 	--use-nginx		->Use nginx webserver instead of apache2
 	--use-amavis	->Use amavis instead of rspamd for mail filtering
+	--use-unbound	->Use unbound instead of bind9 for local resolving. Only allowed if --no-dns is set.
 	--use-php		->Use specific PHP version instead of installing multiple PHP, e.g. --use-php=7.3 (5.6, 7.0, 7.1, 7.2 and 7.3 available).
 					->--use-php=system disables the sury repository and just installs the system\'s default PHP version.
 					->CURRENTLY ONLY EITHER --use-php=system OR OMITTING THE ARGUMENT (use all versions) IS SUPPORTED!

lib/os/class.ISPConfigDebianOS.inc.php

@@ -123,8 +123,12 @@ class ISPConfigDebianOS extends ISPConfigBaseOS {
 			);
 
 			if(ISPConfig::shallInstall('local-dns')) {
+				if(ISPConfig::wantsUnbound()) {
+					$packages[] = 'unbound';
+				} else {
 					$packages[] = 'bind9';
 				}
+			}
 
 			if(ISPConfig::shallInstall('mail')) {
 				$packages[] = 'spamassassin';
@@ -405,6 +409,11 @@ mailman-unsubscribe:  "|/var/lib/mailman/mail/mailman unsubscribe mailman"';
 			return false;
 		}
 
+		if(ISPConfig::wantsUnbound() && ISPConfig::shallInstall('dns')) {
+			ISPConfigLog::error('You can only use --use-unbound together with --no-dns as ISPConfig requires Bind when dns is enabled.');
+			return false;
+		}
+
 		$this->configureApt();
 		$this->updatePackageList();
 
@@ -707,8 +716,13 @@ mailman-unsubscribe:  "|/var/lib/mailman/mail/mailman unsubscribe mailman"';
 			$this->stopService('rspamd');
 		}
 
+		if(ISPConfig::wantsUnbound()) {
+			ISPConfigLog::info('(Re)starting unbound.', true);
+			$this->restartService('unbound');
+		} else {
 			ISPConfigLog::info('(Re)starting Bind.', true);
 			$this->restartService('bind9');
+		}
 
 		ISPConfigLog::info('Disabling spamassassin daemon.', true);
 		$this->stopService('spamassassin');
@@ -1216,8 +1230,12 @@ mailman-unsubscribe:  "|/var/lib/mailman/mail/mailman unsubscribe mailman"';
 		);
 
 		if(ISPConfig::shallInstall('local-dns')) {
+			if(ISPConfig::wantsUnbound()) {
+				$check_services[] = 'unbound';
+			} else {
 				$check_services[] = 'bind9';
 			}
+		}
 		if(ISPConfig::shallInstall('web')) {
 			$check_services[] = 'pureftpd';
 			if(ISPConfig::$WEBSERVER === ISPC_WEBSERVER_APACHE) {