kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-22 09:50:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added security field to packages.

Browse source
This commit is contained in:
Alex Hegedus 2017-11-27 18:48:57 -08:00
parent 9445273b8e
commit c0350e7c8a
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bootstrapvz/base/bootstrapinfo.py
View file

@ -31,8 +31,12 @@ class BootstrapInformation(object):
# The default apt mirror
self.apt_mirror = self.manifest.packages.get('mirror', 'http://deb.debian.org/debian/')
# The default apt security mirror
self.apt_security = self.manifest.packages.get('security', 'http://security.debian.org/')
# Create the manifest_vars dictionary
self.manifest_vars = self.__create_manifest_vars(self.manifest, {'apt_mirror': self.apt_mirror})
self.manifest_vars = self.__create_manifest_vars(self.manifest, {'apt_security': self.apt_security,
'apt_mirror': self.apt_mirror})
# Keep a list of apt sources,
# so that tasks may add to that list without having to fiddle with apt source list files.

3
bootstrapvz/base/manifest-schema.yml
View file

@ -84,6 +84,9 @@ properties:
mirror:
type: string
format: uri
security:
type: string
format: uri
preferences:
type: object
patternProperties:

4
bootstrapvz/common/tasks/apt.py
View file

@ -64,9 +64,9 @@ class AddDefaultSources(Task):
if include_src:
info.source_lists.add('main', 'deb-src {apt_mirror} {system.release} ' + components)
if info.manifest.release != sid and info.manifest.release >= wheezy:
info.source_lists.add('main', 'deb http://security.debian.org/ {system.release}/updates ' + components)
info.source_lists.add('main', 'deb {apt_security} {system.release}/updates ' + components)
if include_src:
info.source_lists.add('main', 'deb-src http://security.debian.org/ {system.release}/updates ' + components)
info.source_lists.add('main', 'deb-src {apt_security} {system.release}/updates ' + components)
info.source_lists.add('main', 'deb {apt_mirror} {system.release}-updates ' + components)
if include_src:
info.source_lists.add('main', 'deb-src {apt_mirror} {system.release}-updates ' + components)