4 files changed, 11 insertions, 0 deletions

diff --git a/cgit.h b/cgit.h
index 6291c58..ab0efeb 100644
--- a/cgit.h
+++ b/cgit.h
@@ -110,64 +110,65 @@ struct refinfo {
         const char *refname;
         struct object *object;
         union {
                 struct taginfo *tag;
                 struct commitinfo *commit;
         };
 };
 
 struct reflist {
         struct refinfo **refs;
         int alloc;
         int count;
 };
 
 extern const char *cgit_version;
 
 extern struct repolist cgit_repolist;
 extern struct repoinfo *cgit_repo;
 extern int cgit_cmd;
 
 extern char *cgit_root_title;
 extern char *cgit_css;
 extern char *cgit_logo;
 extern char *cgit_index_header;
 extern char *cgit_index_info;
 extern char *cgit_logo_link;
 extern char *cgit_module_link;
 extern char *cgit_agefile;
 extern char *cgit_virtual_root;
 extern char *cgit_script_name;
 extern char *cgit_cache_root;
 extern char *cgit_repo_group;
+extern char *cgit_robots;
 
 extern int cgit_nocache;
 extern int cgit_snapshots;
 extern int cgit_enable_index_links;
 extern int cgit_enable_log_filecount;
 extern int cgit_enable_log_linecount;
 extern int cgit_max_lock_attempts;
 extern int cgit_cache_root_ttl;
 extern int cgit_cache_repo_ttl;
 extern int cgit_cache_dynamic_ttl;
 extern int cgit_cache_static_ttl;
 extern int cgit_cache_max_create_time;
 extern int cgit_summary_log;
 extern int cgit_summary_tags;
 extern int cgit_summary_branches;
 
 extern int cgit_max_msg_len;
 extern int cgit_max_repodesc_len;
 extern int cgit_max_commit_count;
 
 extern int cgit_query_has_symref;
 extern int cgit_query_has_sha1;
 
 extern char *cgit_querystring;
 extern char *cgit_query_repo;
 extern char *cgit_query_page;
 extern char *cgit_query_search;
 extern char *cgit_query_grep;
 extern char *cgit_query_head;
 extern char *cgit_query_sha1;
 extern char *cgit_query_sha2;
 extern char *cgit_query_path;
diff --git a/cgitrc b/cgitrc
index 6363c9c..8c616e0 100644
--- a/cgitrc
+++ b/cgitrc
@@ -1,42 +1,47 @@
 ##
 ## cgitrc: template for /etc/cgitrc
 ##
 
 
 ## Uncomment and set to 1 to deactivate caching of generated pages. Mostly
 ## usefull for testing.
 #nocache=0
 
 
+## This variable can be used to override the default value for "robots"
+## meta-tag. If unset, the meta-tag isn't generated.
+#robots=index, nofollow
+
+
 ## Set allowed snapshot types by default. Can be overridden per repo
 # can be any combination of zip/tar.gz/tar.bz2/tar
 #snapshots=0
 
 
 ## Enable/disable extra links to summary/log/tree per repo on index page
 #enable-index-links=0
 
 
 ## Enable/disable display of 'number of files changed' in log view
 #enable-log-filecount=0
 
 
 ## Enable/disable display of 'number of lines changed' in log view
 #enable-log-linecount=0
 
 
 ## Enable/disable display of HEAD shortlog in summary view. Set it to maximum
 ## number of commits that should be displayed
 #summary-log=0
 
 
 ## Restrict the number of branches printed in summary view. Set to 0 to
 ## print all branches.
 #summary-branches=0
 
 
 ## Restrict the number of tags printed in summary view. Set to 0 to
 ## print all tags.
 #summary-tags=0
 
 
