commit 865e5ba9d7fe914d9f677e65e67b9ed104edc5b9 from: Stefan Sperling date: Tue Feb 13 20:44:19 2024 UTC sync man pages commit - 373291f1ac93976301e7e88ca974aac23402b9d7 commit + 865e5ba9d7fe914d9f677e65e67b9ed104edc5b9 blob - cf54ca6135a863cf1227902e9e5a1e505c6136b6 blob + 9dc75ca46d5a0c0a439429e696687fb056b15841 --- git-repository.5.html +++ git-repository.5.html @@ -214,7 +214,7 @@
December 8, - 2023 OpenBSD 7.4
+ line">February 13, + 2024 OpenBSD 7.4 blob - 4d04d4518fb8dcfcf99346cf556bdaf597339375 blob + 7c772dcf0a426ed8746031b57e97ebb58dc75cdc --- gitwrapper.1.html +++ gitwrapper.1.html @@ -142,7 +142,7 @@
December 8, - 2023 OpenBSD 7.4
+ line">February 13, + 2024 OpenBSD 7.4 blob - 6b9f0094d7dc6dc2b10315a7b03fcc8a39f5a993 blob + 2061fa3f49647a9b0951d109233857d378f42181 --- got-worktree.5.html +++ got-worktree.5.html @@ -186,7 +186,7 @@
December 8, - 2023 OpenBSD 7.4
+ line">February 13, + 2024 OpenBSD 7.4 blob - a1eb89ebb8e17de1120ff55033e80cdfe4200fae blob + dec0c6b2df6265a40107ed75d3a0df8be3a393d7 --- got.1.html +++ got.1.html @@ -2925,9 +2925,9 @@

-
The author's name and email address, such as “Flan +
The author's name and email address, such as "Flan Hacker - <flan_hacker@openbsd.org>”. + <flan_hacker@openbsd.org>". Used by the got commit, got import, got rebase, got merge, and got histedit commands. Because @@ -3487,7 +3487,7 @@ remote "origin" {
December 8, - 2023 OpenBSD 7.4
+ line">February 13, + 2024 OpenBSD 7.4 blob - 9ca9a6976dd0769dc7ef5cf1ec6e17b44a478b87 blob + 49b4da2d7cc3c0837a6d20db39baf3d6d9459991 --- got.conf.5.html +++ got.conf.5.html @@ -306,7 +306,7 @@
December 8, - 2023 OpenBSD 7.4
+ line">February 13, + 2024 OpenBSD 7.4 blob - a9867aa64152cc3ba57a3bb44c65c5b9ca0ebeff blob + 422b5e5dd23cb2ef1f9c09970db620afb102b4f2 --- gotadmin.1.html +++ gotadmin.1.html @@ -424,7 +424,7 @@
December 8, - 2023 OpenBSD 7.4
+ line">February 13, + 2024 OpenBSD 7.4 blob - 86d0264999bc44efcfbe68c21e61b79921e2a95c blob + 6d75278aafedb173f7c2598b1f02d1241637bc5c --- gotctl.8.html +++ gotctl.8.html @@ -86,7 +86,7 @@
December 8, - 2023 OpenBSD 7.4
+ line">February 13, + 2024 OpenBSD 7.4 blob - 92e88d02cb90e4287066ebfb7243e89a75f7768c blob + 949f2487e501a0168b355cc83ab4b8f998931f1a --- gotd.8.html +++ gotd.8.html @@ -99,7 +99,7 @@
December 8, - 2023 OpenBSD 7.4
+ line">February 13, + 2024 OpenBSD 7.4 blob - f4f13030db4877874a25cf6f0d16548369c162db blob + 8b3b7c180196d2d92393a43d3886b3dd59cd3adf --- gotd.conf.5.html +++ gotd.conf.5.html @@ -265,7 +265,7 @@ connection {
December 8, - 2023 OpenBSD 7.4
+ line">February 13, + 2024 OpenBSD 7.4 blob - 7081b781b3181d89bca1f2c3f610b95c34851e88 blob + df7e38d9329803d40b6355191f42c3193379777a --- gotsh.1.html +++ gotsh.1.html @@ -157,7 +157,7 @@
December 8, - 2023 OpenBSD 7.4
+ line">February 13, + 2024 OpenBSD 7.4 blob - 2a0c5a414571dfd12c6aa6ff38b6606b2c827ab2 blob + 16ac59ca67a8398c1a4cba4ff904b26045171cce --- gotwebd.8.html +++ gotwebd.8.html @@ -130,37 +130,40 @@

Example configuration for httpd.conf(5):

-
  types { include "/usr/share/misc/mime.types" }
+
types { include "/usr/share/misc/mime.types" }
 
-  # one gotwebd reachable at http://gotweb1.example.com/
-  server "gotweb1.example.com" {
-        listen on * port 80
-        root "/htdocs/gotwebd"
-        location "/" {
-              fastcgi socket "/run/gotweb.sock"
-        }
-  }
+server "example.com" {
+	listen on * port 80
+	root "/htdocs/gotwebd"
+	location "/" {
+		fastcgi socket "/run/gotweb.sock"
+	}
+}
+
+

Hosting multiple gotwebd instances on the + same HTTP server under different path prefixes, with the first reached via + the default UNIX-domain socket, the second + configured to listen on localhost port 9000:

+
+
server "example.com" {
+	listen on * port 80
 
-  # hosting multiple gotwebd instances on the same HTTP server:
-  # http://gotweb2.example.com/gotwebd-unix/
-  # http://gotweb2.example.com/gotwebd-tcp/
-  server "gotweb2.example.com" {
-        listen on * port 80
-        location "/gotwebd-unix/" {
-              fastcgi socket "/run/gotweb.sock"
-        }
-        location "/gotwebd-unix/*" {
-               root "/htdocs/gotwebd"
-               request strip 1
-        }
-        location "/gotwebd-tcp/" {
-              fastcgi socket tcp 127.0.0.1 9000
-        }
-        location "/gotwebd-tcp/*" {
-               root "/htdocs/gotwebd"
-               request strip 1
-        }
-  }
+ location "/gotwebd-unix/" { + fastcgi socket "/run/gotweb.sock" + } + location "/gotwebd-unix/*" { + root "/htdocs/gotwebd" + request strip 1 + } + + location "/gotwebd-tcp/" { + fastcgi socket tcp localhost 9000 + } + location "/gotwebd-tcp/*" { + root "/htdocs/gotwebd" + request strip 1 + } +}
@@ -185,7 +188,7 @@
December 8, - 2023 OpenBSD 7.4
+ line">February 13, + 2024 OpenBSD 7.4 blob - d38a6c1e2977df93bf6b5de8cc1ca241c893a603 blob + 371ee2600dcd8ce3efae98855407dab6bc65112b --- gotwebd.conf.5.html +++ gotwebd.conf.5.html @@ -45,7 +45,7 @@ inside quotes. For example:

lan_addr = "192.168.0.1"
-listen on $lan_addr
+listen on $lan_addr port 9090

Paths mentioned in gotwebd.conf must be relative to /var/www, the @@ -65,13 +65,17 @@ listen on $lan_addr will be used.

number
-
Run the specified number of server processes.
+
Run the specified number of server processes. + gotwebd(8) runs 3 server + processes by default.
on | off
-
Controls whether the servers will listen on unix sockets by default.
+
Controls whether the servers will listen on unix sockets by default. + Listening on unix sockets is the default.
path
-
Set the path to the default unix socket.
+
Set the path to the default unix socket. Defaults to + /var/www/run/gotweb.sock.
@@ -95,13 +99,14 @@ listen on $lan_addr
path
Set the path to a custom Cascading Style Sheet (CSS) to be used. If this - option is not specified then a default style sheet will be used.
+ option is not specified then the default style sheet + ‘gotweb.css’ will be used.
address port number
-
Configure an address and port for incoming FCGI TCP connections. Valid - address arguments are hostnames, IP4 addresses and - IPv6 addresses. The port argument may be number or a +
Configure an address and port for incoming FastCGI connections. Valid + address arguments are hostnames, IPv4 and IPv6 + addresses. The port argument may be number or a service name defined in services(5).

