diff options
| author | varac <varacanero@zeromail.org> | 2015-05-26 16:23:40 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-05-26 16:23:40 +0200 |
| commit | 4105838757e1843ece8935ddae82a3cbb9febc7a (patch) | |
| tree | dac4f071c7e08c6170d9f90e9fbfe3c2fdbfd1f3 /puppet/modules/site_apt | |
| parent | 344d8e5fa78cbe5ab2d2a5f4a867c03047057efd (diff) | |
| parent | 26f7665f556570e4bbd446d7b2046854642aff58 (diff) | |
Merge branch '6964_use_exec_to_remove_matching_fileline' into 0.7.0
Diffstat (limited to 'puppet/modules/site_apt')
| -rw-r--r-- | puppet/modules/site_apt/manifests/init.pp | 3 | ||||
| -rw-r--r-- | puppet/modules/site_apt/manifests/preferences/augeas.pp | 15 |
2 files changed, 0 insertions, 18 deletions
diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp index 75f545d4..c32c29c4 100644 --- a/puppet/modules/site_apt/manifests/init.pp +++ b/puppet/modules/site_apt/manifests/init.pp @@ -1,4 +1,3 @@ -# setup basic debian package manager configuration class site_apt { $sources = hiera('sources') @@ -32,8 +31,6 @@ class site_apt { priority => 999 } - include site_apt::preferences::augeas - # All packages should be installed _after_ refresh_apt is called, # which does an apt-get update. # There is one exception: diff --git a/puppet/modules/site_apt/manifests/preferences/augeas.pp b/puppet/modules/site_apt/manifests/preferences/augeas.pp deleted file mode 100644 index 257d64c4..00000000 --- a/puppet/modules/site_apt/manifests/preferences/augeas.pp +++ /dev/null @@ -1,15 +0,0 @@ -# install augeas packages from backports -class site_apt::preferences::augeas { - - # i could not get - # site_config::remove_files::augeas::['rm_old_leap_mx_log_destination'] - # to remove a line matching a regex with the wheezy version of augeas-lenses - # (0.10.0-1). Therefore we install it from backports - - apt::preferences_snippet { 'augeas': - package => 'augeas-lenses augeas-tools libaugeas0', - release => "${::lsbdistcodename}-backports", - priority => 999; - } - -} |