From 6d2a52f7a0e1f6751c56381aec13bb45c0c71e27 Mon Sep 17 00:00:00 2001
From: Anders Ingemann <anders@ingemann.de>
Date: Sat, 3 May 2014 13:11:32 +0200
Subject: [PATCH] Create security group (part of standard group)

---
 bootstrapvz/common/task_groups.py            | 2 ++
 bootstrapvz/providers/azure/__init__.py      | 2 --
 bootstrapvz/providers/ec2/__init__.py        | 2 --
 bootstrapvz/providers/gce/__init__.py        | 2 --
 bootstrapvz/providers/kvm/__init__.py        | 2 --
 bootstrapvz/providers/virtualbox/__init__.py | 2 --
 6 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/bootstrapvz/common/task_groups.py b/bootstrapvz/common/task_groups.py
index df05ca4..a39ff97 100644
--- a/bootstrapvz/common/task_groups.py
+++ b/bootstrapvz/common/task_groups.py
@@ -27,6 +27,7 @@ def get_standard_groups(manifest):
 	group.extend(get_fs_specific_group(manifest))
 	group.extend(get_network_group(manifest))
 	group.extend(get_apt_group(manifest))
+	group.extend(security_group)
 	group.extend(locale_group)
 	group.extend(bootloader_group.get(manifest.system['bootloader'], []))
 	group.extend(cleanup_group)
@@ -112,6 +113,7 @@ def get_apt_group(manifest):
 		group.append(packages.AddTaskselStandardPackages)
 	return group
 
+security_group = [security.EnableShadowConfig]
 
 locale_group = [locale.LocaleBootstrapPackage,
                 locale.GenerateLocale,
diff --git a/bootstrapvz/providers/azure/__init__.py b/bootstrapvz/providers/azure/__init__.py
index 9a5895f..3fd668f 100644
--- a/bootstrapvz/providers/azure/__init__.py
+++ b/bootstrapvz/providers/azure/__init__.py
@@ -5,7 +5,6 @@ from bootstrapvz.common.tasks import volume
 from bootstrapvz.common.tasks import loopback
 from bootstrapvz.common.tasks import partitioning
 from bootstrapvz.common.tasks import filesystem
-from bootstrapvz.common.tasks import security
 from bootstrapvz.common.tasks import initd
 from bootstrapvz.common.tasks import ssh
 from bootstrapvz.common.tasks import workspace
@@ -30,7 +29,6 @@ def resolve_tasks(taskset, manifest):
 
 	taskset.update([tasks.packages.DefaultPackages,
 	                loopback.Create,
-	                security.EnableShadowConfig,
 	                initd.InstallInitScripts,
 	                ssh.AddOpenSSHPackage,
 	                ssh.ShredHostkeys,
diff --git a/bootstrapvz/providers/ec2/__init__.py b/bootstrapvz/providers/ec2/__init__.py
index 6d7dbda..9fd9ea8 100644
--- a/bootstrapvz/providers/ec2/__init__.py
+++ b/bootstrapvz/providers/ec2/__init__.py
@@ -13,7 +13,6 @@ from bootstrapvz.common.tasks import boot
 from bootstrapvz.common.tasks import initd
 from bootstrapvz.common.tasks import partitioning
 from bootstrapvz.common.tasks import loopback
-from bootstrapvz.common.tasks import security
 from bootstrapvz.common.tasks import workspace
 
 
@@ -60,7 +59,6 @@ def resolve_tasks(taskset, manifest):
 
 	                boot.BlackListModules,
 	                boot.DisableGetTTYs,
-	                security.EnableShadowConfig,
 	                tasks.network.EnableDHCPCDDNS,
 	                initd.AddExpandRoot,
 	                initd.RemoveHWClock,
diff --git a/bootstrapvz/providers/gce/__init__.py b/bootstrapvz/providers/gce/__init__.py
index 975d4cf..3616c76 100644
--- a/bootstrapvz/providers/gce/__init__.py
+++ b/bootstrapvz/providers/gce/__init__.py
@@ -6,7 +6,6 @@ import tasks.host
 import tasks.packages
 from bootstrapvz.common.tasks import loopback
 from bootstrapvz.common.tasks import ssh
-from bootstrapvz.common.tasks import security
 from bootstrapvz.common.tasks import initd
 import bootstrapvz.plugins.cloud_init.tasks
 
@@ -34,7 +33,6 @@ def resolve_tasks(tasklist, manifest):
 
 	                 tasks.configuration.GatherReleaseInformation,
 
-	                 security.EnableShadowConfig,
 	                 tasks.host.DisableIPv6,
 	                 tasks.boot.ConfigureGrub,
 	                 ssh.AddSSHKeyGeneration,
diff --git a/bootstrapvz/providers/kvm/__init__.py b/bootstrapvz/providers/kvm/__init__.py
index e4e4f61..522a0d7 100644
--- a/bootstrapvz/providers/kvm/__init__.py
+++ b/bootstrapvz/providers/kvm/__init__.py
@@ -3,7 +3,6 @@ from bootstrapvz.common.tasks import volume
 from bootstrapvz.common.tasks import loopback
 from bootstrapvz.common.tasks import partitioning
 from bootstrapvz.common.tasks import filesystem
-from bootstrapvz.common.tasks import security
 from bootstrapvz.common.tasks import initd
 from bootstrapvz.common.tasks import ssh
 from bootstrapvz.common.tasks import workspace
@@ -28,7 +27,6 @@ def resolve_tasks(taskset, manifest):
 
 	taskset.update([tasks.packages.DefaultPackages,
 	                loopback.Create,
-	                security.EnableShadowConfig,
 	                initd.InstallInitScripts,
 	                ssh.AddOpenSSHPackage,
 	                ssh.ShredHostkeys,
diff --git a/bootstrapvz/providers/virtualbox/__init__.py b/bootstrapvz/providers/virtualbox/__init__.py
index 3ad8300..2819471 100644
--- a/bootstrapvz/providers/virtualbox/__init__.py
+++ b/bootstrapvz/providers/virtualbox/__init__.py
@@ -3,7 +3,6 @@ from bootstrapvz.common.tasks import volume
 from bootstrapvz.common.tasks import loopback
 from bootstrapvz.common.tasks import partitioning
 from bootstrapvz.common.tasks import filesystem
-from bootstrapvz.common.tasks import security
 from bootstrapvz.common.tasks import initd
 from bootstrapvz.common.tasks import workspace
 
@@ -27,7 +26,6 @@ def resolve_tasks(taskset, manifest):
 
 	taskset.update([tasks.packages.DefaultPackages,
 	                loopback.Create,
-	                security.EnableShadowConfig,
 	                initd.InstallInitScripts,
 	                loopback.MoveImage,
 	                ])