diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2014-07-29 17:08:50 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2014-07-29 18:16:23 +0300 |
commit | d745c522f462e01aa576c6f93b94cbad6c631f73 (patch) | |
tree | 854738e411b0f993ecaea3d5d3fb05280a621642 /lib | |
parent | ba7a48a2b88b33c6c49511fd4422d255264fac98 (diff) | |
download | gitaclhook-d745c522f462e01aa576c6f93b94cbad6c631f73.tar.gz gitaclhook-d745c522f462e01aa576c6f93b94cbad6c631f73.tar.bz2 |
Change namespace for the configuration variables: hooks.acl.*
Diffstat (limited to 'lib')
-rw-r--r-- | lib/GitACL.pm | 14 | ||||
-rw-r--r-- | lib/GitACL/File.pm | 2 | ||||
-rw-r--r-- | lib/GitACL/LDAP.pm | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/lib/GitACL.pm b/lib/GitACL.pm index 9cd381d..cde9624 100644 --- a/lib/GitACL.pm +++ b/lib/GitACL.pm @@ -75,3 +75,3 @@ sub default_rule($) { my $self = shift; - my $def = GitACL::git_value('config', 'hooks.acldefault'); + my $def = GitACL::git_value('config', 'hooks.acl.default'); my $msg = "default rule"; @@ -112,3 +112,3 @@ sub match_primary_group($$) { my ($user_name,$group_name) = @_; - my ($name,$passwd,$uid,$gid,$members) = getpwnam($user_name) or return 0; + my ($name,$passwd,$uid,$gid) = getpwnam($user_name) or return 0; ($name) = getgrgid($gid) or return 0; @@ -192,3 +192,3 @@ sub new { } else { - $obj->{debug} = git_value('config', '--bool', 'hooks.acldebug') || + $obj->{debug} = git_value('config', '--bool', 'hooks.acl.debug') || $ENV{GIT_UPDATE_DEBUG} > 0; @@ -199,3 +199,3 @@ sub new { } else { - $obj->{logfile} = git_value('config', 'hooks.acllog'); + $obj->{logfile} = git_value('config', 'hooks.acl.log'); } @@ -208,3 +208,3 @@ sub new { } elsif (!$obj->{debug}) { - $obj->{quiet} = git_value('config', 'hooks.aclquiet'); + $obj->{quiet} = git_value('config', 'hooks.acl.quiet'); } @@ -218,3 +218,3 @@ sub new { $obj->deny("no such user") unless $obj->{user_name}; - my $httpdusr = git_value('config', 'hooks.httpd-user'); + my $httpdusr = git_value('config', 'hooks.acl.httpd-user'); if (defined($httpdusr) and $obj->{user_name} eq $httpdusr) { @@ -263,3 +263,3 @@ sub check { - my $type = git_value('config', 'hooks.acltype'); + my $type = git_value('config', 'hooks.acl.type'); $type = "File" unless $type; diff --git a/lib/GitACL/File.pm b/lib/GitACL/File.pm index efabfd4..f72c16d 100644 --- a/lib/GitACL/File.pm +++ b/lib/GitACL/File.pm @@ -25,3 +25,3 @@ sub check_acl { - my $filename = GitACL::git_value('config', 'hooks.aclfile'); + my $filename = GitACL::git_value('config', 'hooks.acl.file'); $self->allow("no ACL configured for ".$self->{project_name}) diff --git a/lib/GitACL/LDAP.pm b/lib/GitACL/LDAP.pm index 22bfd8d..ac8fd06 100644 --- a/lib/GitACL/LDAP.pm +++ b/lib/GitACL/LDAP.pm @@ -23,3 +23,3 @@ sub parse_ldap_conf { my $self = shift; - my $filename = GitACL::git_value('config', 'hooks.aclldapconf') || + my $filename = GitACL::git_value('config', 'hooks.acl.ldapconf') || "/etc/ldap.conf"; |