Utils: reorder and cleanup

4 files changed, 31 insertions, 66 deletions

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',
   #]: