diff options
| author | Micah Anderson <micah@riseup.net> | 2013-06-27 12:01:52 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-06-27 12:01:52 -0400 |
| commit | 4a102a1e9c856cb4df787f0aaa80747d4cdaa0c7 (patch) | |
| tree | 89382414c3bb83a8cd9ee74245f4eeee678bb4ce /puppet/manifests | |
| parent | 157fb1237d66c4eae83fa2c685745da9e20bca72 (diff) | |
| parent | 63914c68537a7e05a214c6d943389c80074a0915 (diff) | |
Merge branch 'develop' into leap
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/setup.pp | 1 | ||||
| -rw-r--r-- | puppet/manifests/site.pp | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/puppet/manifests/setup.pp b/puppet/manifests/setup.pp index 112782d8..80e7ffc2 100644 --- a/puppet/manifests/setup.pp +++ b/puppet/manifests/setup.pp @@ -4,7 +4,6 @@ $services = '' Exec { path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' } -$custom_key_dir = 'puppet:///modules/site_apt/keys' include site_config::hosts diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp index f0319bc2..08cbbb9e 100644 --- a/puppet/manifests/site.pp +++ b/puppet/manifests/site.pp @@ -1,8 +1,6 @@ # set a default exec path Exec { path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' } -$custom_key_dir = 'puppet:///modules/site_apt/keys' - # parse services for host $services=join(hiera_array('services'), ' ') notice("Services for ${fqdn}: ${services}") |