- fixed --no-dns still setting local resolver and installing bind9, fixes #19

lib/os/class.ISPConfigDebianOS.inc.php

@@ -119,10 +119,13 @@ class ISPConfigDebianOS extends ISPConfigBaseOS {
 				'zip',
 				'libnet-dns-perl',
 				'libdbd-mysql-perl',
-				'bind9',
 				'dnsutils'
 			);
 
+			if(ISPConfig::shallInstall('dns')) {
+				$packages[] = 'bind9';
+			}
+
 			if(ISPConfig::shallInstall('mail')) {
 				$packages[] = 'spamassassin';
 				if(ISPConfig::wantsAmavis()) {
@@ -704,23 +707,26 @@ mailman-unsubscribe:  "|/var/lib/mailman/mail/mailman unsubscribe mailman"';
 		}
 		$this->restartService('unbound');
 		*/
-		if(!is_dir('/etc/resolvconf/resolv.conf.d')) {
-			mkdir('/etc/resolvconf/resolv.conf.d', 0755);
-		}
-		$this->addLines('/etc/resolvconf/resolv.conf.d/head', 'nameserver 127.0.0.1', false);
-		$cmd = 'resolvconf -u 2>&1';
-		$result = $this->exec($cmd);
-		if($result === false) {
-			throw new ISPConfigOSException('Command ' . $cmd . ' failed.');
-		}
 
-		ISPConfigLog::info('Checking local dns resolver.', true);
-		$cmd = 'nslookup denic.de | grep Server';
-		$result = $this->exec($cmd);
-		if($result === false) {
-			throw new ISPConfigOSException('Command ' . $cmd . ' failed.');
-		} elseif(strpos($result, '127.0.0.1') === false) {
-			ISPConfigLog::warn('Unexpected resolver response: ' . $result, true);
+		if(ISPConfig::shallInstall('dns')) {
+			if(!is_dir('/etc/resolvconf/resolv.conf.d')) {
+				mkdir('/etc/resolvconf/resolv.conf.d', 0755);
+			}
+			$this->addLines('/etc/resolvconf/resolv.conf.d/head', 'nameserver 127.0.0.1', false);
+			$cmd = 'resolvconf -u 2>&1';
+			$result = $this->exec($cmd);
+			if($result === false) {
+				throw new ISPConfigOSException('Command ' . $cmd . ' failed.');
+			}
+
+			ISPConfigLog::info('Checking local dns resolver.', true);
+			$cmd = 'nslookup denic.de | grep Server';
+			$result = $this->exec($cmd);
+			if($result === false) {
+				throw new ISPConfigOSException('Command ' . $cmd . ' failed.');
+			} elseif(strpos($result, '127.0.0.1') === false) {
+				ISPConfigLog::warn('Unexpected resolver response: ' . $result, true);
+			}
 		}
 
 		if(ISPConfig::shallInstall('web')) {
@@ -1191,8 +1197,11 @@ mailman-unsubscribe:  "|/var/lib/mailman/mail/mailman unsubscribe mailman"';
 			'mysql',
 			'clamav-daemon',
 			'postfix',
-			'bind9',
 		);
+
+		if(ISPConfig::shallInstall('dns')) {
+			$check_services[] = 'bind9';
+		}
 		if(ISPConfig::shallInstall('web')) {
 			$check_services[] = 'pureftpd';
 			if(ISPConfig::$WEBSERVER === ISPC_WEBSERVER_APACHE) {