From 56561423af97ae8aefa1d28498f72c95cb51df62 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Thu, 5 Dec 2013 13:42:52 +0000 Subject: Add mgaonline to the freeze exception pkg regexp --- deployment/mga_buildsystem/manifests/config.pp | 2 +- modules/openssh/templates/ldap-sshkey2file.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index 8ee24b9a..4f15d739 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -393,7 +393,7 @@ class mga_buildsystem::config { $cauldron_authorized_users = str_join(group_members('mga-release_managers'), '|') $cauldron_version_check = { 'authorized_sections' => '^[a-z]+/updates_testing$', - 'authorized_packages' => 'drak|^(urpmi|perl-URPM|perl-(Gtk3|Glib))$', + 'authorized_packages' => 'drak|^(urpmi|perl-URPM|perl-(Gtk3|Glib)|mgaonline)$', 'authorized_arches' => 'none', 'authorized_users' => "^${cauldron_authorized_users}\$", #'mode' => 'normal', diff --git a/modules/openssh/templates/ldap-sshkey2file.py b/modules/openssh/templates/ldap-sshkey2file.py index e393e29b..f0a61eed 100755 --- a/modules/openssh/templates/ldap-sshkey2file.py +++ b/modules/openssh/templates/ldap-sshkey2file.py @@ -70,6 +70,8 @@ def write_keys(keys, user, uid, gid): os.chown(keyfile, uid, gid) os.chmod("%s/%s/.ssh" % (keypathprefix,user), 0700) os.chown("%s/%s/.ssh" % (keypathprefix,user), uid, gid) + os.chmod("%s/%s" % (keypathprefix,user), 0700) + os.chown("%s/%s" % (keypathprefix,user), uid, gid) if len(sys.argv) != 1: usage() -- cgit v1.2.1