Read repo-info from /etc/cgitrc
This makes cgit read all repo-info from the configfile, instead of scanning for possible git-dirs below a common root path. This is primarily done to get better security (separate physical path from logical repo-name). In /etc/cgitrc each repo is registered with the following keys: repo.url repo.name repo.path repo.desc repo.owner Note: *Required keys are repo.url and repo.path, all others are optional *Each occurrence of repo.url starts a new repository registration *Default value for repo.name is taken from repo.url *The value of repo.url cannot contain characters with special meaning for urls (i.e. one of /?%&), while repo.name can contain anything. Example: repo.url=cgit-pub repo.name=cgit/public repo.path=/pub/git/cgit repo.desc=My public cgit repo repo.owner=Lars Hjemli repo.url=cgit-priv repo.name=cgit/private repo.path=/home/larsh/src/cgit/.git repo.desc=My private cgit repo repo.owner=Lars Hjemli Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
41
shared.c
41
shared.c
@ -8,7 +8,9 @@
|
||||
|
||||
#include "cgit.h"
|
||||
|
||||
char *cgit_root = "/usr/src/git";
|
||||
struct repolist cgit_repolist;
|
||||
struct repoinfo *cgit_repo;
|
||||
|
||||
char *cgit_root_title = "Git repository browser";
|
||||
char *cgit_css = "/cgit.css";
|
||||
char *cgit_logo = "/git-logo.png";
|
||||
@ -46,11 +48,32 @@ int cgit_query_ofs = 0;
|
||||
|
||||
int htmlfd = 0;
|
||||
|
||||
struct repoinfo *add_repo(const char *url)
|
||||
{
|
||||
struct repoinfo *ret;
|
||||
|
||||
if (++cgit_repolist.count > cgit_repolist.length) {
|
||||
if (cgit_repolist.length == 0)
|
||||
cgit_repolist.length = 8;
|
||||
else
|
||||
cgit_repolist.length *= 2;
|
||||
cgit_repolist.repos = xrealloc(cgit_repolist.repos,
|
||||
cgit_repolist.length *
|
||||
sizeof(struct repoinfo));
|
||||
}
|
||||
|
||||
ret = &cgit_repolist.repos[cgit_repolist.count-1];
|
||||
ret->url = xstrdup(url);
|
||||
ret->name = ret->url;
|
||||
ret->path = NULL;
|
||||
ret->desc = NULL;
|
||||
ret->owner = NULL;
|
||||
return ret;
|
||||
}
|
||||
|
||||
void cgit_global_config_cb(const char *name, const char *value)
|
||||
{
|
||||
if (!strcmp(name, "root"))
|
||||
cgit_root = xstrdup(value);
|
||||
else if (!strcmp(name, "root-title"))
|
||||
if (!strcmp(name, "root-title"))
|
||||
cgit_root_title = xstrdup(value);
|
||||
else if (!strcmp(name, "css"))
|
||||
cgit_css = xstrdup(value);
|
||||
@ -74,6 +97,16 @@ void cgit_global_config_cb(const char *name, const char *value)
|
||||
cgit_cache_dynamic_ttl = atoi(value);
|
||||
else if (!strcmp(name, "max-message-length"))
|
||||
cgit_max_msg_len = atoi(value);
|
||||
else if (!strcmp(name, "repo.url"))
|
||||
cgit_repo = add_repo(value);
|
||||
else if (!strcmp(name, "repo.name"))
|
||||
cgit_repo->name = xstrdup(value);
|
||||
else if (cgit_repo && !strcmp(name, "repo.path"))
|
||||
cgit_repo->path = xstrdup(value);
|
||||
else if (cgit_repo && !strcmp(name, "repo.desc"))
|
||||
cgit_repo->desc = xstrdup(value);
|
||||
else if (cgit_repo && !strcmp(name, "repo.owner"))
|
||||
cgit_repo->owner = xstrdup(value);
|
||||
}
|
||||
|
||||
void cgit_repo_config_cb(const char *name, const char *value)
|
||||
|
Reference in New Issue
Block a user