aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-09-23 20:21:41 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-09-23 20:21:41 -0300
commit0427a314c3b8bef2a46dac43f7bea41eb33612fd (patch)
tree8caf5c5d1181f50a89413598f99c3351ad12cb94 /manifests
parentdb03a0e084e5f15fe67a7de1d4fbec0d9a404536 (diff)
downloadpuppet-nodo-0427a314c3b8bef2a46dac43f7bea41eb33612fd.tar.gz
puppet-nodo-0427a314c3b8bef2a46dac43f7bea41eb33612fd.tar.bz2
Utils: more cleanup and organization
Diffstat (limited to 'manifests')
-rw-r--r--manifests/utils/bundle/poweruser.pp4
-rw-r--r--manifests/utils/bundle/standard.pp3
-rw-r--r--manifests/utils/development/virtual.pp16
-rw-r--r--manifests/utils/interface.pp16
-rw-r--r--manifests/utils/network.pp64
-rw-r--r--manifests/utils/network/minimal.pp2
-rw-r--r--manifests/utils/office.pp28
-rw-r--r--manifests/utils/office/console.pp15
-rw-r--r--manifests/utils/office/gui.pp13
-rw-r--r--manifests/utils/web/console.pp10
-rw-r--r--manifests/utils/web/gui.pp45
-rw-r--r--manifests/utils/web/hardened.pp (renamed from manifests/utils/browser/hardened.pp)2
12 files changed, 107 insertions, 111 deletions
diff --git a/manifests/utils/bundle/poweruser.pp b/manifests/utils/bundle/poweruser.pp
index b4a20b2..51021c2 100644
--- a/manifests/utils/bundle/poweruser.pp
+++ b/manifests/utils/bundle/poweruser.pp
@@ -1,6 +1,7 @@
# Bundle for power users
class nodo::utils::bundle::poweruser {
- include nodo::utils::office
+ include nodo::utils::office::console
+ include nodo::utils::office::gui
include nodo::utils::interface
include nodo::utils::development
include nodo::utils::security
@@ -9,4 +10,5 @@ class nodo::utils::bundle::poweruser {
include nodo::utils::multimedia
include nodo::utils::monkeysphere
include nodo::utils::network::mail
+ include nodo::utils::web::console
}
diff --git a/manifests/utils/bundle/standard.pp b/manifests/utils/bundle/standard.pp
index b63c976..35bb586 100644
--- a/manifests/utils/bundle/standard.pp
+++ b/manifests/utils/bundle/standard.pp
@@ -1,7 +1,8 @@
# Bundle with standard packages
class nodo::utils::bundle::pc {
- include nodo::utils::office
+ include nodo::utils::office::gui
include nodo::utils::printer
include nodo::utils::network
include nodo::utils::network::xmpp
+ include nodo::utils::web::gui
}
diff --git a/manifests/utils/development/virtual.pp b/manifests/utils/development/virtual.pp
index c7f930b..362e856 100644
--- a/manifests/utils/development/virtual.pp
+++ b/manifests/utils/development/virtual.pp
@@ -1,21 +1,13 @@
class nodo::utils::development::virtual {
package { [
'vagrant',
- #'docker.io',
- #'packer',
- ]:
- ensure => $::lsbdistcodename ? {
- 'squeeze' => absent,
- default => latest,
- }
- }
-
- package { [
- 'virtualbox-guest-additions-iso',
'qemu',
'qemu-kvm',
+ 'virtualbox-guest-additions-iso',
+ #'docker.io',
+ #'packer',
]:
- ensure => latest,
+ ensure => present,
}
# We're not managing this package as we're favouring the
diff --git a/manifests/utils/interface.pp b/manifests/utils/interface.pp
index a9f3520..20207e6 100644
--- a/manifests/utils/interface.pp
+++ b/manifests/utils/interface.pp
@@ -2,24 +2,24 @@ class nodo::utils::interface inherits nodo::utils::interface::console {
# Interface
package { [
'awesome',
+ 'awesome-extra',
'weather-util',
'conky',
+ 'conky-all',
'xscreensaver',
'x11-apps',
- 'conky-all',
- 'gtk-theme-switch',
- 'gtk-smooth-themes',
- 'lxappearance',
'xdotool',
'xtitle',
'xclip',
- 'pcmanfm',
- 'awesome-extra',
- 'numlockx',
- 'wmctrl',
'xsel',
+ 'numlockx',
'autocutsel',
'parcellite',
+ #'gtk-theme-switch',
+ #'gtk-smooth-themes',
+ #'lxappearance',
+ #'wmctrl',
+ #'pcmanfm',
#'xinput',
#'metar',
#'i3',
diff --git a/manifests/utils/network.pp b/manifests/utils/network.pp
index 4fa6a54..4a31103 100644
--- a/manifests/utils/network.pp
+++ b/manifests/utils/network.pp
@@ -1,44 +1,4 @@
class nodo::utils::network inherits nodo::utils::network::minimal {
- # Misc
- package { [
- 'pssh',
- 'sslscan',
- ]:
- ensure => installed,
- }
-
- # Web
- package { [
- 'links',
- 'elinks',
- 'surfraw',
- 'w3m',
- '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',
- #'davfs2',
- #'ssvnc',
- #'mairix',
- #'openvpn',
- #'nicotine',
- #'sshfs',
- ]:
- ensure => installed,
- }
-
# Not in use
#
# About vimperator, use the addon directly
@@ -47,11 +7,15 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
# See also http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=686087
# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=705999
package { [
+ 'gftp',
'silc',
'twinkle',
'konqueror',
'transmission',
'amule',
+ 'vidalia',
+ 'torchat',
+ 'luakit',
'epiphany-browser',
'bittorrent',
'bittornado',
@@ -64,28 +28,8 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
'xul-ext-greasemonkey',
'iceweasel-vimperator',
'mozilla-firefox-adblock',
- 'vidalia',
- 'torchat',
- 'gftp',
'icedtea6-plugin',
- 'luakit',
]:
ensure => absent,
}
-
- # Browser alternative
- file { "/etc/alternatives/x-www-browser":
- ensure => "/usr/bin/firefox-esr",
- owner => root,
- group => root,
- require => Package['iceweasel'],
- }
-
- # Browser alternative: manpage
- file { "/etc/alternatives/x-www-browser.1.gz":
- ensure => "/usr/share/man/man1/firefox-esr.1.gz",
- owner => root,
- group => root,
- require => Package['iceweasel'],
- }
}
diff --git a/manifests/utils/network/minimal.pp b/manifests/utils/network/minimal.pp
index 940c90c..4c9e1df 100644
--- a/manifests/utils/network/minimal.pp
+++ b/manifests/utils/network/minimal.pp
@@ -6,6 +6,8 @@ class nodo::utils::network::minimal inherits nodo::utils::http {
'unison',
'httrack',
'zsync',
+ 'pssh',
+ 'sslscan',
]:
ensure => installed,
}
diff --git a/manifests/utils/office.pp b/manifests/utils/office.pp
index d8a2b1c..690bde5 100644
--- a/manifests/utils/office.pp
+++ b/manifests/utils/office.pp
@@ -1,32 +1,4 @@
class nodo::utils::office {
- # Console
- package { [
- 'vim-gtk',
- 'sc',
- 'antiword',
- 'unrtf',
- 'pandoc',
- 'wyrd',
- 'pdfgrep',
- 'mat',
- #'worklog',
- ]:
- ensure => installed,
- }
-
- # GUI
- package { [
- 'gobby',
- 'libreoffice',
- 'zathura',
- 'fbreader',
- #'pdftk',
- #'evince',
- #'aewan',
- ]:
- ensure => installed,
- }
-
# Not in use
package { [
'kalarm',
diff --git a/manifests/utils/office/console.pp b/manifests/utils/office/console.pp
new file mode 100644
index 0000000..a30aaeb
--- /dev/null
+++ b/manifests/utils/office/console.pp
@@ -0,0 +1,15 @@
+class nodo::utils::office::console {
+ package { [
+ 'vim-gtk',
+ 'wyrd',
+ 'sc',
+ 'antiword',
+ 'unrtf',
+ 'pandoc',
+ 'pdfgrep',
+ 'mat',
+ #'worklog',
+ ]:
+ ensure => installed,
+ }
+}
diff --git a/manifests/utils/office/gui.pp b/manifests/utils/office/gui.pp
new file mode 100644
index 0000000..434dede
--- /dev/null
+++ b/manifests/utils/office/gui.pp
@@ -0,0 +1,13 @@
+class nodo::utils::office::gui {
+ package { [
+ 'gobby',
+ 'libreoffice',
+ 'zathura',
+ 'fbreader',
+ #'pdftk',
+ #'evince',
+ #'aewan',
+ ]:
+ ensure => installed,
+ }
+}
diff --git a/manifests/utils/web/console.pp b/manifests/utils/web/console.pp
new file mode 100644
index 0000000..646cb9e
--- /dev/null
+++ b/manifests/utils/web/console.pp
@@ -0,0 +1,10 @@
+class nodo::utils::web::console {
+ package { [
+ 'links',
+ 'elinks',
+ 'surfraw',
+ 'w3m',
+ ]:
+ ensure => installed,
+ }
+}
diff --git a/manifests/utils/web/gui.pp b/manifests/utils/web/gui.pp
new file mode 100644
index 0000000..c87b16d
--- /dev/null
+++ b/manifests/utils/web/gui.pp
@@ -0,0 +1,45 @@
+class nodo::utils::web::gui {
+ # Web: GUI
+ package { [
+ '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',
+ #'davfs2',
+ #'ssvnc',
+ #'mairix',
+ #'openvpn',
+ #'nicotine',
+ #'sshfs',
+ ]:
+ ensure => installed,
+ }
+
+ # Browser alternative
+ file { "/etc/alternatives/x-www-browser":
+ ensure => "/usr/bin/firefox-esr",
+ owner => root,
+ group => root,
+ require => Package['firefox-esr'],
+ }
+
+ # Browser alternative: manpage
+ file { "/etc/alternatives/x-www-browser.1.gz":
+ ensure => "/usr/share/man/man1/firefox-esr.1.gz",
+ owner => root,
+ group => root,
+ require => Package['firefox-esr'],
+ }
+}
diff --git a/manifests/utils/browser/hardened.pp b/manifests/utils/web/hardened.pp
index 47133e1..e5582d6 100644
--- a/manifests/utils/browser/hardened.pp
+++ b/manifests/utils/web/hardened.pp
@@ -1,4 +1,4 @@
-class nodo::utils::browser::hardened {
+class nodo::utils::web::hardened inherits nodo::utils::web::gui {
package { [
'torbrowser-launcher',
'xul-ext-requestpolicy',