Utils: reorder and cleanup

1 files changed, 14 insertions, 32 deletions

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,
-    }
-  }
 }