gitweb: Use the config file to set repository owner's name.

Now gitweb checks if gitweb.owner exists before trying to get filesystem's
owner.

Allow to use configuration variable gitweb.owner set the repository owner,
it checks the gitweb.owner, if not set it uses filesystem directory's owner.

Useful when we don't want to maintain project list file, and all
repository directories have to have the same owner (for example when the
same SSH account is shared for all projects, using ssh_acl to control
access instead).

Signed-off-by: Bruno Ribas <ribas@c3sl.ufpr.br>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/gitweb/README b/gitweb/README
index 4c8bedf7449266229e8102efac249e68fd9d8b39..2163071047a0f4a7620eebf2f4e18008f592c049 100644 (file)
--- a/gitweb/README
+++ b/gitweb/README
@@ -233,6 +233,10 @@ You can use the following files in repository:
    Displayed in the project summary page. You can use multiple-valued
    gitweb.url repository configuration variable for that, but the file
    takes precendence.
    Displayed in the project summary page. You can use multiple-valued
    gitweb.url repository configuration variable for that, but the file
    takes precendence.

+ * gitweb.owner
+   You can use the gitweb.owner repository configuration variable to set
+   repository's owner. It is displayed in the project list and summary
+   page. If it's not set, filesystem directory's owner is used.

  * various gitweb.* config variables (in config)
    Read description of %feature hash for detailed list, and some
    descriptions.
  * various gitweb.* config variables (in config)
    Read description of %feature hash for detailed list, and some
    descriptions.

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 8ef2735c5857dd314318cae8839426543c34f8ee..c8fe22a961f8b4618d56c32546cd14f3df8ea24b 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1759,6 +1759,7 @@ sub git_get_project_owner {
        my $owner;
 
        return undef unless $project;
        my $owner;
 
        return undef unless $project;

+       $git_dir = "$projectroot/$project";

 
        if (!defined $gitweb_project_owner) {
                git_get_project_list_from_file();
 
        if (!defined $gitweb_project_owner) {
                git_get_project_list_from_file();


@@ -1767,8 +1768,11 @@ sub git_get_project_owner {
        if (exists $gitweb_project_owner->{$project}) {
                $owner = $gitweb_project_owner->{$project};
        }
        if (exists $gitweb_project_owner->{$project}) {
                $owner = $gitweb_project_owner->{$project};
        }

+       if (!defined $owner){
+               $owner = git_get_project_config('owner');
+       }

        if (!defined $owner) {
        if (!defined $owner) {

-               $owner = get_file_owner("$projectroot/$project");
+               $owner = get_file_owner("$git_dir");

        }
 
        return $owner;
        }
 
        return $owner;