Merge branch 'master' into feature/autoload

15 files changed, 81 insertions, 21 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index ae4b8b2..721ed93 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -17,6 +17,10 @@ $location = hiera('nodo::location', 'default')
 # Import required modules
 import "common"
 
+# Modules that still doesn't support autoloading
+import 'dhcp'
+import 'virtual'
+
 # Nodo class
 import "nodo.pp"
 
diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index 93f7ff7..0f5ba04 100644
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -18,6 +18,7 @@ class nodo::role::mail {
   package { 'libcache-cache-perl':  # needed by munin mysql plugin
     ensure => present,
   }
+
   munin::plugin { [ 'mysql_queries', 'mysql_slowqueries', 'mysql_bytes', 'mysql_threads' ]:
     config => "user root\nenv.mysqlopts --defaults-extra-file=/etc/mysql/debian.cnf",
     ensure => $virtual ? {
diff --git a/manifests/role/proxy.pp b/manifests/role/proxy.pp
index ef9c86c..9c6186d 100644
--- a/manifests/role/proxy.pp
+++ b/manifests/role/proxy.pp
@@ -1,5 +1,17 @@
 class nodo::role::proxy inherits nodo::base::vserver {
-  include nginx
+  class { 'nginx': }
+
+  ssl::cert { "$::domain":
+    notify => Service['nginx'],
+  }
+
+  # For SNI
+  # TODO: generate automatically
+  ssl::cert { "example.org":
+    #generate => true,
+    verify => false,
+    notify => Service['nginx'],
+  }
 
   # Graph nginx
   munin::plugin { [ 'nginx_request', 'nginx_status' ]:
diff --git a/manifests/utils/bitcoin.pp b/manifests/utils/bitcoin.pp
new file mode 100644
index 0000000..c287bbc
--- /dev/null
+++ b/manifests/utils/bitcoin.pp
@@ -0,0 +1,10 @@
+class nodo::utils::bitcoin {
+  package { 'electrum':
+    ensure  => present,
+  }
+
+  # To be considered
+  #package { 'armory':
+  #  ensure  => present,
+  #}
+}
diff --git a/manifests/utils/development/ide.pp b/manifests/utils/development/ide.pp
index 4fd8412..4e62c2b 100644
--- a/manifests/utils/development/ide.pp
+++ b/manifests/utils/development/ide.pp
@@ -1,15 +1,26 @@
 class nodo::utils::development::ide {
-  package { [ 'exuberant-ctags', 'pnopaste-cli', 'ditz', 'mr', 'doxygen', 'agave', 'hexedit', 'ack-grep' ]:
+  package { [ 'exuberant-ctags', 'mr', 'doxygen', 'agave', 'hexedit', 'ack-grep', 'markdown' ]:
     ensure => installed,
   }
 
   # To be considered
-  # package { [ 'ttyrec', 'taskwarrior' ]:
-  #   ensure => installed,
-  # }
-
-  # Not available
-  #package { [ 'bugs-everywhere', 'silversearcher-ag' ]:
-  #  ensure => installed,
+  #package { [ 'ticgit', 'ticgitweb' ]:
+  #  ensure  => present,
   #}
+
+  # Old packages
+  package { [ 'ditz', 'pnopaste-cli' ]:
+    ensure  => $::lsbdistcodename ? {
+      'wheezy' => present,
+      default  => absent,
+    },
+  }
+
+  # Jessie onwards
+  package { [ 'ttyrec', 'taskwarrior', 'bugs-everywhere', 'silversearcher-ag' ]:
+    ensure => $::lsbdistcodename ? {
+      'wheezy' => absent,
+      default  => present,
+    },
+  }
 }
diff --git a/manifests/utils/development/mediawiki.pp b/manifests/utils/development/mediawiki.pp
new file mode 100644
index 0000000..5ba5b55
--- /dev/null
+++ b/manifests/utils/development/mediawiki.pp
@@ -0,0 +1,8 @@
+class nodo::utils::development::mediawiki {
+  package { 'git-mediawiki':
+    ensure  => $::lsbdistcodename ? {
+      'wheezy' => absent,
+      default  => present,
+    }
+  }
+}
diff --git a/manifests/utils/development/php.pp b/manifests/utils/development/php.pp
index 608869a..6145248 100644
--- a/manifests/utils/development/php.pp
+++ b/manifests/utils/development/php.pp
@@ -1,5 +1,13 @@
 class nodo::utils::development::php {
-  package { 'php5-xdebug':
+  package { [ 'php5-xdebug', 'phpunit' ]:
     ensure  => present,
   }
+
+  # Jessie onwards
+  package { 'phpunit-git':
+    ensure => $::lsbdistcodename ? {
+      'wheezy' => absent,
+      default  => present,
+    },
+  }
 }
diff --git a/manifests/utils/development/virtual.pp b/manifests/utils/development/virtual.pp
index 57b0d6b..771f342 100644
--- a/manifests/utils/development/virtual.pp
+++ b/manifests/utils/development/virtual.pp
@@ -6,7 +6,7 @@ class nodo::utils::development::virtual {
     }
   }
 
-  package { [ 'virtualbox-guest-additions-iso', 'qemu', 'qemu-kvm' ]:
+  package { [ 'virtualbox-guest-additions-iso', 'qemu', 'qemu-kvm', 'virtualbox-guest-x11' ]:
     ensure => latest,
   }
 
diff --git a/manifests/utils/interface.pp b/manifests/utils/interface.pp
index 90d6020..1a1d265 100644
--- a/manifests/utils/interface.pp
+++ b/manifests/utils/interface.pp
@@ -1,10 +1,10 @@
 class nodo::utils::interface inherits nodo::utils::interface::console {
   # Interface
   package { [ 'awesome',          'eterm',             'weather-util', 'gnome-terminal', 'conky',
-              'xterm',            'xscreensaver',      'thunar',       'x11-apps',
+              'xterm',            'xscreensaver',      'thunar',       'x11-apps',       'conky-all',
               'gtk-theme-switch', 'gtk-smooth-themes', 'rxvt',         'lxappearance',
               'xtitle',           'xclip',             'pcmanfm',      'awesome-extra',  'numlockx',
-              'metar',            'wmctrl',            'xsel',         'xinput' ]:
+              'metar',            'wmctrl',            'xsel',         'xinput',         'i3' ]:
     ensure => installed,
   }
 
diff --git a/manifests/utils/java.pp b/manifests/utils/java.pp
index e0ea088..bb86593 100644
--- a/manifests/utils/java.pp
+++ b/manifests/utils/java.pp
@@ -10,7 +10,7 @@ class nodo::utils::java {
 
   # Java alternative
   file { "/etc/alternatives/java":
-    ensure  => "/usr/lib/jvm/java-6-openjdk-amd64/jre/bin/java",
+    ensure  => hiera('nodo::utils::java::alternative', '/usr/lib/jvm/java-6-openjdk-amd64/jre/bin/java'),
     owner   => root,
     group   => root,
     require => Package['default-jre'],
diff --git a/manifests/utils/multimedia.pp b/manifests/utils/multimedia.pp
index 26d771e..12f537d 100644
--- a/manifests/utils/multimedia.pp
+++ b/manifests/utils/multimedia.pp
@@ -9,7 +9,7 @@ class nodo::utils::multimedia inherits nodo::utils::multimedia::minimal {
               'cbrpager',        'llgal',               'darksnow',           'pavucontrol',
               'picard',          'ffmpeg2theora',       'oggfwd',             'jhead',
               'gxine',           'totem',               'faad',               'gmtp',
-              'gphotofs',        'jmtpfs',              'mediainfo' ]:
+              'gphotofs',        'jmtpfs' ]:
     ensure => installed,
   }
 
diff --git a/manifests/utils/multimedia/minimal.pp b/manifests/utils/multimedia/minimal.pp
index b6562c4..c54a7d3 100644
--- a/manifests/utils/multimedia/minimal.pp
+++ b/manifests/utils/multimedia/minimal.pp
@@ -1,5 +1,5 @@
 class nodo::utils::multimedia::minimal {
-  package { [ 'mplayer', 'alsa-utils', 'mpg123' ]:
+  package { [ 'mplayer', 'alsa-utils', 'mpg123', 'mediainfo' ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/multimedia/shockwave.pp b/manifests/utils/multimedia/shockwave.pp
index d7dc1d6..a0d644d 100644
--- a/manifests/utils/multimedia/shockwave.pp
+++ b/manifests/utils/multimedia/shockwave.pp
@@ -1,4 +1,5 @@
 class nodo::utils::multimedia::shockwave {
+  # See also https://github.com/i-rinat/freshplayerplugin
   package { 'flashplugin-nonfree':
     ensure => installed ,
   }
diff --git a/manifests/utils/network.pp b/manifests/utils/network.pp
index c445277..20d0f2b 100644
--- a/manifests/utils/network.pp
+++ b/manifests/utils/network.pp
@@ -12,7 +12,7 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
               'avahi-discover',     'mdns-scan',             'davfs2',
               'surfraw',            'w3m',                   'mailplate',
               'geoip-bin',          'luakit',                'ssvnc',
-              'rig' ]:
+              'rig',                'sup-mail',              'iceweasel-vimperator' ]:
     ensure => installed,
   }
 
@@ -25,17 +25,17 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
 
   # Old packages
   # 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
   package { [ 'silc', 'twinkle', 'konqueror', 'transmission', 'amule', 'epiphany-browser',
-              'bittorrent', 'bittornado', 'xul-ext-firegpg' ]:
+              'bittorrent', 'bittornado', 'xul-ext-firegpg',  'xul-ext-adblock-plus' ]:
     ensure => absent,
   }
 
   # Squeeze (or newer) packages
   if $::lsbdistcodename != 'lenny' {
     package { [ 'xul-ext-monkeysphere', 'chromium-browser', 'libical-parser-perl',
-                'maildir-utils',        'icedtea6-plugin',  'xul-ext-adblock-plus',
-                'xul-ext-noscript',     'xul-ext-firebug',  'msva-perl',
-                'chromium-l10n' ]:
+                'maildir-utils',        'icedtea6-plugin',  'xul-ext-noscript',
+                'xul-ext-firebug',      'msva-perl',        'chromium-l10n' ]:
       ensure => installed,
     }
 
diff --git a/manifests/utils/security.pp b/manifests/utils/security.pp
index 7d73365..6ab8d18 100644
--- a/manifests/utils/security.pp
+++ b/manifests/utils/security.pp
@@ -11,6 +11,11 @@ class nodo::utils::security inherits nodo::utils::security::base {
   #  ensure => present,
   #}
 
+  # To be evaluated
+  #package { [ 'harden', 'paperkey' ]:
+  #  ensure  => present,
+  #}
+
   if $::lsbdistcodename != 'squeeze' {
     package { [ 'kedpm', 'kedpm-gtk' ]:
       ensure => installed,