diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-01 12:44:25 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-01 12:44:25 -0400 |
| commit | a1510cf749295fe10760dabd0a5ecc4e2fc8a725 (patch) | |
| tree | b81456bcb778360450ea5d86235cdbbf3009ba4f /src/lib/Bcfg2/Server/Plugins/Packages/__init__.py | |
| parent | 3ea3d3b103855ca46a1e1557b0017820bbc4e800 (diff) | |
| download | bcfg2-a1510cf749295fe10760dabd0a5ecc4e2fc8a725.tar.gz bcfg2-a1510cf749295fe10760dabd0a5ecc4e2fc8a725.tar.bz2 bcfg2-a1510cf749295fe10760dabd0a5ecc4e2fc8a725.zip | |
made path to Packages cache configurable
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Packages/__init__.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/__init__.py | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py index 3e46ec67c..e76f648d0 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py @@ -11,6 +11,9 @@ from Bcfg2.Bcfg2Py3k import ConfigParser, urlopen from Bcfg2.Server.Plugins.Packages import Collection from Bcfg2.Server.Plugins.Packages.PackagesSources import PackagesSources +yum_config_default = "/etc/yum.repos.d/bcfg2.repo" +apt_config_default = "/etc/apt/sources.d/bcfg2" + class Packages(Bcfg2.Server.Plugin.Plugin, Bcfg2.Server.Plugin.StructureValidator, Bcfg2.Server.Plugin.Generator, @@ -29,8 +32,12 @@ class Packages(Bcfg2.Server.Plugin.Plugin, Bcfg2.Server.Plugin.ClientRunHooks.__init__(self) self.sentinels = set() - self.cachepath = os.path.join(self.data, 'cache') - self.keypath = os.path.join(self.data, 'keys') + self.cachepath = \ + self.core.setup.cfp.get("packages", "cache", + default=os.path.join(self.data, 'cache')) + self.keypath = \ + self.core.setup.cfp.get("packages", "keycache", + default=os.path.join(self.data, 'keys')) if not os.path.exists(self.keypath): # create key directory if needed os.makedirs(self.keypath) @@ -96,12 +103,14 @@ class Packages(Bcfg2.Server.Plugin.Plugin, default="auto")) entry.set('type', collection.ptype) elif entry.tag == 'Path': - if (entry.get("name") == self.core.setup.cfp.get("packages", - "yum_config", - default="") or - entry.get("name") == self.core.setup.cfp.get("packages", - "apt_config", - default="")): + if (entry.get("name") == \ + self.core.setup.cfp.get("packages", + "yum_config", + default=yum_config_default) or + entry.get("name") == \ + self.core.setup.cfp.get("packages", + "apt_config", + default=apt_config_default)): self.create_config(entry, metadata) def HandlesEntry(self, entry, metadata): @@ -115,12 +124,14 @@ class Packages(Bcfg2.Server.Plugin.Plugin, return True elif entry.tag == 'Path': # managed entries for yum/apt configs - if (entry.get("name") == self.core.setup.cfp.get("packages", - "yum_config", - default="") or - entry.get("name") == self.core.setup.cfp.get("packages", - "apt_config", - default="")): + if (entry.get("name") == \ + self.core.setup.cfp.get("packages", + "yum_config", + default=yum_config_default) or + entry.get("name") == \ + self.core.setup.cfp.get("packages", + "apt_config", + default=apt_config_default)): return True return False |