commit 56f3f26e58e5af5ce463361646c8818836db83e0 from: Stefan Sperling date: Mon Jun 03 09:28:38 2024 UTC sync manual pages commit - 89fed1f113b6f6e58fbf83b38af9d93db6ab4ea5 commit + 56f3f26e58e5af5ce463361646c8818836db83e0 blob - 7976c47b337591a6528f7c5612d4cf8713310d00 blob + be522d4aa58b8030dc21c71348996d88de88ea32 --- git-repository.5.html +++ git-repository.5.html @@ -214,7 +214,7 @@
May 6, + line">June 3, 2024 OpenBSD 7.5
blob - 15d5badc1b031fcc097dfc1fc0713442e6f3b570 blob + c195a43bf5207a78e6bb8c531d08142c17c66e63 --- gitwrapper.1.html +++ gitwrapper.1.html @@ -142,7 +142,7 @@
May 6, + line">June 3, 2024 OpenBSD 7.5
blob - c7720b248733e2cc40b2dfb58b34f75185aecc65 blob + 609cafc0eb22b9d276a4fffb7e8f4a6ad9d3241c --- got-worktree.5.html +++ got-worktree.5.html @@ -186,7 +186,7 @@
May 6, + line">June 3, 2024 OpenBSD 7.5
blob - d4ce07d75dc6d88f2b3be20e83044d8592325557 blob + c86caee93d720134b6bfc6631536b5a785196637 --- got.1.html +++ got.1.html @@ -59,9 +59,9 @@ tree which can be placed at an arbitrary directory in the filesystem hierarchy. The on-disk format of this work tree is described in got-worktree(5).

-

got provides global and command-specific - options. Global options must precede the command name, and are as - follows:

+

The got utility provides global and + command-specific options. Global options must precede the command name, and + are as follows:

Display usage information and exit immediately.
@@ -69,8 +69,48 @@ --version
Display program version and exit immediately.
+

The got utility only provides commands + needed to perform version control tasks. Commands needed for repository + maintenance tasks are provided by gotadmin(1). Git repository server functionality is provided + by gotd(8). A repository + interface for web browsers is provided by gotwebd(8). An interactive repository interface for the + terminal is provided by tog(1).

The commands for got are as follows:

+
+ [-b branch] + repository-path
+
Create a new empty repository at the specified + repository-path. +

After got init, the new repository + must be populated before got checkout can be + used. The got import command can be used to + populate the new repository with data from a local directory. + Alternatively, on a server running gotd(8), the new repository can be made available to + got(1) or + git(1) clients by adding + the repository to gotd.conf(5) and restarting gotd(8). Clients may then clone the new repository from + the server, populate the cloned repository, and then populate the new + repository on the server via got send or + git push.

+

The options for got init are as + follows:

+
+
+ branch
+
Make the repository's HEAD reference point to the specified + branch instead of the default branch + “main”.
+
+

The got init command is equivalent to + gotadmin init.

+
[-b branch] [-I pattern] @@ -96,7 +136,7 @@

The options for got import are as follows:

-
+
branch
Create the specified branch. If this option is not specified, a branch corresponding to the repository's HEAD @@ -199,7 +239,7 @@ not specified, a branch resolved via the remote repository's HEAD reference will be fetched. Cannot be used together with the -b option.
-
+
branch
Fetch the specified branch from the remote repository's “refs/heads/” reference namespace. This @@ -328,7 +368,7 @@ enabled by default for specific repositories in got.conf(5). Cannot be used together with the -b option.
-
+
branch
Fetch the specified branch from the remote repository's “refs/heads/” reference namespace. This @@ -434,7 +474,7 @@

The options for got checkout are as follows:

-
+
branch
Check out files from a commit on the specified branch. If this option is not specified, a @@ -563,7 +603,7 @@

The options for got update are as follows:

-
+
branch
Switch the work tree's branch reference to the specified branch before updating the work tree. This @@ -750,7 +790,7 @@

The options for got log are as follows:

-
+
Display individual commits which were merged into the current branch from other branches. By default, got log shows the linear history of the current branch only.
@@ -1800,7 +1840,7 @@ -a option is equivalent to listing all branches with multiple -b options. Cannot be used together with the -b option.
-
+
branch
Send the specified branch from the local repository's “refs/heads/” reference namespace. This @@ -3043,7 +3083,7 @@ populated with files, e.g. from a temporary CVS checkout located at /tmp/src:

