commit add40c4fa581b1c31e3fa63c45dde97138b56583
from: Tracey Emery <tracey@traceyemery.net>
date: Wed Jan 15 22:10:31 2020 UTC

remove examples file

commit - f2915494576059c378cf5dcc8ee39e8d3e060b85
commit + add40c4fa581b1c31e3fa63c45dde97138b56583
blob - 5952e3a5a65f7ea0e2162c8fd9ca8149013167c7
blob + cb06f08fd8e10fe4e6ea9b8f786fe932df721220
--- Makefile.inc
+++ Makefile.inc
@@ -36,7 +36,6 @@ GOTWEB_DIR =	/cgi-bin/gotweb
 LIBEXECDIR =	${GOTWEB_DIR}/libexec
 LIBEXEC_DIR =	${CHROOT_DIR}${LIBEXECDIR}
 ETC_DIR =	${CHROOT_DIR}/etc
-EXPL_DIR =	${ETC_DIR}/examples
 HTTPD_DIR =	${CHROOT_DIR}/htdocs
 TMP_DIR =	${CHROOT_DIR}/tmp
 PROG_DIR =	${HTTPD_DIR}/${PROG}
blob - fd425d052296f3a5e070b8a5babbb5c0c2a11a6d
blob + a8779fe566add57b9b508aec58b54d11dfb8b8eb
--- gotweb/Makefile
+++ gotweb/Makefile
@@ -35,11 +35,6 @@ realinstall:
 	if [ ! -d ${ETC_DIR}/. ]; then \
 		${INSTALL} -d -o root -g daemon -m 755 ${ETC_DIR}; \
 	fi
-	if [ ! -d ${EXPL_DIR}/. ]; then \
-		${INSTALL} -d -o root -g daemon -m 755 ${EXPL_DIR}; \
-	fi
-	${INSTALL} -c -o ${WWWUSR} -g ${WWWGRP} -m 0755 files/etc/gotweb.conf \
-		${ETC_DIR}/examples/gotweb.conf
 	if [ ! -d ${HTTPD_DIR}/. ]; then \
 		${INSTALL} -d -o root -g daemon -m 755 ${HTTPD_DIR}; \
 	fi
blob - c13c81b65d0c6ee672c348a1b1f122f822e97f10 (mode 644)
blob + /dev/null
--- gotweb/files/etc/gotweb.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# gotweb options
-# all paths relative to /var/www (httpd chroot jail)
-#
-
-got_repos_path			"/got/public"
-got_www_path			"/gotweb"
-
-#got_max_repos			100
-#got_max_repos_display		25
-got_max_commits_display		50
-
-got_site_name			"my public repos"
-got_site_owner			"Got Owner"
-got_site_link			"repos"
-
-got_logo			"got.png"
-got_logo_url			"https://gameoftrees.org"
-
-# on by default
-#got_show_site_owner		off
-#got_show_repo_owner		off
-#got_show_repo_age		false
-#got_show_repo_description	no
-#got_show_repo_cloneurl		off
blob - 90724925e552c0df84da661bd8fc4a5d695f35c8
blob + c7b010c01ae365f26edc8df50da0631a9dd8d790
--- gotweb/gotweb.c
+++ gotweb/gotweb.c
@@ -2009,7 +2009,7 @@ gw_get_repo_tags(struct gw_trans *gw_trans, int limit,
 	if (error)
 		goto done;
 
-	error = got_ref_list(&refs, repo, "refs/tags", got_repo_cmp_tags, repo);
+	error = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
 	if (error)
 		goto done;
 
blob - dc7cb15803cd952fb4cbdd56ba70b4d96445b7fc
blob + e38c892f0ccceebaefe78de2480d0acb62449430
--- gotweb/gotweb.conf.5
+++ gotweb/gotweb.conf.5
@@ -65,6 +65,37 @@ Set whether to display the site owner, or not.
 .It Ic got_www_path Ar string
 Set the public gotweb httpd path.
 .El
+.Sh EXAMPLES
+These are the currently configurable items for Gotweb.
+The configuration file gotweb.conf must be located at /var/www/etc/gotweb.conf.
+.Bd -literal -offset indent
+
+#
+# gotweb options
+# all paths relative to /var/www (httpd chroot jail)
+#
+
+got_repos_path			"/got/public"
+got_www_path			"/gotweb"
+
+#got_max_repos			100
+#got_max_repos_display		25
+got_max_commits_display		50
+
+got_site_name			"my public repos"
+got_site_owner			"Got Owner"
+got_site_link			"repos"
+
+got_logo			"got.png"
+got_logo_url			"https://gameoftrees.org"
+
+# on by default
+#got_show_site_owner		off
+#got_show_repo_owner		off
+#got_show_repo_age		false
+#got_show_repo_description	no
+#got_show_repo_cloneurl		off
+.Ed
 .Sh FILES
 .Bl -tag -width Ds -compact
 .It Pa /var/www/etc/gotweb.conf
blob - 0101a26c39257f2f4b72dda5d9f1f52dcf5945b8
blob + c3ab5293ee64cc727f720cea7d41acca4c2d13f5
--- gotweb/parse.y
+++ gotweb/parse.y
@@ -511,7 +511,6 @@ parse_conf(const char *filename, struct gotweb_conf *g
 	gw_conf->got_max_repos_display = D_MAXREPODISP;
 	gw_conf->got_max_commits_display = D_MAXCOMMITDISP;
 	if ((file = pushfile(filename)) == NULL) {
-		error = got_error_from_errno2("parse_conf", GOTWEB_CONF);
 		goto done;
 	}
 	topfile = file;