diff options
| author | Todd Zullinger <tmz@pobox.com> | 2009-08-28 14:04:12 -0400 |
|---|---|---|
| committer | Todd Zullinger <tmz@pobox.com> | 2009-08-28 14:04:12 -0400 |
| commit | 42cb7ade8c8b049cd46d7053fb514c6b4463cd19 (patch) | |
| tree | d0677b880715b8108e880718a3de8bb0f5dc7182 | |
| parent | ae268088a81c78f16c9029324c50c5c1bd2c32ce (diff) | |
| download | puppet-host-package-42cb7ade8c8b049cd46d7053fb514c6b4463cd19.tar.gz puppet-host-package-42cb7ade8c8b049cd46d7053fb514c6b4463cd19.tar.xz puppet-host-package-42cb7ade8c8b049cd46d7053fb514c6b4463cd19.zip | |
Allow package prefix to be set via config
This also changes the prefix from 'puppet-' to 'host-package-'.
| -rw-r--r-- | puppethost.py | 6 | ||||
| -rw-r--r-- | template.spec | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/puppethost.py b/puppethost.py index 82bc87b..e1ce7ef 100644 --- a/puppethost.py +++ b/puppethost.py @@ -39,6 +39,7 @@ defaults = { 'sign': True, 'ssldir': '/etc/puppet/ssl', 'template': '%(ssldir)s/template.spec', + 'pkgprefix': 'host-package-', 'verbose': 1, } @@ -118,7 +119,7 @@ class PuppetHost(object): self.datefmt = '%Y%m%d' self.packages = [] self.tarball = '' - self.tmpdir = tempfile.mkdtemp('', 'puppet-host-') + self.tmpdir = tempfile.mkdtemp('', self.opts['pkgprefix']) self._version = '' def gencert(self): @@ -160,7 +161,7 @@ class PuppetHost(object): def tar(self): self._check_files() - name = 'puppet-%s-%s' % (self.hostname, self.version) + name = '%s%s-%s' % (self.opts['pkgprefix'], self.hostname, self.version) tarball = '%s/%s.tar.gz' % (self.tmpdir, name) if os.path.exists(tarball) and not self.opts['force_tarball']: @@ -198,6 +199,7 @@ class PuppetHost(object): text = text.replace('__VERSION__', self.version) text = text.replace('__RELEASE__', self.opts['release']) text = text.replace('__SSLDIR__', self.opts['destssldir']) + text = text.replace('__PKGPREFIX__', self.opts['pkgprefix']) specfp = open(spec, 'w') specfp.write(text) diff --git a/template.spec b/template.spec index 479972f..2b8fde7 100644 --- a/template.spec +++ b/template.spec @@ -2,15 +2,16 @@ %define version __VERSION__ %define release __RELEASE__ %define ssldir __SSLDIR__ +%define pkgprefix __PKGPREFIX__ -Name: puppet-%{hostname} +Name: %{pkgprefix}%{hostname} Version: %{version} Release: %{release} Summary: Puppet SSL certificate files for %{hostname} Group: Applications/System License: Public Domain -Source0: puppet-%{hostname}-%{version}.tar.gz +Source0: %{pkgprefix}%{hostname}-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch |