author | Lars Hjemli <hjemli@gmail.com> | 2006-12-16 12:43:01 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2006-12-16 12:43:01 (UTC) |
commit | 61245ad18545ab09b22e9fcce5e49d5d36bf8176 (patch) (unidiff) | |
tree | d20fb330a904abd0f15c68011eb15fe995eb0fe7 | |
parent | 521dc7a4bf4af6115ffc3a94d447689bbaa22272 (diff) | |
download | cgit-61245ad18545ab09b22e9fcce5e49d5d36bf8176.zip cgit-61245ad18545ab09b22e9fcce5e49d5d36bf8176.tar.gz cgit-61245ad18545ab09b22e9fcce5e49d5d36bf8176.tar.bz2 |
Add cache-root option to /cgit/rc
Somehow, this option was forgotten when parsing the configfile.
Add it.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | shared.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1,88 +1,90 @@ | |||
1 | /* shared.c: global vars + some callback functions | 1 | /* shared.c: global vars + some callback functions |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | 10 | ||
11 | char *cgit_root = "/usr/src/git"; | 11 | char *cgit_root = "/usr/src/git"; |
12 | char *cgit_root_title = "Git repository browser"; | 12 | char *cgit_root_title = "Git repository browser"; |
13 | char *cgit_css = "/cgit.css"; | 13 | char *cgit_css = "/cgit.css"; |
14 | char *cgit_logo = "/git-logo.png"; | 14 | char *cgit_logo = "/git-logo.png"; |
15 | char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; | 15 | char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; |
16 | char *cgit_virtual_root = NULL; | 16 | char *cgit_virtual_root = NULL; |
17 | 17 | ||
18 | char *cgit_cache_root = "/var/cache/cgit"; | 18 | char *cgit_cache_root = "/var/cache/cgit"; |
19 | 19 | ||
20 | int cgit_nocache = 0; | 20 | int cgit_nocache = 0; |
21 | int cgit_max_lock_attempts = 5; | 21 | int cgit_max_lock_attempts = 5; |
22 | int cgit_cache_root_ttl = 5; | 22 | int cgit_cache_root_ttl = 5; |
23 | int cgit_cache_repo_ttl = 5; | 23 | int cgit_cache_repo_ttl = 5; |
24 | int cgit_cache_dynamic_ttl = 5; | 24 | int cgit_cache_dynamic_ttl = 5; |
25 | int cgit_cache_static_ttl = -1; | 25 | int cgit_cache_static_ttl = -1; |
26 | int cgit_cache_max_create_time = 5; | 26 | int cgit_cache_max_create_time = 5; |
27 | 27 | ||
28 | char *cgit_repo_name = NULL; | 28 | char *cgit_repo_name = NULL; |
29 | char *cgit_repo_desc = NULL; | 29 | char *cgit_repo_desc = NULL; |
30 | char *cgit_repo_owner = NULL; | 30 | char *cgit_repo_owner = NULL; |
31 | 31 | ||
32 | int cgit_query_has_symref = 0; | 32 | int cgit_query_has_symref = 0; |
33 | int cgit_query_has_sha1 = 0; | 33 | int cgit_query_has_sha1 = 0; |
34 | 34 | ||
35 | char *cgit_querystring = NULL; | 35 | char *cgit_querystring = NULL; |
36 | char *cgit_query_repo = NULL; | 36 | char *cgit_query_repo = NULL; |
37 | char *cgit_query_page = NULL; | 37 | char *cgit_query_page = NULL; |
38 | char *cgit_query_head = NULL; | 38 | char *cgit_query_head = NULL; |
39 | char *cgit_query_sha1 = NULL; | 39 | char *cgit_query_sha1 = NULL; |
40 | int cgit_query_ofs = 0; | 40 | int cgit_query_ofs = 0; |
41 | 41 | ||
42 | int htmlfd = 0; | 42 | int htmlfd = 0; |
43 | 43 | ||
44 | void cgit_global_config_cb(const char *name, const char *value) | 44 | void cgit_global_config_cb(const char *name, const char *value) |
45 | { | 45 | { |
46 | if (!strcmp(name, "root")) | 46 | if (!strcmp(name, "root")) |
47 | cgit_root = xstrdup(value); | 47 | cgit_root = xstrdup(value); |
48 | else if (!strcmp(name, "root-title")) | 48 | else if (!strcmp(name, "root-title")) |
49 | cgit_root_title = xstrdup(value); | 49 | cgit_root_title = xstrdup(value); |
50 | else if (!strcmp(name, "css")) | 50 | else if (!strcmp(name, "css")) |
51 | cgit_css = xstrdup(value); | 51 | cgit_css = xstrdup(value); |
52 | else if (!strcmp(name, "logo")) | 52 | else if (!strcmp(name, "logo")) |
53 | cgit_logo = xstrdup(value); | 53 | cgit_logo = xstrdup(value); |
54 | else if (!strcmp(name, "logo-link")) | 54 | else if (!strcmp(name, "logo-link")) |
55 | cgit_logo_link = xstrdup(value); | 55 | cgit_logo_link = xstrdup(value); |
56 | else if (!strcmp(name, "virtual-root")) | 56 | else if (!strcmp(name, "virtual-root")) |
57 | cgit_virtual_root = xstrdup(value); | 57 | cgit_virtual_root = xstrdup(value); |
58 | else if (!strcmp(name, "nocache")) | 58 | else if (!strcmp(name, "nocache")) |
59 | cgit_nocache = atoi(value); | 59 | cgit_nocache = atoi(value); |
60 | else if (!strcmp(name, "cache-root")) | ||
61 | cgit_cache_root = xstrdup(value); | ||
60 | } | 62 | } |
61 | 63 | ||
62 | void cgit_repo_config_cb(const char *name, const char *value) | 64 | void cgit_repo_config_cb(const char *name, const char *value) |
63 | { | 65 | { |
64 | if (!strcmp(name, "name")) | 66 | if (!strcmp(name, "name")) |
65 | cgit_repo_name = xstrdup(value); | 67 | cgit_repo_name = xstrdup(value); |
66 | else if (!strcmp(name, "desc")) | 68 | else if (!strcmp(name, "desc")) |
67 | cgit_repo_desc = xstrdup(value); | 69 | cgit_repo_desc = xstrdup(value); |
68 | else if (!strcmp(name, "owner")) | 70 | else if (!strcmp(name, "owner")) |
69 | cgit_repo_owner = xstrdup(value); | 71 | cgit_repo_owner = xstrdup(value); |
70 | } | 72 | } |
71 | 73 | ||
72 | void cgit_querystring_cb(const char *name, const char *value) | 74 | void cgit_querystring_cb(const char *name, const char *value) |
73 | { | 75 | { |
74 | if (!strcmp(name,"r")) { | 76 | if (!strcmp(name,"r")) { |
75 | cgit_query_repo = xstrdup(value); | 77 | cgit_query_repo = xstrdup(value); |
76 | } else if (!strcmp(name, "p")) { | 78 | } else if (!strcmp(name, "p")) { |
77 | cgit_query_page = xstrdup(value); | 79 | cgit_query_page = xstrdup(value); |
78 | } else if (!strcmp(name, "h")) { | 80 | } else if (!strcmp(name, "h")) { |
79 | cgit_query_head = xstrdup(value); | 81 | cgit_query_head = xstrdup(value); |
80 | cgit_query_has_symref = 1; | 82 | cgit_query_has_symref = 1; |
81 | } else if (!strcmp(name, "id")) { | 83 | } else if (!strcmp(name, "id")) { |
82 | cgit_query_sha1 = xstrdup(value); | 84 | cgit_query_sha1 = xstrdup(value); |
83 | cgit_query_has_sha1 = 1; | 85 | cgit_query_has_sha1 = 1; |
84 | } else if (!strcmp(name, "ofs")) { | 86 | } else if (!strcmp(name, "ofs")) { |
85 | cgit_query_ofs = atoi(value); | 87 | cgit_query_ofs = atoi(value); |
86 | } | 88 | } |
87 | } | 89 | } |
88 | 90 | ||