diff --git a/shared.c b/shared.c
index 8cb4808..fd8b1e3 100644
--- a/shared.c
+++ b/shared.c
@@ -1,60 +1,61 @@
 /* shared.c: global vars + some callback functions
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
 struct repolist cgit_repolist;
 struct repoinfo *cgit_repo;
 int cgit_cmd;
 
 const char *cgit_version = CGIT_VERSION;
 
 char *cgit_root_title   = "Git repository browser";
 char *cgit_css          = "/cgit.css";
 char *cgit_logo         = "/git-logo.png";
 char *cgit_index_header = NULL;
 char *cgit_index_info   = NULL;
 char *cgit_logo_link    = "http://www.kernel.org/pub/software/scm/git/docs/";
 char *cgit_module_link  = "./?repo=%s&page=commit&id=%s";
 char *cgit_agefile      = "info/web/last-modified";
 char *cgit_virtual_root = NULL;
 char *cgit_script_name  = CGIT_SCRIPT_NAME;
 char *cgit_cache_root   = CGIT_CACHE_ROOT;
 char *cgit_repo_group   = NULL;
+char *cgit_robots       = "index, nofollow";
 
 int cgit_nocache               =  0;
 int cgit_snapshots             =  0;
 int cgit_enable_index_links    =  0;
 int cgit_enable_log_filecount  =  0;
 int cgit_enable_log_linecount  =  0;
 int cgit_max_lock_attempts     =  5;
 int cgit_cache_root_ttl        =  5;
 int cgit_cache_repo_ttl        =  5;
 int cgit_cache_dynamic_ttl     =  5;
 int cgit_cache_static_ttl      = -1;
 int cgit_cache_max_create_time =  5;
 int cgit_summary_log           =  0;
 int cgit_summary_tags          =  0;
 int cgit_summary_branches      =  0;
 int cgit_renamelimit           = -1;
 
 int cgit_max_msg_len = 60;
 int cgit_max_repodesc_len = 60;
 int cgit_max_commit_count = 50;
 
 int cgit_query_has_symref = 0;
 int cgit_query_has_sha1   = 0;
 
 char *cgit_querystring  = NULL;
 char *cgit_query_repo   = NULL;
 char *cgit_query_page   = NULL;
 char *cgit_query_head   = NULL;
 char *cgit_query_search = NULL;
 char *cgit_query_grep   = NULL;
 char *cgit_query_sha1   = NULL;
 char *cgit_query_sha2   = NULL;
@@ -168,64 +169,66 @@ void cgit_global_config_cb(const char *name, const char *value)
         else if (!strcmp(name, "enable-index-links"))
                 cgit_enable_index_links = atoi(value);
         else if (!strcmp(name, "enable-log-filecount"))
                 cgit_enable_log_filecount = atoi(value);
         else if (!strcmp(name, "enable-log-linecount"))
                 cgit_enable_log_linecount = atoi(value);
         else if (!strcmp(name, "cache-root"))
                 cgit_cache_root = xstrdup(value);
         else if (!strcmp(name, "cache-root-ttl"))
                 cgit_cache_root_ttl = atoi(value);
         else if (!strcmp(name, "cache-repo-ttl"))
                 cgit_cache_repo_ttl = atoi(value);
         else if (!strcmp(name, "cache-static-ttl"))
                 cgit_cache_static_ttl = atoi(value);
         else if (!strcmp(name, "cache-dynamic-ttl"))
                 cgit_cache_dynamic_ttl = atoi(value);
         else if (!strcmp(name, "max-message-length"))
                 cgit_max_msg_len = atoi(value);
         else if (!strcmp(name, "max-repodesc-length"))
                 cgit_max_repodesc_len = atoi(value);
         else if (!strcmp(name, "max-commit-count"))
                 cgit_max_commit_count = atoi(value);
         else if (!strcmp(name, "summary-log"))
                 cgit_summary_log = atoi(value);
         else if (!strcmp(name, "summary-branches"))
                 cgit_summary_branches = atoi(value);
         else if (!strcmp(name, "summary-tags"))
                 cgit_summary_tags = atoi(value);
         else if (!strcmp(name, "agefile"))
                 cgit_agefile = xstrdup(value);
         else if (!strcmp(name, "renamelimit"))
                 cgit_renamelimit = atoi(value);
+        else if (!strcmp(name, "robots"))
+                cgit_robots = xstrdup(value);
         else if (!strcmp(name, "repo.group"))
                 cgit_repo_group = xstrdup(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 = trim_end(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);
         else if (cgit_repo && !strcmp(name, "repo.defbranch"))
                 cgit_repo->defbranch = xstrdup(value);
         else if (cgit_repo && !strcmp(name, "repo.snapshots"))
                 cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */
         else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount"))
                 cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value);
         else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount"))
                 cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value);
         else if (cgit_repo && !strcmp(name, "repo.module-link"))
                 cgit_repo->module_link= xstrdup(value);
         else if (cgit_repo && !strcmp(name, "repo.readme") && value != NULL) {
                 if (*value == '/')
                         cgit_repo->readme = xstrdup(value);
                 else
                         cgit_repo->readme = xstrdup(fmt("%s/%s", cgit_repo->path, value));
         } else if (!strcmp(name, "include"))
                 cgit_read_config(value, cgit_global_config_cb);
 }
 
 void cgit_querystring_cb(const char *name, const char *value)
diff --git a/ui-shared.c b/ui-shared.c
index 5192800..2f771da 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -335,64 +335,66 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
                 htmlf("<span class='age-days'>%.0f days</span>",
                       secs * 1.0 / TM_DAY);
                 return;
         }
         if (secs < TM_MONTH * 2) {
                 htmlf("<span class='age-weeks'>%.0f weeks</span>",
                       secs * 1.0 / TM_WEEK);
                 return;
         }
         if (secs < TM_YEAR * 2) {
                 htmlf("<span class='age-months'>%.0f months</span>",
                       secs * 1.0 / TM_MONTH);
                 return;
         }
         htmlf("<span class='age-years'>%.0f years</span>",
               secs * 1.0 / TM_YEAR);
 }
 
 void cgit_print_docstart(char *title, struct cacheitem *item)
 {
         html("Content-Type: text/html; charset=" PAGE_ENCODING "\n");
         htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
         htmlf("Expires: %s\n", http_date(item->st.st_mtime +
                                          ttl_seconds(item->ttl)));
         html("\n");
         html(cgit_doctype);
         html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
         html("<head>\n");
         html("<title>");
         html_txt(title);
         html("</title>\n");
         htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
+        if (cgit_robots && *cgit_robots)
+                htmlf("<meta name='robots' content='%s'/>\n", cgit_robots);
         html("<link rel='stylesheet' type='text/css' href='");
         html_attr(cgit_css);
         html("'/>\n");
         html("</head>\n");
         html("<body>\n");
 }
 
 void cgit_print_docend()
 {
         html("</td>\n</tr>\n</table>\n</body>\n</html>\n");
 }
 
 int print_branch_option(const char *refname, const unsigned char *sha1,
                         int flags, void *cb_data)
 {
         char *name = (char *)refname;
         html_option(name, name, cgit_query_head);
         return 0;
 }
 
 int print_archive_ref(const char *refname, const unsigned char *sha1,
                        int flags, void *cb_data)
 {
         struct tag *tag;
         struct taginfo *info;
         struct object *obj;
         char buf[256], *url;
         unsigned char fileid[20];
         int *header = (int *)cb_data;
 
         if (prefixcmp(refname, "refs/archives"))
                 return 0;