Unified Diff: modules/base/manifests/init.pp
Issue 29338036:
Issue 3574 - Move APT setup from class base to module adblockplus (Closed)
Patch Set: Issue 3574 - Fix typo: $enfironment => $environment
Created March 9, 2016, 7:33 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« modules/adblockplus/manifests/init.pp ('k')
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: modules/base/manifests/init.pp |
| diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp |
| index e18c9848e63ab1284b23ea62e8093d82775a6e55..944cf3422f0b91016e4f1d22456a7070c875a8cc 100644 |
| --- a/modules/base/manifests/init.pp |
| +++ b/modules/base/manifests/init.pp |
| @@ -6,15 +6,6 @@ class base ($zone='adblockplus.org') { |
| stage => 'pre', |
| } |
| - if !defined(Class['apt']) { |
| - class {'apt': |
| - always_apt_update => true |
| - } |
| - } |
| - |
| - # Note that APT dependencies are excluded here! |
| - Exec['apt_update'] -> Package <|title != 'python-software-properties'|> |
| - |
| include postfix, ssh |
| package {['mercurial', 'vim', 'emacs', 'debian-goodies', 'htop']: |
« no previous file with comments
|
« modules/adblockplus/manifests/init.pp ('k')
|
no next file »
|
no next file with comments »
