diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2016-05-29 18:10:50 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2016-05-29 18:10:50 -0300 |
| commit | 4e158b1c520e4049e7ccd70c8c642c63115a2c81 (patch) | |
| tree | fecec1171baf58e7ba0de043da5cccd0e88decb9 | |
| parent | 1a0918ea378665f60e8d33a1197047bdd18b61d6 (diff) | |
| download | puppet-nodo-4e158b1c520e4049e7ccd70c8c642c63115a2c81.tar.gz puppet-nodo-4e158b1c520e4049e7ccd70c8c642c63115a2c81.tar.bz2 | |
Package changes
| -rw-r--r-- | manifests/subsystem/scanner.pp | 2 | ||||
| -rw-r--r-- | manifests/utils/browser/hardened.pp | 9 | ||||
| -rw-r--r-- | manifests/utils/network.pp | 18 |
3 files changed, 17 insertions, 12 deletions
diff --git a/manifests/subsystem/scanner.pp b/manifests/subsystem/scanner.pp index db35e43..89b0cc3 100644 --- a/manifests/subsystem/scanner.pp +++ b/manifests/subsystem/scanner.pp @@ -1,5 +1,5 @@ class nodo::subsystem::scanner($access_list = hiera('nodo::subsystem::scanner::access_list', '')) { - package { 'sane': + package { [ 'sane', 'sane-utils' ]: ensure => present, } diff --git a/manifests/utils/browser/hardened.pp b/manifests/utils/browser/hardened.pp new file mode 100644 index 0000000..e641a71 --- /dev/null +++ b/manifests/utils/browser/hardened.pp @@ -0,0 +1,9 @@ +class nodo::utils::browser::hardened { + package { [ + 'torbrowser-launcher', + 'xul-ext-requestpolicy', + 'xul-ext-certificatepatrol', + ]: + ensure => present, + } +} diff --git a/manifests/utils/network.pp b/manifests/utils/network.pp index 7aca920..fdac740 100644 --- a/manifests/utils/network.pp +++ b/manifests/utils/network.pp @@ -11,7 +11,7 @@ class nodo::utils::network inherits nodo::utils::network::minimal { 'sslscan', 'muttprofile', 'connect-proxy', 'avahi-discover', 'mdns-scan', 'davfs2', 'surfraw', 'w3m', 'mailplate', - 'geoip-bin', 'ssvnc', 'torbrowser-launcher', + 'geoip-bin', 'ssvnc', 'rig', 'sup-mail', 'iceweasel-vimperator' ]: ensure => installed, } @@ -38,11 +38,11 @@ class nodo::utils::network inherits nodo::utils::network::minimal { 'xul-ext-firebug', 'msva-perl', 'chromium-l10n' ]: ensure => installed, } + } - # Not using right now - package { [ 'xul-ext-torbutton', 'vidalia', 'xul-ext-perspectives', 'xul-ext-greasemonkey' ]: - ensure => absent, - } + # Not using right now + package { [ 'xul-ext-torbutton', 'vidalia', 'xul-ext-perspectives', 'xul-ext-greasemonkey', 'torchat' ]: + ensure => absent, } package { 'chromium': @@ -55,19 +55,15 @@ class nodo::utils::network inherits nodo::utils::network::minimal { # Wheezy (or newer) packages if $::lsbdistcodename != 'squeeze' { - package { [ 'xul-ext-https-everywhere', 'xul-ext-refcontrol', 'xul-ext-requestpolicy' ]: + package { [ 'xul-ext-https-everywhere', 'xul-ext-refcontrol' ]: ensure => installed, } # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=686087 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=705999 - package { [ 'xul-ext-cookie-monster', 'xul-ext-quickproxy', 'xul-ext-certificatepatrol' ]: + package { [ 'xul-ext-cookie-monster', 'xul-ext-quickproxy' ]: ensure => absent, } - - package { [ 'torchat' ]: - ensure => installed, - } } # Jessie ownwards |