-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 | 7 | ||||
-rw-r--r-- | ui-summary.c | 4 |
6 files changed, 27 insertions, 1 deletions
@@ -91,4 +91,6 @@ void config_cb(const char *name, const char *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); |
@@ -147,4 +149,6 @@ void config_cb(const char *name, const char *value) | |||
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); |
@@ -74,4 +74,5 @@ struct cgit_repo { | |||
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; |
@@ -186,4 +187,5 @@ struct cgit_config { | |||
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; |
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index ffb3e0f..d8e4b97 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -17,4 +17,11 @@ lines, and lines starting with '#', are ignored. | |||
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 |
@@ -235,4 +242,7 @@ virtual-root:: | |||
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. |
@@ -63,4 +63,5 @@ struct cgit_repo *cgit_add_repo(const char *url) | |||
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; |
diff --git a/ui-repolist.c b/ui-repolist.c index 2c13d50..25f076f 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -274,5 +274,10 @@ void cgit_print_repolist() | |||
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 | return; | ||
278 | if (ctx.cfg.about_filter) | ||
279 | cgit_open_filter(ctx.cfg.about_filter); | ||
277 | html_include(ctx.cfg.root_readme); | 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 | |||
@@ -84,5 +84,9 @@ void cgit_print_repo_readme(char *path) | |||
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 | } |