The change in d9e9014 failed when SSH was not installed

bootstrapvz/common/tasks/ssh.py

@@ -51,15 +51,36 @@ class DisableSSHPasswordAuthentication(Task):
 		sed_i(sshd_config_path, '^#PasswordAuthentication yes', 'PasswordAuthentication no')
 
 
-class PermitSSHRootLogin(Task):
-	description = 'Permitting SSH root login'
+class EnableRootLogin(Task):
+	description = 'Disabling SSH login for root'
 	phase = phases.system_modification
 
 	@classmethod
 	def run(cls, info):
-		from ..tools import sed_i
-		sshd_config_path = os.path.join(info.root, 'etc/ssh/sshd_config')
-		sed_i(sshd_config_path, '^PermitRootLogin .*', 'PermitRootLogin yes')
+		sshdconfig_path = os.path.join(info.root, 'etc/ssh/sshd_config')
+		if os.path.exists(sshdconfig_path):
+			from bootstrapvz.common.tools import sed_i
+			sed_i(sshdconfig_path, 'PermitRootLogin .*', 'PermitRootLogin yes')
+		else:
+			import logging
+			logging.getLogger(__name__).warn('The OpenSSH server has not been installed, '
+			                                 'not enabling SSH root login.')
+
+
+class DisableRootLogin(Task):
+	description = 'Disabling SSH login for root'
+	phase = phases.system_modification
+
+	@classmethod
+	def run(cls, info):
+		sshdconfig_path = os.path.join(info.root, 'etc/ssh/sshd_config')
+		if os.path.exists(sshdconfig_path):
+			from bootstrapvz.common.tools import sed_i
+			sed_i(sshdconfig_path, 'PermitRootLogin .*', 'PermitRootLogin no')
+		else:
+			import logging
+			logging.getLogger(__name__).warn('The OpenSSH server has not been installed, '
+			                                 'not disabling SSH root login.')
 
 
 class DisableSSHDNSLookup(Task):

bootstrapvz/plugins/admin_user/__init__.py

@@ -8,13 +8,14 @@ def validate_manifest(data, validator, error):
 
 def resolve_tasks(taskset, manifest):
 	import tasks
+	from bootstrapvz.common.tasks import ssh
 	from bootstrapvz.providers.ec2.tasks import initd
 	if initd.AddEC2InitScripts in taskset:
 		taskset.add(tasks.AdminUserCredentials)
 
 	from bootstrapvz.common.tools import get_codename
 	if get_codename(manifest.system['release']) in ['wheezy', 'squeeze']:
-		taskset.update([tasks.DisableRootLogin])
+		taskset.update([ssh.DisableRootLogin])
 
 	taskset.update([tasks.AddSudoPackage,
 	                tasks.CreateAdminUser,

bootstrapvz/plugins/admin_user/tasks.py

@@ -54,23 +54,3 @@ class AdminUserCredentials(Task):
 		getcreds_path = os.path.join(info.root, 'etc/init.d/ec2-get-credentials')
 		username = info.manifest.plugins['admin_user']['username']
 		sed_i(getcreds_path, 'username=\'root\'', 'username=\'{username}\''.format(username=username))
-
-
-class DisableRootLogin(Task):
-	description = 'Disabling SSH login for root'
-	phase = phases.system_modification
-
-	@classmethod
-	def run(cls, info):
-		from subprocess import CalledProcessError
-		from bootstrapvz.common.tools import log_check_call
-		try:
-			log_check_call(['chroot', info.root,
-			                'dpkg-query', '-W', 'openssh-server'])
-			from bootstrapvz.common.tools import sed_i
-			sshdconfig_path = os.path.join(info.root, 'etc/ssh/sshd_config')
-			sed_i(sshdconfig_path, 'PermitRootLogin yes', 'PermitRootLogin no')
-		except CalledProcessError:
-			import logging
-			logging.getLogger(__name__).warn('The OpenSSH server has not been installed, '
-			                                 'not disabling SSH root login.')

bootstrapvz/plugins/root_password/__init__.py

@@ -10,5 +10,5 @@ def resolve_tasks(taskset, manifest):
 	from bootstrapvz.common.tasks import ssh
 	from tasks import SetRootPassword
 	taskset.discard(ssh.DisableSSHPasswordAuthentication)
-	taskset.add(ssh.PermitSSHRootLogin)
+	taskset.add(ssh.EnableRootLogin)
 	taskset.add(SetRootPassword)