From e7095ede6c97eba6df4c4d161cf3512a79158096 Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Mon, 2 Apr 2012 11:05:15 +0000
Subject: clean softwarekey module

---
 deployment/softwarekey/manifests/init.pp | 41 +++++++++++++++-----------------
 1 file changed, 19 insertions(+), 22 deletions(-)

(limited to 'deployment/softwarekey')

diff --git a/deployment/softwarekey/manifests/init.pp b/deployment/softwarekey/manifests/init.pp
index d07e8276..41102b4e 100644
--- a/deployment/softwarekey/manifests/init.pp
+++ b/deployment/softwarekey/manifests/init.pp
@@ -1,28 +1,25 @@
 class softwarekey {
-    class variable {
-	$sign_login = "softwarekey"
-	$sign_home_dir = "/var/lib/$sign_login"
-	$sign_keydir = "$sign_home_dir/keys"
-    }
+    $sign_login = 'softwarekey'
+    $sign_home_dir = "/var/lib/$sign_login"
+    $sign_keydir = "$sign_home_dir/keys"
 
-    class base inherits variable {
-        group {"$sign_login": }
+    group { $sign_login: }
 
-	user {"$sign_login":
-	    comment => "System user to sign Mageia Software",
-	    home => $sign_home_dir,
-	    gid => $sign_login,
-	    require => Group[$sign_login],
-	}
+    user { $sign_login:
+        comment => 'System user to sign Mageia Software',
+        home    => $sign_home_dir,
+        gid     => $sign_login,
+        require => Group[$sign_login],
+    }
 
-	gnupg::keys{"software":
-	    email => "software@$domain",
-	    #FIXME there should be a variable somewhere to change the name of the distribution
-	    key_name => 'Mageia Software',
-	    login => $sign_login,
-	    batchdir => "$sign_home_dir/batches",
-	    keydir => $sign_keydir,
-	    require => User[$sign_login],
-	}
+    gnupg::keys{ 'software':
+        email    => "software@$::domain",
+        #FIXME there should be a variable somewhere to change the
+        # name of the distribution
+        key_name => 'Mageia Software',
+        login    => $sign_login,
+        batchdir => "$sign_home_dir/batches",
+        keydir   => $sign_keydir,
+        require  => User[$sign_login],
     }
 }
-- 
cgit v1.2.1