aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-03-19 21:13:12 +0000
committerMichael Scherer <misc@mageia.org>2012-03-19 21:13:12 +0000
commit00b8c39dd62e68ca4da09e9812eb6bb8f1b7ebd1 (patch)
tree79039ce702c31d23d461496ee0abf87b31c5a66f
parent90ef87780b14fa59d94002869b8eb07ab5cabff3 (diff)
downloadpuppet-00b8c39dd62e68ca4da09e9812eb6bb8f1b7ebd1.tar
puppet-00b8c39dd62e68ca4da09e9812eb6bb8f1b7ebd1.tar.gz
puppet-00b8c39dd62e68ca4da09e9812eb6bb8f1b7ebd1.tar.bz2
puppet-00b8c39dd62e68ca4da09e9812eb6bb8f1b7ebd1.tar.xz
puppet-00b8c39dd62e68ca4da09e9812eb6bb8f1b7ebd1.zip
simplify and clean releasekey module
-rw-r--r--deployment/releasekey/manifests/init.pp47
-rw-r--r--manifests/nodes/rabbit.pp2
2 files changed, 22 insertions, 27 deletions
diff --git a/deployment/releasekey/manifests/init.pp b/deployment/releasekey/manifests/init.pp
index 2bf528a3..1dc38025 100644
--- a/deployment/releasekey/manifests/init.pp
+++ b/deployment/releasekey/manifests/init.pp
@@ -1,32 +1,27 @@
class releasekey {
- class variable {
- $sign_login = "releasekey"
- $sign_home_dir = "/var/lib/$sign_login"
- $sign_keydir = "$sign_home_dir/keys"
- }
-
- class base inherits variable {
- group {"$sign_login": }
+ $sign_login = 'releasekey'
+ $sign_home_dir = "/var/lib/$sign_login"
+ $sign_keydir = "$sign_home_dir/keys"
+ group { $sign_login: }
- user {"$sign_login":
- comment => "System user to sign Mageia Releases",
- home => $sign_home_dir,
- gid => $sign_login,
- require => Group[$sign_login],
- }
+ user { $sign_login:
+ comment => 'System user to sign Mageia Releases',
+ home => $sign_home_dir,
+ gid => $sign_login,
+ require => Group[$sign_login],
+ }
- gnupg::keys{"release":
- email => "release@$domain",
- #FIXME there should be a variable somewhere to change the name of the distribution
- key_name => 'Mageia Release',
- login => $sign_login,
- batchdir => "$sign_home_dir/batches",
- keydir => $sign_keydir,
- require => User[$sign_login],
- }
+ gnupg::keys{ 'release':
+ email => "release@$::domain",
+ #FIXME there should be a variable somewhere to change the name of the distribution
+ key_name => 'Mageia Release',
+ login => $sign_login,
+ batchdir => "$sign_home_dir/batches",
+ keydir => $sign_keydir,
+ require => User[$sign_login],
+ }
- local_script { "sign_checksums":
- content => template("releasekey/sign_checksums"),
- }
+ local_script { 'sign_checksums':
+ content => template('releasekey/sign_checksums'),
}
}
diff --git a/manifests/nodes/rabbit.pp b/manifests/nodes/rabbit.pp
index 6365b461..238908e4 100644
--- a/manifests/nodes/rabbit.pp
+++ b/manifests/nodes/rabbit.pp
@@ -13,7 +13,7 @@ node rabbit {
include openssh::ssh_keys_from_ldap
include mirror::mageia
include mirror::newrelease
- include releasekey::base
+ include releasekey
youri-check::config {"config_cauldron":
version => "cauldron",