diff options
| author | varac <varacanero@zeromail.org> | 2016-03-14 14:40:24 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2016-03-14 14:40:24 +0100 |
| commit | 5f5f7255bb060b21b38f698b8a47e9bc89ec665e (patch) | |
| tree | c274ba4f065a409e357ae209c49a457f2f0ab466 /puppet/modules/site_config | |
| parent | 4183a10168c61366448e39cf4db45eebc741a27e (diff) | |
| parent | 65335becbf8602b65ed385090400088f56293d9b (diff) | |
Merge branch '7716_remove_obsolete_backports_pinning' into develop
Diffstat (limited to 'puppet/modules/site_config')
| -rw-r--r-- | puppet/modules/site_config/manifests/caching_resolver.pp | 2 | ||||
| -rw-r--r-- | puppet/modules/site_config/manifests/remove/jessie.pp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/puppet/modules/site_config/manifests/caching_resolver.pp b/puppet/modules/site_config/manifests/caching_resolver.pp index cdebbad0..50824fdd 100644 --- a/puppet/modules/site_config/manifests/caching_resolver.pp +++ b/puppet/modules/site_config/manifests/caching_resolver.pp @@ -1,8 +1,6 @@ class site_config::caching_resolver { tag 'leap_base' - include site_apt::preferences::unbound - class { 'unbound': root_hints => false, anchor => false, diff --git a/puppet/modules/site_config/manifests/remove/jessie.pp b/puppet/modules/site_config/manifests/remove/jessie.pp index c813e46d..e9497baf 100644 --- a/puppet/modules/site_config/manifests/remove/jessie.pp +++ b/puppet/modules/site_config/manifests/remove/jessie.pp @@ -6,4 +6,9 @@ class site_config::remove::jessie { notify => Exec['apt_updated']; } + apt::preferences_snippet { + [ 'facter', 'obfsproxy', 'python-twisted', 'unbound' ]: + ensure => absent; + } + } |