-rw-r--r-- | cgit.c | 4 | ||||
-rw-r--r-- | cgit.h | 2 | ||||
-rw-r--r-- | cgitrc.5.txt | 10 | ||||
-rw-r--r-- | shared.c | 1 | ||||
-rw-r--r-- | ui-repolist.c | 9 | ||||
-rw-r--r-- | ui-summary.c | 4 |
6 files changed, 28 insertions, 2 deletions
@@ -87,12 +87,14 @@ void config_cb(const char *name, const char *value) | |||
87 | else if (!strcmp(name, "cache-repo-ttl")) | 87 | else if (!strcmp(name, "cache-repo-ttl")) |
88 | ctx.cfg.cache_repo_ttl = atoi(value); | 88 | ctx.cfg.cache_repo_ttl = atoi(value); |
89 | else if (!strcmp(name, "cache-static-ttl")) | 89 | else if (!strcmp(name, "cache-static-ttl")) |
90 | ctx.cfg.cache_static_ttl = atoi(value); | 90 | ctx.cfg.cache_static_ttl = atoi(value); |
91 | else if (!strcmp(name, "cache-dynamic-ttl")) | 91 | else if (!strcmp(name, "cache-dynamic-ttl")) |
92 | ctx.cfg.cache_dynamic_ttl = atoi(value); | 92 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
93 | else if (!strcmp(name, "about-filter")) | ||
94 | ctx.cfg.about_filter = new_filter(value, 0); | ||
93 | else if (!strcmp(name, "commit-filter")) | 95 | else if (!strcmp(name, "commit-filter")) |
94 | ctx.cfg.commit_filter = new_filter(value, 0); | 96 | ctx.cfg.commit_filter = new_filter(value, 0); |
95 | else if (!strcmp(name, "embedded")) | 97 | else if (!strcmp(name, "embedded")) |
96 | ctx.cfg.embedded = atoi(value); | 98 | ctx.cfg.embedded = atoi(value); |
97 | else if (!strcmp(name, "max-message-length")) | 99 | else if (!strcmp(name, "max-message-length")) |
98 | ctx.cfg.max_msg_len = atoi(value); | 100 | ctx.cfg.max_msg_len = atoi(value); |
@@ -143,12 +145,14 @@ void config_cb(const char *name, const char *value) | |||
143 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) | 145 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
144 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); | 146 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
145 | else if (ctx.repo && !strcmp(name, "repo.max-stats")) | 147 | else if (ctx.repo && !strcmp(name, "repo.max-stats")) |
146 | ctx.repo->max_stats = cgit_find_stats_period(value, NULL); | 148 | ctx.repo->max_stats = cgit_find_stats_period(value, NULL); |
147 | else if (ctx.repo && !strcmp(name, "repo.module-link")) | 149 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
148 | ctx.repo->module_link= xstrdup(value); | 150 | ctx.repo->module_link= xstrdup(value); |
151 | else if (ctx.repo && !strcmp(name, "repo.about-filter")) | ||
152 | ctx.repo->about_filter = new_filter(value, 0); | ||
149 | else if (ctx.repo && !strcmp(name, "repo.commit-filter")) | 153 | else if (ctx.repo && !strcmp(name, "repo.commit-filter")) |
150 | ctx.repo->commit_filter = new_filter(value, 0); | 154 | ctx.repo->commit_filter = new_filter(value, 0); |
151 | else if (ctx.repo && !strcmp(name, "repo.source-filter")) | 155 | else if (ctx.repo && !strcmp(name, "repo.source-filter")) |
152 | ctx.repo->source_filter = new_filter(value, 1); | 156 | ctx.repo->source_filter = new_filter(value, 1); |
153 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { | 157 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
154 | if (*value == '/') | 158 | if (*value == '/') |
@@ -70,12 +70,13 @@ struct cgit_repo { | |||
70 | char *clone_url; | 70 | char *clone_url; |
71 | int snapshots; | 71 | int snapshots; |
72 | int enable_log_filecount; | 72 | int enable_log_filecount; |
73 | int enable_log_linecount; | 73 | int enable_log_linecount; |
74 | int max_stats; | 74 | int max_stats; |
75 | time_t mtime; | 75 | time_t mtime; |
76 | struct cgit_filter *about_filter; | ||
76 | struct cgit_filter *commit_filter; | 77 | struct cgit_filter *commit_filter; |
77 | struct cgit_filter *source_filter; | 78 | struct cgit_filter *source_filter; |
78 | }; | 79 | }; |
79 | 80 | ||
80 | struct cgit_repolist { | 81 | struct cgit_repolist { |
81 | int length; | 82 | int length; |
@@ -182,12 +183,13 @@ struct cgit_config { | |||
182 | int noheader; | 183 | int noheader; |
183 | int renamelimit; | 184 | int renamelimit; |
184 | int snapshots; | 185 | int snapshots; |
185 | int summary_branches; | 186 | int summary_branches; |
186 | int summary_log; | 187 | int summary_log; |
187 | int summary_tags; | 188 | int summary_tags; |
189 | struct cgit_filter *about_filter; | ||
188 | struct cgit_filter *commit_filter; | 190 | struct cgit_filter *commit_filter; |
189 | struct cgit_filter *source_filter; | 191 | struct cgit_filter *source_filter; |
190 | }; | 192 | }; |
191 | 193 | ||
192 | struct cgit_page { | 194 | struct cgit_page { |
193 | time_t modified; | 195 | time_t modified; |
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index ffb3e0f..d8e4b97 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -13,12 +13,19 @@ Cgitrc contains all runtime settings for cgit, including the list of git | |||
13 | repositories, formatted as a line-separated list of NAME=VALUE pairs. Blank | 13 | repositories, formatted as a line-separated list of NAME=VALUE pairs. Blank |
14 | lines, and lines starting with '#', are ignored. | 14 | lines, and lines starting with '#', are ignored. |
15 | 15 | ||
16 | 16 | ||
17 | GLOBAL SETTINGS | 17 | GLOBAL SETTINGS |
18 | --------------- | 18 | --------------- |
19 | about-filter:: | ||
20 | Specifies a command which will be invoked to format the content of | ||
21 | about pages (both top-level and for each repository). The command will | ||
22 | get the content of the about-file on its STDIN, and the STDOUT from the | ||
23 | command will be included verbatim on the about page. Default value: | ||
24 | none. | ||
25 | |||
19 | agefile:: | 26 | agefile:: |
20 | Specifies a path, relative to each repository path, which can be used | 27 | Specifies a path, relative to each repository path, which can be used |
21 | to specify the date and time of the youngest commit in the repository. | 28 | to specify the date and time of the youngest commit in the repository. |
22 | The first line in the file is used as input to the "parse_date" | 29 | The first line in the file is used as input to the "parse_date" |
23 | function in libgit. Recommended timestamp-format is "yyyy-mm-dd | 30 | function in libgit. Recommended timestamp-format is "yyyy-mm-dd |
24 | hh:mm:ss". Default value: "info/web/last-modified". | 31 | hh:mm:ss". Default value: "info/web/last-modified". |
@@ -231,12 +238,15 @@ virtual-root:: | |||
231 | value: none. | 238 | value: none. |
232 | NOTE: cgit has recently learned how to use PATH_INFO to achieve the | 239 | NOTE: cgit has recently learned how to use PATH_INFO to achieve the |
233 | same kind of virtual urls, so this option will probably be deprecated. | 240 | same kind of virtual urls, so this option will probably be deprecated. |
234 | 241 | ||
235 | REPOSITORY SETTINGS | 242 | REPOSITORY SETTINGS |
236 | ------------------- | 243 | ------------------- |
244 | repo.about-filter:: | ||
245 | Override the default about-filter. Default value: <about-filter>. | ||
246 | |||
237 | repo.clone-url:: | 247 | repo.clone-url:: |
238 | A list of space-separated urls which can be used to clone this repo. | 248 | A list of space-separated urls which can be used to clone this repo. |
239 | Default value: none. | 249 | Default value: none. |
240 | 250 | ||
241 | repo.commit-filter:: | 251 | repo.commit-filter:: |
242 | Override the default commit-filter. Default value: <commit-filter>. | 252 | Override the default commit-filter. Default value: <commit-filter>. |
@@ -59,12 +59,13 @@ struct cgit_repo *cgit_add_repo(const char *url) | |||
59 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; | 59 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; |
60 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; | 60 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; |
61 | ret->max_stats = ctx.cfg.max_stats; | 61 | ret->max_stats = ctx.cfg.max_stats; |
62 | ret->module_link = ctx.cfg.module_link; | 62 | ret->module_link = ctx.cfg.module_link; |
63 | ret->readme = NULL; | 63 | ret->readme = NULL; |
64 | ret->mtime = -1; | 64 | ret->mtime = -1; |
65 | ret->about_filter = ctx.cfg.about_filter; | ||
65 | ret->commit_filter = ctx.cfg.commit_filter; | 66 | ret->commit_filter = ctx.cfg.commit_filter; |
66 | ret->source_filter = ctx.cfg.source_filter; | 67 | ret->source_filter = ctx.cfg.source_filter; |
67 | return ret; | 68 | return ret; |
68 | } | 69 | } |
69 | 70 | ||
70 | struct cgit_repo *cgit_get_repoinfo(const char *url) | 71 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
diff --git a/ui-repolist.c b/ui-repolist.c index 2c13d50..25f076f 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -270,9 +270,14 @@ void cgit_print_repolist() | |||
270 | print_pager(hits, ctx.cfg.max_repo_count, ctx.qry.search); | 270 | print_pager(hits, ctx.cfg.max_repo_count, ctx.qry.search); |
271 | cgit_print_docend(); | 271 | cgit_print_docend(); |
272 | } | 272 | } |
273 | 273 | ||
274 | void cgit_print_site_readme() | 274 | void cgit_print_site_readme() |
275 | { | 275 | { |
276 | if (ctx.cfg.root_readme) | 276 | if (!ctx.cfg.root_readme) |
277 | html_include(ctx.cfg.root_readme); | 277 | return; |
278 | if (ctx.cfg.about_filter) | ||
279 | cgit_open_filter(ctx.cfg.about_filter); | ||
280 | html_include(ctx.cfg.root_readme); | ||
281 | if (ctx.cfg.about_filter) | ||
282 | cgit_close_filter(ctx.cfg.about_filter); | ||
278 | } | 283 | } |
diff --git a/ui-summary.c b/ui-summary.c index f2a9b46..a2c018e 100644 --- a/ui-summary.c +++ b/ui-summary.c | |||
@@ -80,9 +80,13 @@ void cgit_print_repo_readme(char *path) | |||
80 | tmp = xmalloc(slash - ctx.repo->readme + 1 + strlen(path) + 1); | 80 | tmp = xmalloc(slash - ctx.repo->readme + 1 + strlen(path) + 1); |
81 | strncpy(tmp, ctx.repo->readme, slash - ctx.repo->readme + 1); | 81 | strncpy(tmp, ctx.repo->readme, slash - ctx.repo->readme + 1); |
82 | strcpy(tmp + (slash - ctx.repo->readme + 1), path); | 82 | strcpy(tmp + (slash - ctx.repo->readme + 1), path); |
83 | } else | 83 | } else |
84 | tmp = ctx.repo->readme; | 84 | tmp = ctx.repo->readme; |
85 | html("<div id='summary'>"); | 85 | html("<div id='summary'>"); |
86 | if (ctx.repo->about_filter) | ||
87 | cgit_open_filter(ctx.repo->about_filter); | ||
86 | html_include(tmp); | 88 | html_include(tmp); |
89 | if (ctx.repo->about_filter) | ||
90 | cgit_close_filter(ctx.repo->about_filter); | ||
87 | html("</div>"); | 91 | html("</div>"); |
88 | } | 92 | } |