commit 47f19dd515895c4e10e541d48978aacc01938d66 from: Stefan Sperling date: Tue Jan 17 13:15:10 2023 UTC sync man pages commit - 81054e7c725568a029d3b0e7852284f46947f6bc commit + 47f19dd515895c4e10e541d48978aacc01938d66 blob - 87e7a182ec7b02f70216eb525d265fe931cc0458 blob + 9b1865ca178b0f671ecbd331ce508dc0a6c4e104 --- git-repository.5.html +++ git-repository.5.html @@ -214,7 +214,7 @@
November 8, - 2022 OpenBSD 7.2
+ line">January 17, + 2023 OpenBSD 7.2 blob - fe67c58aad76da33900be20a889b7e424b6ab0f7 blob + e512a57be5c268b74cc0c6a20f64b737cda92f3c --- got-worktree.5.html +++ got-worktree.5.html @@ -186,7 +186,7 @@
November 8, - 2022 OpenBSD 7.2
+ line">January 17, + 2023 OpenBSD 7.2 blob - 53d6459b2200edd1546a04fd0b9671e1a3377592 blob + 708b13153d8597509212480a1142b2723e559c1a --- got.1.html +++ got.1.html @@ -666,7 +666,7 @@ “/”, in a pattern.

- [-bPpRs] [-C + [-bdPpRs] [-C number] [-c commit] [-l N] [-r @@ -701,6 +701,9 @@ this option is not specified, default to the work tree's current branch if invoked in a work tree, or to the repository's HEAD reference. +
+
Display diffstat of changes introduced in each commit. Cannot be used + with the -s option.
N
Limit history traversal to a given number of commits. If this option @@ -769,7 +772,7 @@
- [-aPsw] [-C + [-adPsw] [-C number] [-c commit] [-r repository-path] [object1 @@ -817,6 +820,11 @@

Cannot be used together with the -P option.

+
+
Display diffstat of changes before the actual diff by annotating each + file path or blob hash being diffed with the total number of lines + added and removed. A summary line will display the total number of + changes across all files.
Interpret all arguments as paths only. This option can be used to resolve ambiguity in cases where paths look like tag names, reference @@ -943,7 +951,7 @@ corresponding commit, tree, tag, or blob object. Cannot be used together with any other options except -r.
-
+
Delete the reference with the specified name from the repository. Any commit, tree, tag, and blob objects belonging to deleted references remain in the repository and may be removed @@ -1050,7 +1058,7 @@ commit argument is a commit ID SHA1 hash or an existing reference or tag name which will be resolved to a commit ID.
-
+
name
Delete the branch with the specified name from the “refs/heads” or “refs/remotes” @@ -1539,7 +1547,7 @@ current branch if invoked in a work tree, or to the repository's HEAD reference. Cannot be used together with the -a option.
-
+
branch
Delete the specified branch from the remote repository's “refs/heads/” reference namespace. This @@ -1842,10 +1850,12 @@ the branch contains changes to files outside of the work tree's path prefix, the work tree cannot be used to rebase this branch.

-

The got update and - got commit commands will refuse to run while a - rebase operation is in progress. Other commands which manipulate the - work tree may be used for conflict resolution purposes.

+

The got update, got + integrate, got merge, + got commit, and got + histedit commands will refuse to run while a rebase operation is + in progress. Other commands which manipulate the work tree may be used + for conflict resolution purposes.

If the specified branch is already based on the work tree's current branch, then no commits need to be rebased and got rebase will simply switch the work tree @@ -2050,11 +2060,12 @@ path prefix, the work tree cannot be used to edit the history of this branch.

The got update, got - rebase, and got integrate commands will - refuse to run while a histedit operation is in progress. Other commands - which manipulate the work tree may be used, and the got - commit command may be used to commit arbitrary changes to the - temporary branch while the histedit operation is interrupted.

+ rebase, got merge, and + got integrate commands will refuse to run while + a histedit operation is in progress. Other commands which manipulate the + work tree may be used, and the got commit + command may be used to commit arbitrary changes to the temporary branch + while the histedit operation is interrupted.

The options for got histedit are as follows:

@@ -2616,6 +2627,9 @@ references:

$ got branch -l
+

As above, but list the most recently modified branches only:

+

+
$ got branch -lt | head

In a work tree or a git repository directory, create a new branch called “unified-buffer-cache” which is forked off the “master” branch:

@@ -2915,7 +2929,7 @@ remote "origin" { git-repository(5), got-worktree(5), got.conf(5), - gotweb(8)

+ gotwebd(8)

@@ -2971,8 +2985,8 @@ remote "origin" { <yzhong@freebsdfoundation.org>

Parts of got, tog(1), and - gotweb(8) were derived from - code under copyright by:

+ gotwebd(8) were derived + from code under copyright by:


Caldera International @@ -3013,7 +3027,7 @@ remote "origin" {

got contains code contributed to the public domain by
- Austin Appleby

+ Austin Appleby.

@@ -3038,7 +3052,7 @@ remote "origin" {
November 8, - 2022 OpenBSD 7.2
+ line">January 17, + 2023 OpenBSD 7.2 blob - 8a777c2a250069e806ee1f46c16e1fb81c3fdc08 blob + e951be762a949f4980054447e5acf7db54317362 --- got.conf.5.html +++ got.conf.5.html @@ -231,6 +231,23 @@
+

+
+
got.conf
+
If present, got.conf located in the root directory + of a Git repository supersedes any relevant settings in Git's + config file. +

+
+
.got/got.conf
+
If present, got.conf located in the + .got meta-data directory of a + got(1) work tree supersedes + any relevant settings in the repository's got.conf + configuration file and Git's config file.
+
+
+

Configure author information:

@@ -269,23 +286,6 @@ } }
-
-
-

-
-
got.conf
-
If present, got.conf located in the root directory - of a Git repository supersedes any relevant settings in Git's - config file. -

-
-
.got/got.conf
-
If present, got.conf located in the - .got meta-data directory of a - got(1) work tree supersedes - any relevant settings in the repository's got.conf - configuration file and Git's config file.
-

Display information about a running gotd(8) instance.
+ section 8">gotd(8) instance. This operation requires root + privileges.
Stop a running gotd(8) instance. This operation requires root privileges.
@@ -85,7 +86,7 @@
November 8, - 2022 OpenBSD 7.2
+ line">January 17, + 2023 OpenBSD 7.2 blob - 9a3d7abd54ab70cefe08570ceb64c44915f0ddca blob + 571014fb1d185972e28ae9f121a45cef821e54b3 --- gotd.8.html +++ gotd.8.html @@ -54,6 +54,10 @@

gotd requires a configuration file in order to run. The configuration file format is described in gotd.conf(5).

+

It is recommended to restrict ssh(1) features available to users of + gotd. See gotsh(1) for details.

The options for gotd are as follows:

@@ -93,7 +97,7 @@
November 8, - 2022 OpenBSD 7.2
+ line">January 17, + 2023 OpenBSD 7.2 blob - 8b2287f65b8d3ebe9a1c958ddc4e407dd4a8ef80 blob + de4d3567cb5cf6b0bd212827096066a7a62855c7 --- gotd.conf.5.html +++ gotd.conf.5.html @@ -45,37 +45,84 @@ CONFIGURATION

The available global configuration directives are as follows:

-
- path
+
+ option
+
Set the specified options and limits for connections to the + gotd(8) unix socket. +

The connection directive may be + specified multiple times, and multiple option + arguments may be specified within curly braces:

+

connection + {...}

+

Each option should only be specified once. If a given option + is listed multiple times, the last line which sets this option wins.

+

Valid connection options are:

+
+
seconds
+
Specify the inactivity timeout for operations between client and + server. If this timeout is exceeded while a Git protocol request is + being processed, the request will be aborted and the connection will + be terminated. +

The timeout value may also have a suffix indicating its + unit of measure. Supported suffixes are:

+

+
+
s or + S
+
seconds
+
m or + M
+
minutes
+
h or + H
+
hours
+
+

The default timeout is 1h (3600 seconds, one hour). This + should only be changed if legitimate requests are exceeding the + default timeout for some reason, such as the server spending an + extraordinary amount of time generating a pack file.

+
+
+ user identity + number
+
Limit the maximum amount of concurrent connections by the user with + the username identity to + number. Numeric user IDs are also accepted. +

The default per-user limit is 4. This should only be + changed if concurrent connections from a given user are expected to + exceed the default limit, for example if an anonymous user is + granted read access and many concurrent connections will share this + anonymous user identity.

+
+
+
+
path
Set the path to the unix socket which gotd(8) should listen on. If not specified, the path /var/run/gotd.sock will be used.
-
- group
-
Set the group, defined in the - group(5) file, which is - allowed to access gotd(8) - via gotsh(1). The - gotd(8) user must be a - secondary member of this group. If not specified, the group _gotsh will be - used.
user
Set the user which will run gotd(8). Initially, gotd(8) requires root - privileges in order to create its unix socket and start child processes in - a chroot(2) environment. - Afterwards, gotd(8) drops - privileges to the specified user. If not specified, - the user _gotd will be used.
+ privileges in order to create its unix socket. Afterwards, + gotd(8) drops privileges to + the specified user. If not specified, the user _gotd + will be used.

At least one repository context must exist for - gotd(8) to function.

+ gotd(8) to function. For each + repository, access rules must be configured using the + permit and deny + configuration directives. Multiple access rules can be specified, and the + last matching rule determines the action taken. If no rule matches, access + to the repository is denied.

A repository context is declared with a unique name, followed by repository-specific configuration directives inside curly braces:

@@ -92,9 +139,23 @@

The available repository configuration directives are as follows:

+
+ identity
+
Deny repository access to users with the username + identity. Group names may be matched by prepending a + colon (‘:’) to identity. Numeric IDs + are also accepted.
path
-
Set the path to the Git repository.
+
Set the path to the Git repository. Must be specified.
+
+ mode identity
+
Permit repository access to users with the username + identity. The mode argument + must be set to either ro for read-only access, or + rw for read-write access. Group names may be + matched by prepending a colon (‘:’) to + identity. Numeric IDs are also accepted.
@@ -107,19 +168,36 @@

-
# Default unix_group and user values:
-unix_group _gotsh
+
# Run as the default user:
 user _gotd
 
+# Listen on the default socket:
+listen on "/var/run/gotd.sock"
+
 # This repository can be accessed via ssh://user@example.com/src
 repository "src" {
 	path "/var/git/src.git"
+	permit rw flan_hacker
+	permit rw :developers
+	permit ro anonymous
 }
 
 # This repository can be accessed via
 # ssh://user@example.com/openbsd/ports
 repository "openbsd/ports" {
 	path "/var/git/ports.git"
+	permit rw :porters
+	permit ro anonymous
+	deny flan_hacker
+}
+
+# Use a larger request timeout value:
+connection request timeout 2h
+
+# Some users are granted a higher concurrent connection limit:
+connection {
+	limit user flan_hacker 16
+	limit user anonymous 32
 }
@@ -128,12 +206,11 @@ repository "openbsd/ports" { ALSO

got(1), gotsh(1), - group(5), gotd(8)

November 8, - 2022 OpenBSD 7.2
+ line">January 17, + 2023 OpenBSD 7.2 blob - 546ab45ca6324cef0c4a0e5962f268473db4aac1 blob + 8e18c8eebb904f8f3d8cecc8dca52d7dc2171e7a --- gotsh.1.html +++ gotsh.1.html @@ -75,13 +75,9 @@ the server machine and the got(1) or git(1) program running on the client machine.

-

Users running gotsh must be members of the - group which has read/write permission to the gotd(8) unix socket. The group used for this purpose can be - configured in gotd.conf(5). Users running gotsh should not - have access to Git repositories by means other than accessing the unix - socket of gotd(8) via +

Users running gotsh should not have access + to Git repositories by means other than accessing the unix socket of + gotd(8) via gotsh.

It is recommended to restrict ssh(1) features available to users of @@ -99,17 +95,23 @@

-

The following sshd_config(5) directives are recommended to protect the server - machine and any systems reachable from it via ssh(1) forwarding features. This example assumes the group - called “_gotsh” has read/write access to the - gotd(8) unix socket.

+

sshd_config(5) directives such as the following are recommended to + protect the server machine and any systems reachable from it, especially if + anonymous users are allowed to connect:

-
Match Group _gotsh
+
Match User anonymous
     DisableForwarding yes
     PermitTTY no
+

It can be convenient to add all relevant users to a common group, + such as “developers”, and then use this group as the Match + criteria:

+
+
Match Group developers
+    DisableForwarding yes
+    PermitTTY no
+

-

gotweb — - Game of Trees Git repository server for - web browsers

-
-
-

- - - - - -
gotweb
-
-
-

-

gotweb provides a web interface allowing - Git repository contents to be viewed with a web browser.

-

gotweb is a CGI program based on - got(1) and - kcgi(3) which is intended to - run in a chroot(2) - environment in /var/www. The program has been - designed to work out of the box with the httpd(8) web server in conjunction with - slowcgi(8).

-

Enabling gotweb requires the following - steps:

-
    -
  1. The httpd.conf(5) - configuration file must be adjusted to run gotweb - as a CGI program with slowcgi(8). The EXAMPLES section - below contains an appropriate configuration file sample.
    2. -
  2. httpd(8) and slowcgi(8) must be enabled and started: -
    - 
      # rcctl enable httpd slowcgi
-  # rcctl start httpd slowcgi
    -
    -
    3. -
  3. Optionally, the run-time behaviour of gotweb can - be configured via the gotweb.conf(5) configuration file.
    4. -
  4. Git repositories must be created at a suitable location inside - the web server's chroot(2) environment. These repositories should - be writable by - the user ID of the httpd(8) server. The default location for repositories published by - gotweb is - /var/www/got/public.
    5. -
  5. Git repositories served by gotweb should be kept - up-to-date with a mechanism such as got fetch, - git-fetch(1), or - rsync(1), scheduled by - cron(8).
    6. -
-
-
-

-
-
/var/www/got/public/
-
Default location for Git repositories served by - gotweb. This location can be adjusted in the - gotweb.conf(5) - configuration file.
-
/var/www/cgi-bin/gotweb/gotweb
-
The gotweb CGI program, statically linked for use - in a chroot(2) - environment.
-
/var/www/cgi-bin/gotweb/gw_tmpl/
-
Directory for template files used by gotweb.
-
/var/www/cgi-bin/gotweb/libexec/
-
Directory containing statically linked got(1) helper programs which are run by - gotweb to read Git repositories.
-
/var/www/htdocs/gotweb/
-
Directory containing HTML, CSS, and image files used by - gotweb.
-
/var/www/got/tmp/
-
Directory for temporary files created by - gotweb.
-
-
-
-

-

Example configuration for httpd.conf:

-
-
-  types { include "/usr/share/misc/mime.types" }
-  server "gotweb.example.com" {
-  	listen on * port 80
-  	root "/htdocs/gotweb"
-  	location "/cgi-bin/*" {
-  		root "/"
-  		fastcgi
-  	}
-  	location "/*" {
-  		directory index "index.html"
-  	}
-  }
-
-
-
-

-

got(1), - kcgi(3), - git-repository(5), - gotweb.conf(5), - httpd(8), - slowcgi(8)

-
-
-

-

Christian Weisgerber - <naddy@openbsd.org> -
- Jerome Kasper - <neon.king.fr@gmail.com> -
- Josh Rickmar - <jrick@zettaport.com> -
- Omar Polo - <op@openbsd.org> -
- Stefan Sperling - <stsp@openbsd.org> -
- Tracey Emery - <tracey@traceyemery.net>

-
-
-
November 8, - 2022 OpenBSD 7.2
- - blob - ccfee572378be67944026f1c44e71a5b6bfdbd9a blob + e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 --- gotweb.conf.5.html +++ gotweb.conf.5.html @@ -1,168 +0,0 @@ - - - - - - - GOTWEB.CONF(5) - - - -
GOTWEB.CONF(5) - File Formats Manual - GOTWEB.CONF(5)
-
-
-

-

gotweb.conf — - gotweb configuration file

-
-
-

-

gotweb.conf is the run-time configuration - file for gotweb(8).

-

The file format is line-based, with one configuration directive - per line. Any lines beginning with a ‘#’ are treated as - comments and ignored.

-

Paths mentioned in gotweb.conf must be - relative to /var/www, the - chroot(2) environment of - httpd(8).

-
-
-

-

The available configuration directives are as follows:

-
-
- number
-
Set the maximum amount of commits displayed per page.
- -
Set the path to an image file containing a logo to be displayed.
-
- url
-
Set a hyperlink for the logo.
-
- number
-
Set the maximum amount of repositories gotweb(8) will work with.
-
- number
-
Set the maximum amount of repositories displayed on the index screen.
-
- on | off
-
Toggle display of last repository modification date.
-
- 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.
-
- on | off
-
Toggle display of the repository description. The - description file in the repository should be - updated with an appropriate description.
-
- path
-
Set the path to the directory which contains Git repositories that - gotweb(8) should - publish.
-
- 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. gotweb(8) will parse owner information from either a [gotweb] or a - [gitweb] section. For example: -
- 
[gotweb]
-owner = "Your Name"
-
-
- -
Set the displayed site link name for the index page.
-
- string
-
Set the displayed site name title.
-
- string
-
Set the displayed site owner.
-
- on | off
-
Toggle display of the site owner.
-
- string
-
Set the public gotweb httpd path.
-
-
-
-

-

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

-
-
-#
-# 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
-
-
-
-

-
-
/var/www/etc/gotweb.conf
-
Location of the gotweb.conf configuration - file.
-
-
-
-

-

got(1), - gotweb(8)

-
-
-
November 8, - 2022 OpenBSD 7.2
- - blob - b9032b1f161320886769434a1cba87df4190352d blob + 7b41a3a13f4b7028a2002bbb760d2f883a4d3c0d --- gotwebd.8.html +++ gotwebd.8.html @@ -137,7 +137,7 @@ listen on * port 80 root "/htdocs/gotwebd" location "/" { - fastcgi socket tcp localhost 9000 + fastcgi socket "/run/gotweb.sock" } } @@ -185,7 +185,7 @@
November 8, - 2022 OpenBSD 7.2
+ line">January 17, + 2023 OpenBSD 7.2 blob - 3c5707209d225da78460f8e929e4ec73da1d4920 blob + 6c2b7c6bbd389af67c0d6d5f4119fb2fe1498563 --- gotwebd.conf.5.html +++ gotwebd.conf.5.html @@ -118,6 +118,12 @@ listen on $lan_addr changes to the address configuration of the interface will be ignored.

+
+
Disable use of unix socket.
+
path
+
Set the path to the unix socket used by the server.
Set the path to an image file containing a logo to be displayed.
@@ -179,15 +185,17 @@ owner = "Your Name"
on | off
Toggle display of the site owner.
-
- on | off
-
Enable or disable use of unix sockets.
-
- path
-
Set the path to the unix socket used by the server.
+

+
+
/etc/gotwebd.conf
+
Default location of the gotwebd.conf configuration + file.
+
+
+

These are the currently configurable items for gotwebd(8) with their @@ -202,11 +210,11 @@ prefork 1 server "localhost-unix" { repos_path "/got/public" - unix_socket_name "/run/gotweb.sock" + listen on socket "/run/gotweb.sock" - got_site_name "my public repos" - got_site_owner "Got Owner" - got_site_link "repos" + site_name "my public repos" + site_owner "Got Owner" + site_link "repos" logo "got.png" logo_url "https://gameoftrees.org" @@ -228,21 +236,13 @@ server "localhost-unix" { # Example server context for FCGI over TCP connections: #server "localhost-tcp" { # repos_path "/got/public" -# unix_socket off +# listen on socket off # listen on 127.0.0.1 port 9000 # listen on ::1 port 9000 #}

-

-
-
/etc/gotwebd.conf
-
Default location of the gotwebd.conf configuration - file.
-
-
-

got(1), @@ -253,7 +253,7 @@ server "localhost-unix" {

November 8, - 2022 OpenBSD 7.2
+ line">January 17, + 2023 OpenBSD 7.2 blob - 1f9e3ea4723e41f4fa4d85adb56c85991f1fb7af blob + 9654f1f2ae49210097ebeb4b5a071d16322495fb --- tog.1.html +++ tog.1.html @@ -173,15 +173,19 @@ u
Move the selection cursor up N half pages (default: 1).
+ =
Move the cursor to the newest commit.
+ *
Move the cursor to the oldest commit. This will traverse all commits on the current branch which may take a long time depending on the number of commits in branch history. If needed, this operation can be cancelled with C-g or Backspace.
+
+
Move the cursor to commit N (default: 1).
+
+
Like g but defaults to the oldest commit.
Open a diff view showing file changes made in the currently selected commit.
@@ -238,7 +242,7 @@ repository. This can then be used to open a new log view for arbitrary branches and tags.
-
Toggle between showing the author and the committer name.
+
Toggle between showing the committer name and the author name.

The options for tog log are as follows:

@@ -316,12 +320,15 @@
Scroll up N half pages (default: 1).
-
+
Scroll to the top of the view.
-
+
Scroll to the bottom of the view.
+
+
Scroll to line N (default: 1).
+
+
Like g but defaults to the last line in the + diff.
Navigate to the Nth previous file in the diff (default: 1).
@@ -427,12 +434,15 @@
Move the selection cursor up N half pages (default: 1).
-
+
Move the selection cursor to the first line of the file.
-
+
Move the selection cursor to the last line of the file.
+
+
Move the selection cursor to line N (default: 1).
+
+
Like g but defaults to the last line in the + file.
Open a diff view for the currently selected line's commit.
@@ -533,12 +543,16 @@
Move the selection cursor up N half pages (default: 1).
-
+
Move the selection cursor to the first entry.
-
+
Move the selection cursor to the last entry.
+
+
Move the selection cursor to entry N (default: 1).
+
+
Like g but defaults to the last entry.
Enter the currently selected directory, or switch to the blame view for the currently selected @@ -612,12 +626,17 @@
Move the selection cursor up N half pages (default: 1).
-
+
Move the selection cursor to the first reference.
-
+
Move the selection cursor to the last reference.
+
+
Move the selection cursor to reference N (default: 1).
+
+
Like g but defaults to the last + reference.
Open a log view which begins traversing history at the commit resolved via the currently selected @@ -778,7 +797,7 @@
November 8, - 2022 OpenBSD 7.2
+ line">January 17, + 2023 OpenBSD 7.2