diff options
| author | Colin Guthrie <colin@mageia.org> | 2013-12-05 13:42:52 +0000 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2013-12-05 13:42:52 +0000 |
| commit | 56561423af97ae8aefa1d28498f72c95cb51df62 (patch) | |
| tree | 224847bc9a249329f061e1ab7b4caea90f610b42 | |
| parent | 595a8caa2e1afbc5b3ccb122f4ef3e2fe30fea8d (diff) | |
| download | puppet-56561423af97ae8aefa1d28498f72c95cb51df62.tar puppet-56561423af97ae8aefa1d28498f72c95cb51df62.tar.gz puppet-56561423af97ae8aefa1d28498f72c95cb51df62.tar.bz2 puppet-56561423af97ae8aefa1d28498f72c95cb51df62.tar.xz puppet-56561423af97ae8aefa1d28498f72c95cb51df62.zip | |
Add mgaonline to the freeze exception pkg regexp
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 2 | ||||
| -rwxr-xr-x | modules/openssh/templates/ldap-sshkey2file.py | 2 |
2 files changed, 3 insertions, 1 deletions
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() |