May be specified multiple times to build up a list of @@ -116,48 +121,53 @@ listen on $lan_addr

Set the path to the unix socket used by the server.
-
Set the path to an image file containing a logo to be displayed.
+
Set the path to an image file containing a logo to be displayed. Defaults + to ‘got.png’.
url
-
Set a hyperlink for the logo.
+
Set a hyperlink for the logo. Defaults to + https://gameoftrees.org.
number
-
Set the maximum amount of commits displayed per page.
-
- number
-
Set the maximum amount of repositories gotwebd(8) will work with.
+
Set the maximum amount of commits and tags displayed per page. Defaults to + 25.
number
-
Set the maximum amount of repositories displayed on the index screen.
+
Set the maximum amount of repositories displayed on the index screen. + Defaults to 25. Set to zero to show all the repositories without + pagination.
path
Set the path to the directory which contains Git repositories that the - server should publish.
+ server should publish. Defaults to + /run/gotwebd.sock under the chroot.
on | off
Set whether to display the repository only if it contains the magic - git-daemon-export-ok file.
+ git-daemon-export-ok file. Disabled by + default.
on | off
-
Toggle display of last repository modification date.
+
Toggle display of last repository modification date. Enabled by + default.
on | off
Toggle display of clone URLs for a repository. This requires the creation of a cloneurl file inside the repository which - contains one URL per line.
+ contains one URL per line. Enabled by default.
on | off
-
Toggle display of the repository description. The +
Toggle display of the repository description. Enabled by default. The description file in the repository should be updated with an appropriate description.
on | off
-
Set whether to display the repository owner. Displaying the owner requires - owner information to be added to the config file - in the repository. gotwebd(8) will parse owner information from either a [gotweb] or a - [gitweb] section. For example: +
Set whether to display the repository owner. Enabled by default. + Displaying the owner requires owner information to be added to the + config file in the repository. + gotwebd(8) will parse + owner information from either a [gotweb] or a [gitweb] section. For + example:
[gotweb]
 owner = "Your Name"
@@ -165,16 +175,26 @@ owner = "Your Name"
-
Set the displayed site link name for the index page.
+
Set the displayed site link name for the index page. Defaults to + ‘Repos’.
string
-
Set the displayed site name title.
+
Set the displayed site name title. Defaults to + ‘Gotweb’.
string
-
Set the displayed site owner.
+
Set the displayed site owner. Defaults to ‘Got Owner’.
on | off
-
Toggle display of the site owner.
+
Toggle display of the site owner. Enabled by default.
+
+ number
+
The maximum number of commits to show in the summary page. Defaults to + 10.
+
+ number
+
The maximum number of tags to show in the summary page. Defaults to + 3.
@@ -187,49 +207,23 @@ owner = "Your Name"

-

These are the currently configurable items for - gotwebd(8) with their - default values.

+

A sample configuration:

-
#
-# gotwebd options
-# all paths relative to /var/www (httpd chroot jail)
-#
-
-prefork 3
-
-server "localhost-unix" {
-	repos_path "/got/public"
-	listen on socket "/run/gotweb.sock"
-
-	site_name       "my public repos"
-	site_owner      "Got Owner"
-	site_link       "repos"
-
-	logo   "got.png"
-	logo_url   "https://gameoftrees.org"
-
-	# on by default
-	#show_site_owner  on
-	#show_repo_owner  on
-	#show_repo_age  on
-	#show_repo_description on
-	#show_repo_cloneurl  on
-	#respect_exportok off
-
-	#max_repos   0
-	#max_repos_display  25
-	#max_commits_display  25
-}
-
-# Example server context for FCGI over TCP connections:
-#server "localhost-tcp" {
-#	repos_path "/got/public"
-#	listen on socket off
-#	listen on 127.0.0.1 port 9000
-#	listen on ::1 port 9000
-#}
+
server "localhost" {
+	site_name	"my public repos"
+	site_owner	"Flan Hacker"
+	site_link	"Flan' Projects"
+}
+

Another example, this time listening on a local port instead of + the implicit UNIX socket.

+
+
server "localhost" {
+	listen on socket off
+	listen on 127.0.0.1 port 9000
+	listen on ::1 port 9000
+}
+