From db03a0e084e5f15fe67a7de1d4fbec0d9a404536 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Fri, 23 Sep 2016 19:07:55 -0300 Subject: Utils: split network, rename personal to bundle --- manifests/utils/bundle/debian.pp | 55 +++++++++++++ manifests/utils/bundle/poweruser.pp | 12 +++ manifests/utils/bundle/standard.pp | 7 ++ manifests/utils/monkeysphere.pp | 11 +++ manifests/utils/network.pp | 149 ++++++++-------------------------- manifests/utils/network/mail.pp | 24 ++++++ manifests/utils/personal/debian.pp | 55 ------------- manifests/utils/personal/poweruser.pp | 10 --- manifests/utils/personal/standard.pp | 7 -- 9 files changed, 144 insertions(+), 186 deletions(-) create mode 100644 manifests/utils/bundle/debian.pp create mode 100644 manifests/utils/bundle/poweruser.pp create mode 100644 manifests/utils/bundle/standard.pp create mode 100644 manifests/utils/monkeysphere.pp create mode 100644 manifests/utils/network/mail.pp delete mode 100644 manifests/utils/personal/debian.pp delete mode 100644 manifests/utils/personal/poweruser.pp delete mode 100644 manifests/utils/personal/standard.pp (limited to 'manifests/utils') diff --git a/manifests/utils/bundle/debian.pp b/manifests/utils/bundle/debian.pp new file mode 100644 index 0000000..23ce9d6 --- /dev/null +++ b/manifests/utils/bundle/debian.pp @@ -0,0 +1,55 @@ +class nodo::utils::bundle::debian { + # ISO image handling + include nodo::utils::storage::iso + + # Basic crypto + include nodo::utils::storage::crypto + + # System + package { [ + 'libpam-mount', + 'gawk', + 'laptop-detect', + #'mtp-tools', + ]: + ensure => installed, + } + + # Misc + package { [ + 'fortunes-br', + 'recode', + 'p7zip-full', + 'funcoeszz', + 'detox', + ]: + ensure => absent, + } + + # Console window managers + #package { [ + # 'screenie', + # 'iselect', + # 'byobu', + #]: + # ensure => installed, + #} + + # Console interfaces + #package { [ + # 'gpm', + # 'fbterm', + # 'fbiterm', + #]: + # ensure => installed, + #} + + # Non-free, old, buggy or absent in newer releases + package { [ + 'mtpfs', + 'unrar', + 'figlet', + ]: + ensure => purged, + } +} diff --git a/manifests/utils/bundle/poweruser.pp b/manifests/utils/bundle/poweruser.pp new file mode 100644 index 0000000..b4a20b2 --- /dev/null +++ b/manifests/utils/bundle/poweruser.pp @@ -0,0 +1,12 @@ +# Bundle for power users +class nodo::utils::bundle::poweruser { + include nodo::utils::office + include nodo::utils::interface + include nodo::utils::development + include nodo::utils::security + include nodo::utils::network + include nodo::utils::storage::archive + include nodo::utils::multimedia + include nodo::utils::monkeysphere + include nodo::utils::network::mail +} diff --git a/manifests/utils/bundle/standard.pp b/manifests/utils/bundle/standard.pp new file mode 100644 index 0000000..b63c976 --- /dev/null +++ b/manifests/utils/bundle/standard.pp @@ -0,0 +1,7 @@ +# Bundle with standard packages +class nodo::utils::bundle::pc { + include nodo::utils::office + include nodo::utils::printer + include nodo::utils::network + include nodo::utils::network::xmpp +} diff --git a/manifests/utils/monkeysphere.pp b/manifests/utils/monkeysphere.pp new file mode 100644 index 0000000..8da90b9 --- /dev/null +++ b/manifests/utils/monkeysphere.pp @@ -0,0 +1,11 @@ +class nodo::utils::monkeysphere { + # Monkeysphere + package { [ + 'xul-ext-monkeysphere', + 'xul-ext-noscript', + 'xul-ext-firebug', + 'msva-perl', + ]: + ensure => installed, + } +} diff --git a/manifests/utils/network.pp b/manifests/utils/network.pp index cb9e5c5..4fa6a54 100644 --- a/manifests/utils/network.pp +++ b/manifests/utils/network.pp @@ -1,27 +1,31 @@ class nodo::utils::network inherits nodo::utils::network::minimal { - # Network + # Misc package { [ - 'mutt', - 'offlineimap', - 'newsbeuter', - 'bogofilter', - 'fetchmail', - 'procmail', - 'msmtp', - 'notmuch-mutt', - 'links', - 'elinks', - 'firefox-esr', 'pssh', - 'mutt-patched', 'sslscan', - 'muttprofile', + ]: + ensure => installed, + } + + # Web + package { [ + 'links', + 'elinks', 'surfraw', 'w3m', - 'mailplate', - 'geoip-bin', - 'rig', - 'sup-mail', + 'firefox-esr', + 'chromium', + 'chromium-l10n', + 'xul-ext-https-everywhere', + 'xul-ext-refcontrol', + #'xul-ext-pentadactyl', + #'xul-ext-stylish', + #'maildir-utils', + #'libical-parser-perl', + #'geoip-bin', + #'rig', + #'mailplate', + #'sup-mail', #'connect-proxy', #'avahi-discover', #'mdns-scan', @@ -35,23 +39,13 @@ class nodo::utils::network inherits nodo::utils::network::minimal { ensure => installed, } - # Fix: ensure that fetchmail is not a service - service { 'fetchmail': - ensure => stopped, - enable => false, - require => Package['fetchmail'], - } - - # Using the addon directly - package { [ - 'iceweasel-vimperator', - ]: - ensure => absent, - } - - # Old packages + # Not in use + # + # About vimperator, use the addon directly # About firegpg, see http://tails.boum.org/bugs/FireGPG_may_be_unsafe/ # About adblock plus, see http://www.theverge.com/2015/2/2/7963577/google-ads-get-through-adblock + # See also http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=686087 + # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=705999 package { [ 'silc', 'twinkle', @@ -63,98 +57,25 @@ class nodo::utils::network inherits nodo::utils::network::minimal { 'bittornado', 'xul-ext-firegpg', 'xul-ext-adblock-plus', - ]: - ensure => absent, - } - - # Squeeze (or newer) packages - if $::lsbdistcodename != 'lenny' { - package { [ - 'xul-ext-monkeysphere', - 'libical-parser-perl', - 'maildir-utils', - 'xul-ext-noscript', - 'xul-ext-firebug', - 'msva-perl', - 'chromium-l10n', - ]: - ensure => installed, - } - } - - # Not using right now - package { [ + 'xul-ext-cookie-monster', + 'xul-ext-quickproxy', 'xul-ext-torbutton', - 'vidalia', 'xul-ext-perspectives', 'xul-ext-greasemonkey', + 'iceweasel-vimperator', + 'mozilla-firefox-adblock', + 'vidalia', 'torchat', - ]: - ensure => absent, - } - - package { [ - 'chromium', - ]: - ensure => present, - name => $::lsbdistcodename ? { - 'wheezy' => 'chromium-browser', - default => 'chromium', - }, - } - - # Wheezy (or newer) packages - if $::lsbdistcodename != 'squeeze' { - 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', - ]: - ensure => absent, - } - } - - # Jessie ownwards - #package { [ - # 'xul-ext-pentadactyl', - # 'xul-ext-stylish', - #]: - # ensure => installed, - #} - - # Wheezy only - package { [ 'gftp', 'icedtea6-plugin', 'luakit', ]: - ensure => $::lsbdistcodename ? { - 'lenny' => present, - default => absent, - }, - } - - # Lenny only - package { [ - 'mozilla-firefox-adblock', - ]: - ensure => $::lsbdistcodename ? { - 'lenny' => present, - default => absent, - }, + ensure => absent, } # Browser alternative file { "/etc/alternatives/x-www-browser": - ensure => "/usr/bin/iceweasel", + ensure => "/usr/bin/firefox-esr", owner => root, group => root, require => Package['iceweasel'], @@ -162,7 +83,7 @@ class nodo::utils::network inherits nodo::utils::network::minimal { # Browser alternative: manpage file { "/etc/alternatives/x-www-browser.1.gz": - ensure => "/usr/share/man/man1/iceweasel.1.gz", + ensure => "/usr/share/man/man1/firefox-esr.1.gz", owner => root, group => root, require => Package['iceweasel'], diff --git a/manifests/utils/network/mail.pp b/manifests/utils/network/mail.pp new file mode 100644 index 0000000..02287c3 --- /dev/null +++ b/manifests/utils/network/mail.pp @@ -0,0 +1,24 @@ +class nodo::utils::network::mail { + # Mail + package { [ + 'mutt', + 'mutt-patched', + 'muttprofile', + 'notmuch-mutt', + 'offlineimap', + 'newsbeuter', + 'bogofilter', + 'fetchmail', + 'procmail', + 'msmtp', + ]: + ensure => installed, + } + + # Fix: ensure that fetchmail is not a service + service { 'fetchmail': + ensure => stopped, + enable => false, + require => Package['fetchmail'], + } +} diff --git a/manifests/utils/personal/debian.pp b/manifests/utils/personal/debian.pp deleted file mode 100644 index 91f6193..0000000 --- a/manifests/utils/personal/debian.pp +++ /dev/null @@ -1,55 +0,0 @@ -class nodo::utils::personal::debian { - # ISO image handling - include nodo::utils::storage::iso - - # Basic crypto - include nodo::utils::storage::crypto - - # System - package { [ - 'libpam-mount', - 'gawk', - 'laptop-detect', - #'mtp-tools', - ]: - ensure => installed, - } - - # Misc - package { [ - 'fortunes-br', - 'recode', - 'p7zip-full', - 'funcoeszz', - 'detox', - ]: - ensure => absent, - } - - # Console window managers - #package { [ - # 'screenie', - # 'iselect', - # 'byobu', - #]: - # ensure => installed, - #} - - # Console interfaces - #package { [ - # 'gpm', - # 'fbterm', - # 'fbiterm', - #]: - # ensure => installed, - #} - - # Non-free, old, buggy or absent in newer releases - package { [ - 'mtpfs', - 'unrar', - 'figlet', - ]: - ensure => purged, - } -} diff --git a/manifests/utils/personal/poweruser.pp b/manifests/utils/personal/poweruser.pp deleted file mode 100644 index db81a42..0000000 --- a/manifests/utils/personal/poweruser.pp +++ /dev/null @@ -1,10 +0,0 @@ -# Bundle for power users -class nodo::utils::personal::poweruser { - include nodo::utils::office - include nodo::utils::interface - include nodo::utils::development - include nodo::utils::security - include nodo::utils::network - include nodo::utils::storage::archive - include nodo::utils::multimedia -} diff --git a/manifests/utils/personal/standard.pp b/manifests/utils/personal/standard.pp deleted file mode 100644 index 73ad271..0000000 --- a/manifests/utils/personal/standard.pp +++ /dev/null @@ -1,7 +0,0 @@ -# Bundle with standard packages -class nodo::utils::personal::pc { - include nodo::utils::office - include nodo::utils::printer - include nodo::utils::network - include nodo::utils::network::xmpp -} -- cgit v1.2.3