Add rssh add-shell command, fix dependency
authorJan Dittberner <jandd@cacert.org>
Fri, 2 Aug 2019 14:16:38 +0000 (16:16 +0200)
committerJan Dittberner <jandd@cacert.org>
Fri, 2 Aug 2019 14:16:38 +0000 (16:16 +0200)
sitemodules/profiles/manifests/debarchive.pp

index 50c802b..ed9deaf 100644 (file)
@@ -67,6 +67,11 @@ class profiles::debarchive (
     group  => 'root',
     mode   => '4755',
   }
+  exec { 'add rssh to list of valid shells':
+    command => '/usr/sbin/add-shell /usr/bin/rssh',
+    unless  => '/bin/grep -q rss /etc/shells',
+    require => Package['rssh'],
+  }
 
   # setup user, groups and directories
   group { 'debarchive':
@@ -198,6 +203,7 @@ class profiles::debarchive (
     command => "/usr/bin/gpg --export --export-options export-minimal \"${release_signing_keyid}\" > ${archive_public_key}",
     creates => $archive_public_key,
     require => [
+      File[$package_dir],
       File["${gpg_home}/gpg.conf"],
       File["${gpg_home}/gpg-agent.conf"],
       File[$release_signing_private_key_file],