diff options
Diffstat (limited to 'deployment/releasekey')
| -rw-r--r-- | deployment/releasekey/manifests/init.pp | 47 | ||||
| -rw-r--r-- | deployment/releasekey/templates/sign_checksums | 4 |
2 files changed, 23 insertions, 28 deletions
diff --git a/deployment/releasekey/manifests/init.pp b/deployment/releasekey/manifests/init.pp index 2bf528a3..a3c99526 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"), - } + mga_common::local_script { 'sign_checksums': + content => template('releasekey/sign_checksums'), } } diff --git a/deployment/releasekey/templates/sign_checksums b/deployment/releasekey/templates/sign_checksums index 762dde7b..5edf7e57 100644 --- a/deployment/releasekey/templates/sign_checksums +++ b/deployment/releasekey/templates/sign_checksums @@ -6,6 +6,6 @@ fi directory=$1 cd "$directory" -for chksum in *.md5 *.sha1; do - gpg --homedir "<%= sign_keydir %>" --yes --sign "$chksum" +for chksum in *.md5 *.sha3 *.sha512; do + gpg --homedir "<%= @sign_keydir %>" --yes --sign "$chksum" done |