aboutsummaryrefslogtreecommitdiffstats
path: root/deployment/softwarekey/manifests
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-04-02 11:05:15 +0000
committerMichael Scherer <misc@mageia.org>2012-04-02 11:05:15 +0000
commite7095ede6c97eba6df4c4d161cf3512a79158096 (patch)
tree9922a7490817c10c619a6a92afde576af9614244 /deployment/softwarekey/manifests
parent343a1a447dacfa15e9c28a2a186bf61444dafe43 (diff)
downloadpuppet-e7095ede6c97eba6df4c4d161cf3512a79158096.tar
puppet-e7095ede6c97eba6df4c4d161cf3512a79158096.tar.gz
puppet-e7095ede6c97eba6df4c4d161cf3512a79158096.tar.bz2
puppet-e7095ede6c97eba6df4c4d161cf3512a79158096.tar.xz
puppet-e7095ede6c97eba6df4c4d161cf3512a79158096.zip
clean softwarekey module
Diffstat (limited to 'deployment/softwarekey/manifests')
-rw-r--r--deployment/softwarekey/manifests/init.pp41
1 files changed, 19 insertions, 22 deletions
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],
}
}