mirror of
https://github.com/kevingruesser/bootstrap-vz.git
synced 2025-08-24 07:26:29 +00:00
Create security group (part of standard group)
This commit is contained in:
parent
c0292bf526
commit
6d2a52f7a0
6 changed files with 2 additions and 10 deletions
|
@ -27,6 +27,7 @@ def get_standard_groups(manifest):
|
||||||
group.extend(get_fs_specific_group(manifest))
|
group.extend(get_fs_specific_group(manifest))
|
||||||
group.extend(get_network_group(manifest))
|
group.extend(get_network_group(manifest))
|
||||||
group.extend(get_apt_group(manifest))
|
group.extend(get_apt_group(manifest))
|
||||||
|
group.extend(security_group)
|
||||||
group.extend(locale_group)
|
group.extend(locale_group)
|
||||||
group.extend(bootloader_group.get(manifest.system['bootloader'], []))
|
group.extend(bootloader_group.get(manifest.system['bootloader'], []))
|
||||||
group.extend(cleanup_group)
|
group.extend(cleanup_group)
|
||||||
|
@ -112,6 +113,7 @@ def get_apt_group(manifest):
|
||||||
group.append(packages.AddTaskselStandardPackages)
|
group.append(packages.AddTaskselStandardPackages)
|
||||||
return group
|
return group
|
||||||
|
|
||||||
|
security_group = [security.EnableShadowConfig]
|
||||||
|
|
||||||
locale_group = [locale.LocaleBootstrapPackage,
|
locale_group = [locale.LocaleBootstrapPackage,
|
||||||
locale.GenerateLocale,
|
locale.GenerateLocale,
|
||||||
|
|
|
@ -5,7 +5,6 @@ from bootstrapvz.common.tasks import volume
|
||||||
from bootstrapvz.common.tasks import loopback
|
from bootstrapvz.common.tasks import loopback
|
||||||
from bootstrapvz.common.tasks import partitioning
|
from bootstrapvz.common.tasks import partitioning
|
||||||
from bootstrapvz.common.tasks import filesystem
|
from bootstrapvz.common.tasks import filesystem
|
||||||
from bootstrapvz.common.tasks import security
|
|
||||||
from bootstrapvz.common.tasks import initd
|
from bootstrapvz.common.tasks import initd
|
||||||
from bootstrapvz.common.tasks import ssh
|
from bootstrapvz.common.tasks import ssh
|
||||||
from bootstrapvz.common.tasks import workspace
|
from bootstrapvz.common.tasks import workspace
|
||||||
|
@ -30,7 +29,6 @@ def resolve_tasks(taskset, manifest):
|
||||||
|
|
||||||
taskset.update([tasks.packages.DefaultPackages,
|
taskset.update([tasks.packages.DefaultPackages,
|
||||||
loopback.Create,
|
loopback.Create,
|
||||||
security.EnableShadowConfig,
|
|
||||||
initd.InstallInitScripts,
|
initd.InstallInitScripts,
|
||||||
ssh.AddOpenSSHPackage,
|
ssh.AddOpenSSHPackage,
|
||||||
ssh.ShredHostkeys,
|
ssh.ShredHostkeys,
|
||||||
|
|
|
@ -13,7 +13,6 @@ from bootstrapvz.common.tasks import boot
|
||||||
from bootstrapvz.common.tasks import initd
|
from bootstrapvz.common.tasks import initd
|
||||||
from bootstrapvz.common.tasks import partitioning
|
from bootstrapvz.common.tasks import partitioning
|
||||||
from bootstrapvz.common.tasks import loopback
|
from bootstrapvz.common.tasks import loopback
|
||||||
from bootstrapvz.common.tasks import security
|
|
||||||
from bootstrapvz.common.tasks import workspace
|
from bootstrapvz.common.tasks import workspace
|
||||||
|
|
||||||
|
|
||||||
|
@ -60,7 +59,6 @@ def resolve_tasks(taskset, manifest):
|
||||||
|
|
||||||
boot.BlackListModules,
|
boot.BlackListModules,
|
||||||
boot.DisableGetTTYs,
|
boot.DisableGetTTYs,
|
||||||
security.EnableShadowConfig,
|
|
||||||
tasks.network.EnableDHCPCDDNS,
|
tasks.network.EnableDHCPCDDNS,
|
||||||
initd.AddExpandRoot,
|
initd.AddExpandRoot,
|
||||||
initd.RemoveHWClock,
|
initd.RemoveHWClock,
|
||||||
|
|
|
@ -6,7 +6,6 @@ import tasks.host
|
||||||
import tasks.packages
|
import tasks.packages
|
||||||
from bootstrapvz.common.tasks import loopback
|
from bootstrapvz.common.tasks import loopback
|
||||||
from bootstrapvz.common.tasks import ssh
|
from bootstrapvz.common.tasks import ssh
|
||||||
from bootstrapvz.common.tasks import security
|
|
||||||
from bootstrapvz.common.tasks import initd
|
from bootstrapvz.common.tasks import initd
|
||||||
import bootstrapvz.plugins.cloud_init.tasks
|
import bootstrapvz.plugins.cloud_init.tasks
|
||||||
|
|
||||||
|
@ -34,7 +33,6 @@ def resolve_tasks(tasklist, manifest):
|
||||||
|
|
||||||
tasks.configuration.GatherReleaseInformation,
|
tasks.configuration.GatherReleaseInformation,
|
||||||
|
|
||||||
security.EnableShadowConfig,
|
|
||||||
tasks.host.DisableIPv6,
|
tasks.host.DisableIPv6,
|
||||||
tasks.boot.ConfigureGrub,
|
tasks.boot.ConfigureGrub,
|
||||||
ssh.AddSSHKeyGeneration,
|
ssh.AddSSHKeyGeneration,
|
||||||
|
|
|
@ -3,7 +3,6 @@ from bootstrapvz.common.tasks import volume
|
||||||
from bootstrapvz.common.tasks import loopback
|
from bootstrapvz.common.tasks import loopback
|
||||||
from bootstrapvz.common.tasks import partitioning
|
from bootstrapvz.common.tasks import partitioning
|
||||||
from bootstrapvz.common.tasks import filesystem
|
from bootstrapvz.common.tasks import filesystem
|
||||||
from bootstrapvz.common.tasks import security
|
|
||||||
from bootstrapvz.common.tasks import initd
|
from bootstrapvz.common.tasks import initd
|
||||||
from bootstrapvz.common.tasks import ssh
|
from bootstrapvz.common.tasks import ssh
|
||||||
from bootstrapvz.common.tasks import workspace
|
from bootstrapvz.common.tasks import workspace
|
||||||
|
@ -28,7 +27,6 @@ def resolve_tasks(taskset, manifest):
|
||||||
|
|
||||||
taskset.update([tasks.packages.DefaultPackages,
|
taskset.update([tasks.packages.DefaultPackages,
|
||||||
loopback.Create,
|
loopback.Create,
|
||||||
security.EnableShadowConfig,
|
|
||||||
initd.InstallInitScripts,
|
initd.InstallInitScripts,
|
||||||
ssh.AddOpenSSHPackage,
|
ssh.AddOpenSSHPackage,
|
||||||
ssh.ShredHostkeys,
|
ssh.ShredHostkeys,
|
||||||
|
|
|
@ -3,7 +3,6 @@ from bootstrapvz.common.tasks import volume
|
||||||
from bootstrapvz.common.tasks import loopback
|
from bootstrapvz.common.tasks import loopback
|
||||||
from bootstrapvz.common.tasks import partitioning
|
from bootstrapvz.common.tasks import partitioning
|
||||||
from bootstrapvz.common.tasks import filesystem
|
from bootstrapvz.common.tasks import filesystem
|
||||||
from bootstrapvz.common.tasks import security
|
|
||||||
from bootstrapvz.common.tasks import initd
|
from bootstrapvz.common.tasks import initd
|
||||||
from bootstrapvz.common.tasks import workspace
|
from bootstrapvz.common.tasks import workspace
|
||||||
|
|
||||||
|
@ -27,7 +26,6 @@ def resolve_tasks(taskset, manifest):
|
||||||
|
|
||||||
taskset.update([tasks.packages.DefaultPackages,
|
taskset.update([tasks.packages.DefaultPackages,
|
||||||
loopback.Create,
|
loopback.Create,
|
||||||
security.EnableShadowConfig,
|
|
||||||
initd.InstallInitScripts,
|
initd.InstallInitScripts,
|
||||||
loopback.MoveImage,
|
loopback.MoveImage,
|
||||||
])
|
])
|
||||||
|
|
Loading…
Add table
Reference in a new issue