-
$ gotadmin init +
$ got init /var/git/src.git
$ got import -r /var/git/src.git -I CVS -I obj /tmp/src
@@ -3509,7 +3549,7 @@ remote "origin" {
May 6, + line">June 3, 2024 OpenBSD 7.5
blob - cb3bbe9a76b1b1a2a3847ef121bb202dafd63746 blob + 00db9e44a707116a7825094fde222c5148730cdf --- got.conf.5.html +++ got.conf.5.html @@ -320,7 +320,7 @@
May 6, + line">June 3, 2024 OpenBSD 7.5
blob - b42ff8aa59d400d3502ad9433b7263890ec0c355 blob + 2756e4c9e3ad28e901ab436b2fc4d6f72ff69d71 --- gotadmin.1.html +++ gotadmin.1.html @@ -72,10 +72,20 @@ repository-path
Create a new empty repository at the specified repository-path. -

After gotadmin init, the - got import command must be used to populate the - empty repository before got checkout can be - used.

+

After gotadmin init, the new + repository must be populated before got checkout + can be used. The got import command can be used + to populate the new repository with data from a local directory. + Alternatively, on a server running gotd(8), the new repository can be made available to + got(1) or + git(1) clients by adding + the repository to gotd.conf(5) and restarting gotd(8). Clients may then clone the new repository from + the server, populate the cloned repository, and then populate the new + repository on the server via got send or + git push.

The options for gotadmin init are as follows:

@@ -85,6 +95,8 @@ branch instead of the default branch “main”.
+

The gotadmin init command is + equivalent to got init.

[-r repository-path]
@@ -424,7 +436,7 @@
May 6, + line">June 3, 2024 OpenBSD 7.5
blob - a7a957740ed2061bc8972effde4a42d20021334a blob + d9ab4657dd91a54d05144c52c6082dba5972e97c --- gotctl.8.html +++ gotctl.8.html @@ -86,7 +86,7 @@
May 6, + line">June 3, 2024 OpenBSD 7.5
blob - 23055ac120108fd294c7f3473d3c71683ec3c1ec blob + d27de00f2eacf5ff494948cf04e9cb0d6e2ce22f --- gotd.8.html +++ gotd.8.html @@ -85,6 +85,35 @@
+

+

Create an empty repository to be served by + gotd, ensuring that it can only be accessed by the + _gotd user:

+

+
# mkdir -p + /git/myrepo.git
+
# chmod 700 + /git/myrepo.git
+
# chown _gotd + /git/myrepo.git
+
# su -m _gotd -c 'gotadmin init + /git/myrepo.git'
+

Add the new repository to gotd.conf(5) granting read-write access to the flan_hacker + user account, and restart gotd:

+

+
# cat >> /etc/gotd.conf + <<EOF
+
repository 'myrepo' {
+
path '/git/myrepo.git'
+
permit rw flan_hacker
+
}
+
EOF
+
# rcctl restart gotd
+

The flan_hacker user can now populate the empty repository with + got send.

+
+

got(1), @@ -99,7 +128,7 @@

May 6, + line">June 3, 2024 OpenBSD 7.5
blob - 5c46d031257966a5ab587692aa730a16f71dc2f9 blob + a299c1982e254d6378a168c4fbef2d34418c62c0 --- gotd.conf.5.html +++ gotd.conf.5.html @@ -474,7 +474,7 @@ connection {
May 6, + line">June 3, 2024 OpenBSD 7.5
blob - cc433ea0aa641f9a2aa00e604cee893480d558d7 blob + 8871bfbb19c4dc2902c1c0d1957b19af23200686 --- gotsh.1.html +++ gotsh.1.html @@ -157,7 +157,7 @@
May 6, + line">June 3, 2024 OpenBSD 7.5
blob - 67e752267bdc6f69fa849f36c9a863d258f230c2 blob + fe6d517f78fc7909352e048d9efb4f7ded797f29 --- gotwebd.8.html +++ gotwebd.8.html @@ -120,6 +120,9 @@
/var/www/htdocs/gotwebd/
Directory containing HTML, CSS, and image files used by gotwebd.
+
/var/www/run/gotweb.sock
+
Default location for the gotwebd listening + socket.
/tmp/
Directory for temporary files created by gotwebd.
@@ -188,7 +191,7 @@ server "example.com" {
May 6, + line">June 3, 2024 OpenBSD 7.5
blob - df1924790c646b4691bc170c03bf5e2680d62447 blob + 21fe0989bbe7802c5dcfbf97796def829bb6dbb9 --- gotwebd.conf.5.html +++ gotwebd.conf.5.html @@ -61,22 +61,37 @@ listen on $lan_addr port 9090 path
Set the path to the chroot(2) environment of httpd(8). If not specified then /var/www - will be used.
+ 8">httpd(8). If not specified, it defaults to + /var/www, the home directory of the www user. +
address port + number
+
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 + listening sockets.
+
path
+
Configure a UNIX-domain socket for incoming + FastCGI connections. May be specified multiple times to build up a list of + listening sockets.
number
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. - Listening on unix sockets is the default.
-
- path
-
Set the path to the default unix socket. Defaults to - /var/www/run/gotweb.sock.
+
+ user
+
Set the user which will run + gotwebd(8). If not + specified, the user www will be used.
+

If no listen directive is used, + gotwebd(8) will listen on + the UNIX-domain socket at + /var/www/run/gotweb.sock.

gotwebd(8) to function. In case no server context is defined in the configuration file, a default - server context will be used, which listens on a unix socket at - /var/www/run/gotweb.sock and uses default parameters - for all applicable settings.

+ server context will be used which uses default parameters for all applicable + settings.

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

@@ -101,24 +115,6 @@ listen on $lan_addr port 9090
Set the path to a custom Cascading Style Sheet (CSS) to be used. If this option is not specified then the default style sheet ‘gotweb.css’ will be used.
-
address port - number
-
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 - listening sockets. However, a given combination of address and port may - only be used by one server.

-
-
-
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. Defaults @@ -203,6 +199,9 @@ owner = "Your Name"
/etc/gotwebd.conf
Default location of the gotwebd.conf configuration file.
+
/var/www/run/gotweb.sock
+
Default location for the gotwebd(8) listening socket.

@@ -218,10 +217,11 @@ owner = "Your Name"

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
+
listen on 127.0.0.1 port 9000
+listen on ::1 port 9000
+
+server "localhost" {
+	site_name "my public repos"
 }
@@ -236,7 +236,7 @@ owner = "Your Name"
May 6, + line">June 3, 2024 OpenBSD 7.5
blob - 7a12c169c9a8f169919305485dcdf488e9b240fc blob + 77900014e6de994d0f549f354bc283b107b66378 --- tog.1.html +++ tog.1.html @@ -847,7 +847,7 @@
May 6, + line">June 3, 2024 OpenBSD 7.5