deac/gitolite
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

patch to make things work under selinux...

Browse source 
...at the cost of some nice warnings

(thanks to Seth Robertson for reporting the issue and then verifying the
fix, since I don't run selinux)
This commit is contained in:
Sitaram Chamarty 2012-03-27 10:31:32 +05:30
parent 2bec551009
commit 9c460a4b9a
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/triggers/post-compile/ssh-authkeys
View file

@ -13,6 +13,9 @@ $|++;
# can be called directly, or as a post-update hook. Since it ignores # can be called directly, or as a post-update hook. Since it ignores
# arguments anyway, it hardly matters. # arguments anyway, it hardly matters.
tsh_try("sestatus");
my $selinux = (tsh_text() =~ /enabled/);
my $ab = `gitolite query-rc -n GL_ADMIN_BASE`; my $ab = `gitolite query-rc -n GL_ADMIN_BASE`;
trace( 2, "'keydir' not found in '$ab'; exiting" ), exit if not -d "$ab/keydir"; trace( 2, "'keydir' not found in '$ab'; exiting" ), exit if not -d "$ab/keydir";
my $akdir = "$ENV{HOME}/.ssh"; my $akdir = "$ENV{HOME}/.ssh";
@ -98,6 +101,7 @@ sub fp {
} }
sub fp_file { sub fp_file {
return $selinux++ if $selinux; # return a unique "fingerprint" to prevent noise
my $f = shift; my $f = shift;
my $fp = `ssh-keygen -l -f '$f'`; my $fp = `ssh-keygen -l -f '$f'`;
chomp($fp); chomp($fp);