diff options
Diffstat (limited to 'deployment/softwarekey')
| -rw-r--r-- | deployment/softwarekey/manifests/init.pp | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/deployment/softwarekey/manifests/init.pp b/deployment/softwarekey/manifests/init.pp index d07e8276..b2c4bcb2 100644 --- a/deployment/softwarekey/manifests/init.pp +++ b/deployment/softwarekey/manifests/init.pp @@ -1,28 +1,24 @@ 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: + 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], } } |