From 0f83c2aebe89b53a939c2f437f827bfe9e90e02c Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Fri, 23 Sep 2016 17:49:56 -0300 Subject: Utils: reorder and cleanup --- manifests/utils/base.pp | 2 +- manifests/utils/development.pp | 1 - manifests/utils/development/git.pp | 41 ++++++--------- manifests/utils/development/ide.pp | 26 ++++------ manifests/utils/development/puppet.pp | 10 +--- manifests/utils/development/virtual.pp | 20 ++------ manifests/utils/finance.pp | 11 ++++ manifests/utils/interface.pp | 40 ++++++--------- manifests/utils/latex.pp | 13 +++++ manifests/utils/multimedia.pp | 91 ++++++++++++---------------------- manifests/utils/network.pp | 26 ++++------ manifests/utils/network/analyzer.pp | 10 +--- manifests/utils/network/irssi.pp | 8 +-- manifests/utils/network/wicd.pp | 2 +- manifests/utils/network/xmpp.pp | 12 +++++ manifests/utils/office.pp | 39 ++++----------- manifests/utils/personal/bundle.pp | 12 ----- manifests/utils/personal/debian.pp | 6 +-- manifests/utils/personal/poweruser.pp | 10 ++++ manifests/utils/personal/standard.pp | 7 +++ manifests/utils/security.pp | 46 ++++++----------- manifests/utils/security/base.pp | 10 +--- manifests/utils/storage/archive.pp | 3 +- manifests/utils/suckless.pp | 1 - manifests/utils/web.pp | 6 +-- 25 files changed, 182 insertions(+), 271 deletions(-) create mode 100644 manifests/utils/finance.pp create mode 100644 manifests/utils/latex.pp create mode 100644 manifests/utils/network/xmpp.pp delete mode 100644 manifests/utils/personal/bundle.pp create mode 100644 manifests/utils/personal/poweruser.pp create mode 100644 manifests/utils/personal/standard.pp (limited to 'manifests') diff --git a/manifests/utils/base.pp b/manifests/utils/base.pp index b17e574..2762949 100644 --- a/manifests/utils/base.pp +++ b/manifests/utils/base.pp @@ -17,7 +17,6 @@ class nodo::utils::base { 'lsof', 'wipe', 'vrms', - 'nsca-client', 'uuid-runtime', 'multitail', 'bash-completion', @@ -32,6 +31,7 @@ class nodo::utils::base { 'logcheck-database', 'denyhosts', 'logwatch', + 'nsca-client', ]: ensure => absent, } diff --git a/manifests/utils/development.pp b/manifests/utils/development.pp index e0a157f..cb5b1e0 100644 --- a/manifests/utils/development.pp +++ b/manifests/utils/development.pp @@ -2,7 +2,6 @@ class nodo::utils::development { include nodo::utils::development::ide include nodo::utils::development::debian include nodo::utils::development::git - include nodo::utils::development::vcs include nodo::utils::development::python include nodo::utils::development::puppet include nodo::utils::development::system diff --git a/manifests/utils/development/git.pp b/manifests/utils/development/git.pp index 7052d96..e96c547 100644 --- a/manifests/utils/development/git.pp +++ b/manifests/utils/development/git.pp @@ -1,36 +1,27 @@ class nodo::utils::development::git { package { [ - 'gitk', - 'git-gui', 'tig', - 'git-cola', - 'legit', 'git-extras', 'git-flow', - 'topgit', - 'git-remote-gcrypt', + #'legit', + #'topgit', + #'git-remote-gcrypt', + #'git-cola', + #'gitk', + #'git-gui', + #'git-stuff', ]: ensure => installed, } # Newer packages - package { [ - 'git-crypt', - ]: - ensure => $::lsbdistcodename ? { - 'stretch' => present, - 'sid' => present, - default => absent, - } - } - - # Wheezy only - package { [ - 'git-stuff', - ]: - ensure => $::lsbdistcodename ? { - 'wheezy' => present, - default => absent, - }, - } + #package { [ + # 'git-crypt', + #]: + # ensure => $::lsbdistcodename ? { + # 'stretch' => present, + # 'sid' => present, + # default => absent, + # } + #} } diff --git a/manifests/utils/development/ide.pp b/manifests/utils/development/ide.pp index 9928da5..2e89273 100644 --- a/manifests/utils/development/ide.pp +++ b/manifests/utils/development/ide.pp @@ -7,23 +7,17 @@ class nodo::utils::development::ide { 'markdown', 'python-sphinx', 'pelican', + #'ttyrec', + #'bugs-everywhere', + #'silversearcher-ag', + #'ticgit', + #'ticgitweb', + #'ditz', + #'pnopaste-cli', + #'exuberant-ctags', + #'doxygen', + #'agave', ]: ensure => installed, } - - # Not in use - package { [ - 'ttyrec', - 'bugs-everywhere', - 'silversearcher-ag', - 'ticgit', - 'ticgitweb', - 'ditz', - 'pnopaste-cli', - 'exuberant-ctags', - 'doxygen', - 'agave', - ]: - ensure => absent, - } } diff --git a/manifests/utils/development/puppet.pp b/manifests/utils/development/puppet.pp index 0d823a7..7bda1c5 100644 --- a/manifests/utils/development/puppet.pp +++ b/manifests/utils/development/puppet.pp @@ -1,16 +1,8 @@ class nodo::utils::development::puppet { package { [ 'puppet-lint', - ]: - ensure => installed, - } - - package { [ 'ruby-hiera-puppet', ]: - ensure => $::lsbdistcodename ? { - 'wheezy' => present, - default => absent, - }, + ensure => installed, } } diff --git a/manifests/utils/development/virtual.pp b/manifests/utils/development/virtual.pp index dcdc9d4..c7f930b 100644 --- a/manifests/utils/development/virtual.pp +++ b/manifests/utils/development/virtual.pp @@ -1,6 +1,8 @@ class nodo::utils::development::virtual { package { [ 'vagrant', + #'docker.io', + #'packer', ]: ensure => $::lsbdistcodename ? { 'squeeze' => absent, @@ -16,22 +18,8 @@ class nodo::utils::development::virtual { ensure => latest, } - # TODO: wait for jessie release - #package { [ - # 'docker.io', - #]: - # ensure => installed, - #} - - # TODO: wait for stretch release - #package { [ - # 'packer', - #]: - # ensure => installed, - #} - - # TODO: We're not managing this package as we're favouring the - # wheezy-backports virtualbox which doesn't needs it. + # We're not managing this package as we're favouring the + # virtualbox package which doesn't needs it. #package { [ # 'virtualbox-fuse', #]: diff --git a/manifests/utils/finance.pp b/manifests/utils/finance.pp new file mode 100644 index 0000000..63a9911 --- /dev/null +++ b/manifests/utils/finance.pp @@ -0,0 +1,11 @@ +class nodo::utils::finance { + # Finance + package { [ + 'gnucash', + 'ledger', + 'clipf', + 'misery', + ]: + ensure => present, + } +} diff --git a/manifests/utils/interface.pp b/manifests/utils/interface.pp index 4367627..a9f3520 100644 --- a/manifests/utils/interface.pp +++ b/manifests/utils/interface.pp @@ -2,18 +2,13 @@ class nodo::utils::interface inherits nodo::utils::interface::console { # Interface package { [ 'awesome', - 'eterm', 'weather-util', - 'gnome-terminal', 'conky', - 'xterm', 'xscreensaver', - 'thunar', 'x11-apps', 'conky-all', 'gtk-theme-switch', 'gtk-smooth-themes', - 'rxvt', 'lxappearance', 'xdotool', 'xtitle', @@ -21,11 +16,18 @@ class nodo::utils::interface inherits nodo::utils::interface::console { 'pcmanfm', 'awesome-extra', 'numlockx', - 'metar', 'wmctrl', 'xsel', - 'xinput', - 'i3', + 'autocutsel', + 'parcellite', + #'xinput', + #'metar', + #'i3', + #'rxvt', + #'thunar', + #'xterm', + #'eterm', + #'gnome-terminal', ]: ensure => installed, } @@ -39,30 +41,18 @@ class nodo::utils::interface inherits nodo::utils::interface::console { ensure => installed, } + # We need a workaround for this: + # https://bbs.archlinux.org/viewtopic.php?id=50647 + # http://linuxforcynics.com/how-to/using-rxvt-unicode-with-screen package { [ - 'rxvt-unicode', + 'rxvt-unicode-256color', ]: ensure => present, - # We need a workaround for this: - # https://bbs.archlinux.org/viewtopic.php?id=50647 - # http://linuxforcynics.com/how-to/using-rxvt-unicode-with-screen - name => $lsbdistcodename ? { - 'squeeze' => 'rxvt-unicode', - default => 'rxvt-unicode-256color', - } - } - - package { [ - 'terminology', - ]: - ensure => $::lsbdistcodename ? { - 'wheezy' => absent, - default => present, - }, } # Old stuff package { [ + 'terminology', 'conkyforecast', 'fluxbox', ]: diff --git a/manifests/utils/latex.pp b/manifests/utils/latex.pp new file mode 100644 index 0000000..8b29723 --- /dev/null +++ b/manifests/utils/latex.pp @@ -0,0 +1,13 @@ +class nodo::utils::latex { + # LaTeX + package { [ + 'texlive-latex-base', + 'texlive-latex-recommended', + 'texlive-latex-extra', + 'texlive-fonts-extra', + 'vim-latexsuite', + 'pdfjam', + ]: + ensure => present, + } +} diff --git a/manifests/utils/multimedia.pp b/manifests/utils/multimedia.pp index c99a896..e4b23b5 100644 --- a/manifests/utils/multimedia.pp +++ b/manifests/utils/multimedia.pp @@ -2,74 +2,49 @@ class nodo::utils::multimedia inherits nodo::utils::multimedia::minimal { # Multimedia package { [ - 'alsa-tools-gui', - 'mp3blaster', - 'netpbm', - 'audacious', - 'qjackctl', 'gimp', - 'xine-ui', - 'v4l-utils', 'inkscape', - 'easytag', - 'gstreamer-tools', - 'vlc', - 'audacity', - 'opencubicplayer', - 'libasound2-plugins', - 'lame', 'geeqie', 'cbrpager', - 'llgal', - 'darksnow', 'pavucontrol', - 'picard', - 'ffmpeg2theora', - 'oggfwd', 'jhead', - 'gxine', - 'totem', - 'faad', - 'gmtp', - 'gphotofs', - 'jmtpfs', + #'alsa-tools-gui', + #'v4l-utils', + #'gstreamer-tools', + #'mp3blaster', + #'vlc', + #'libasound2-plugins', + #'lame', + #'llgal', + #'darksnow', + #'ffmpeg2theora', + #'netpbm', + #'xine-ui', + #'audacious', + #'qjackctl', + #'easytag', + #'audacity', + #'opencubicplayer', + #'picard', + #'gxine', + #'oggfwd', + #'totem', + #'faad', + #'gmtp', + #'gphotofs', + #'jmtpfs', + #'landell', + #'gqview', + #'mencoder', + #'tucan', + #'orpheus', + #'amarok', + #'moc', + #'cmus', ]: ensure => installed, } - # Old stuff - package { [ - 'amarok', - 'moc', - 'cmus', - ]: - ensure => purged, - } - - # Squeeze only - package { [ - 'tucan', - 'orpheus', - ]: - ensure => $::lsbdistcodename ? { - 'squeeze' => installed, - default => purged, - } - } - - # Wheezy only - package { [ - 'landell', - 'gqview', - 'mencoder', - ]: - ensure => $::lsbdistcodename ? { - 'squeeze' => absent, - 'wheezy' => installed, - default => absent, - } - } - # Flash implementation (deprecated) #$flash = hiera('nodo::utils::multimedia::flash', 'gnash') #class { "nodo::utils::multimedia::${flash}": } diff --git a/manifests/utils/network.pp b/manifests/utils/network.pp index ac14727..cb9e5c5 100644 --- a/manifests/utils/network.pp +++ b/manifests/utils/network.pp @@ -4,39 +4,33 @@ class nodo::utils::network inherits nodo::utils::network::minimal { 'mutt', 'offlineimap', 'newsbeuter', - 'nicotine', - 'sshfs', 'bogofilter', 'fetchmail', 'procmail', 'msmtp', - 'mairix', 'notmuch-mutt', 'links', 'elinks', - 'iceweasel', - 'openvpn', + 'firefox-esr', 'pssh', 'mutt-patched', - 'pidgin', - 'pidgin-encryption', - 'pidgin-openpgp', - 'pidgin-otr', - 'pidgin-privacy-please', - 'pidgin-plugin-pack', 'sslscan', 'muttprofile', - 'connect-proxy', - 'avahi-discover', - 'mdns-scan', - 'davfs2', 'surfraw', 'w3m', 'mailplate', 'geoip-bin', - 'ssvnc', 'rig', 'sup-mail', + #'connect-proxy', + #'avahi-discover', + #'mdns-scan', + #'davfs2', + #'ssvnc', + #'mairix', + #'openvpn', + #'nicotine', + #'sshfs', ]: ensure => installed, } diff --git a/manifests/utils/network/analyzer.pp b/manifests/utils/network/analyzer.pp index 670ffcb..c3f4f41 100644 --- a/manifests/utils/network/analyzer.pp +++ b/manifests/utils/network/analyzer.pp @@ -7,17 +7,9 @@ class nodo::utils::network::analyzer { 'tcptraceroute', 'tcpstat', 'iperf', - ]: - ensure => installed, - } - - package { [ 'zmap', ]: - ensure => $::lsbdistcodename ? { - 'squeeze' => absent, - default => present, - } + ensure => installed, } # https://www.linode.com/docs/networking/diagnosing-network-issues-with-mtr diff --git a/manifests/utils/network/irssi.pp b/manifests/utils/network/irssi.pp index ac2b59a..4784161 100644 --- a/manifests/utils/network/irssi.pp +++ b/manifests/utils/network/irssi.pp @@ -11,7 +11,7 @@ class nodo::utils::network::irssi { 'ttytter', 'libterm-readkey-perl', ]: - ensure => present, + ensure => absent, } package { [ @@ -33,10 +33,6 @@ class nodo::utils::network::irssi { package { [ 'irssi-plugin-silc', ]: - ensure => $::lsbdistcodename ? { - 'wheezy' => absent, - 'jessie' => absent, - default => absent, - } + ensure => absent, } } diff --git a/manifests/utils/network/wicd.pp b/manifests/utils/network/wicd.pp index 898e043..065d5bb 100644 --- a/manifests/utils/network/wicd.pp +++ b/manifests/utils/network/wicd.pp @@ -2,7 +2,7 @@ class nodo::utils::network::wicd { package { [ 'wicd', 'wicd-curses', - 'wicd-gtk', + #'wicd-gtk', ]: ensure => installed, } diff --git a/manifests/utils/network/xmpp.pp b/manifests/utils/network/xmpp.pp new file mode 100644 index 0000000..7c019cc --- /dev/null +++ b/manifests/utils/network/xmpp.pp @@ -0,0 +1,12 @@ +class nodo::utils::network::xmpp { + package { [ + 'pidgin', + 'pidgin-encryption', + 'pidgin-openpgp', + 'pidgin-otr', + 'pidgin-privacy-please', + 'pidgin-plugin-pack', + ]: + ensure => absent, + } +} diff --git a/manifests/utils/office.pp b/manifests/utils/office.pp index 978efe8..d8a2b1c 100644 --- a/manifests/utils/office.pp +++ b/manifests/utils/office.pp @@ -1,47 +1,30 @@ class nodo::utils::office { - # Office + # Console package { [ 'vim-gtk', - 'gobby', - 'libreoffice', 'sc', 'antiword', 'unrtf', 'pandoc', 'wyrd', - 'gnucash', - 'worklog', - 'pdftk', - 'fbreader', 'pdfgrep', 'mat', - 'evince', - 'aewan', - 'autocutsel', - 'parcellite', + #'worklog', ]: ensure => installed, } - # Finance + # GUI package { [ - 'ledger', - 'clipf', - 'misery', - ]: - ensure => present, - } - - # LaTeX - package { [ - 'texlive-latex-base', - 'texlive-latex-recommended', - 'texlive-latex-extra', - 'texlive-fonts-extra', - 'vim-latexsuite', - 'pdfjam', + 'gobby', + 'libreoffice', + 'zathura', + 'fbreader', + #'pdftk', + #'evince', + #'aewan', ]: - ensure => present, + ensure => installed, } # Not in use diff --git a/manifests/utils/personal/bundle.pp b/manifests/utils/personal/bundle.pp deleted file mode 100644 index 695bfa4..0000000 --- a/manifests/utils/personal/bundle.pp +++ /dev/null @@ -1,12 +0,0 @@ -class nodo::utils::personal::bundle { - include nodo::utils::suckless - include nodo::utils::office - include nodo::utils::printer - include nodo::utils::interface - include nodo::utils::network - include nodo::utils::development - include nodo::utils::security - include nodo::utils::multimedia - include nodo::utils::java - include nodo::utils::storage::archive -} diff --git a/manifests/utils/personal/debian.pp b/manifests/utils/personal/debian.pp index ea8550a..91f6193 100644 --- a/manifests/utils/personal/debian.pp +++ b/manifests/utils/personal/debian.pp @@ -10,7 +10,7 @@ class nodo::utils::personal::debian { 'libpam-mount', 'gawk', 'laptop-detect', - 'mtp-tools', + #'mtp-tools', ]: ensure => installed, } @@ -23,7 +23,7 @@ class nodo::utils::personal::debian { 'funcoeszz', 'detox', ]: - ensure => installed, + ensure => absent, } # Console window managers @@ -31,7 +31,7 @@ class nodo::utils::personal::debian { # 'screenie', # 'iselect', # 'byobu', - # ]: + #]: # ensure => installed, #} diff --git a/manifests/utils/personal/poweruser.pp b/manifests/utils/personal/poweruser.pp new file mode 100644 index 0000000..db81a42 --- /dev/null +++ b/manifests/utils/personal/poweruser.pp @@ -0,0 +1,10 @@ +# 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 new file mode 100644 index 0000000..73ad271 --- /dev/null +++ b/manifests/utils/personal/standard.pp @@ -0,0 +1,7 @@ +# 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 +} diff --git a/manifests/utils/security.pp b/manifests/utils/security.pp index 953581c..7044dd1 100644 --- a/manifests/utils/security.pp +++ b/manifests/utils/security.pp @@ -1,47 +1,29 @@ class nodo::utils::security inherits nodo::utils::security::base { # Security package { [ - 'apg', - 'gnupg-agent', - 'makepasswd', 'pwgen', - 'fpm2', - 'encfs', 'signing-party', 'libnss3-tools', 'ssss', - 'libgfshare-bin', - 'pass', 'revelation', 'onetime', 'gnupg2', - 'monkeysign', 'gnutls-bin', + 'gnupg-agent', + #'kedpm', + #'kedpm-gtk', + #'apg', + #'makepasswd', + #'keepassx', + #'monkeysign', + #'fpm2', + #'encfs', + #'libgfshare-bin', + #'pass', + #'harden', + #'paperkey', + #'keyringer', ]: ensure => installed, } - - # Soon :) - #package { [ - # 'keyringer', - #]: - # ensure => present, - #} - - # To be evaluated - #package { [ - # 'harden', - # 'paperkey', - #]: - # ensure => present, - #} - - if $::lsbdistcodename != 'squeeze' { - package { [ - 'kedpm', - 'kedpm-gtk', - ]: - ensure => installed, - } - } } diff --git a/manifests/utils/security/base.pp b/manifests/utils/security/base.pp index ab376ea..b639e8c 100644 --- a/manifests/utils/security/base.pp +++ b/manifests/utils/security/base.pp @@ -1,15 +1,9 @@ class nodo::utils::security::base { package { [ 'keychain', - 'gnupg-curl', + 'gnupg-curl', + #'hopenpgp-tools', ]: ensure => present, } - - # TODO: currently just available on jessie onwards - #package { [ - # 'hopenpgp-tools', - #]: - # ensure => present, - #} } diff --git a/manifests/utils/storage/archive.pp b/manifests/utils/storage/archive.pp index cd670dc..4082fe2 100644 --- a/manifests/utils/storage/archive.pp +++ b/manifests/utils/storage/archive.pp @@ -5,12 +5,13 @@ class nodo::utils::storage::archive { ensure => latest, } + # Not in use package { [ 'jigdo-file', 'fdupes', 'gddrescue', ]: - ensure => installed, + ensure => absent, } package { [ diff --git a/manifests/utils/suckless.pp b/manifests/utils/suckless.pp index dc27fa0..b17dc34 100644 --- a/manifests/utils/suckless.pp +++ b/manifests/utils/suckless.pp @@ -8,7 +8,6 @@ class nodo::utils::suckless { 'xvt', 'uzbl', 'xxxterm', - 'zathura', 'stterm', ]: ensure => installed, diff --git a/manifests/utils/web.pp b/manifests/utils/web.pp index cbce7d2..1e5ad53 100644 --- a/manifests/utils/web.pp +++ b/manifests/utils/web.pp @@ -1,9 +1,6 @@ # Common utilities for web class nodo::utils::web inherits nodo::utils::http { package { [ - 'ffmpeg', - 'flvtool2', - 'rake', 'libxml2', 'libxml2-dev', 'libxslt1-dev', @@ -13,6 +10,9 @@ class nodo::utils::web inherits nodo::utils::http { 'apache2-prefork-dev', 'goaccess', 'apachetop', + #'ffmpeg', + #'flvtool2', + #'rake', ]: ensure => installed, } -- cgit v1.2.3