diff --git a/AUTHORS b/AUTHORS
index 256ea6b..e77f919 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,13 +1,3 @@
-Maintainer:
- June McEnroe <june@causal.agency>
-
-Contributors:
- Jason A. Donenfeld <Jason@zx2c4.com>
- Lukas Fleischer <cgit@cryptocrack.de>
- Johan Herland <johan@herland.net>
- Lars Hjemli <hjemli@gmail.com>
- Ferry Huberts <ferry.huberts@pelagic.nl>
- John Keeping <john@keeping.me.uk>
-
-Previous Maintainer:
- Lars Hjemli <hjemli@gmail.com>
+Authors of cgit-magenta:
+ Maintainer:
+ Rory& <root@rory.gay> / matrix:u/emma:rory.gay
\ No newline at end of file
diff --git a/README b/README.MD
index 2094b87..1870e16 100644
--- a/README
+++ b/README.MD
@@ -1,7 +1,7 @@
-cgit-pink - CGI for Git
+cgit-magenta - CGI for Git
=======================
-This is a fork of cgit, an attempt to create a fast web interface
+This is a fork of cgit-pink, an attempt to create a fast web interface
for the Git SCM, using a built-in cache to decrease server I/O
pressure.
@@ -14,20 +14,26 @@ depends on how you obtained the cgit sources:
a) If you're working in a cloned cgit repository, you first need to
initialize and update the Git submodule:
+```shell
$ git submodule init # register the Git submodule in .git/config
$ $EDITOR .git/config # if you want to specify a different url for git
$ git submodule update # clone/fetch and checkout correct git version
+```
b) If you're building from a cgit tarball, you can download a proper git
version like this:
+```shell
$ make get-git
+```
When either a) or b) has been performed, you can build and install cgit like
this:
+```shell
$ make
$ sudo make install
+```
This will install `cgit.cgi` and `cgit.css` into `/var/www/htdocs/cgit`. You
can configure this location (and a few other things) by providing a `cgit.conf`
@@ -46,14 +52,14 @@ Apache configuration
A new `Directory` section must probably be added for cgit, possibly something
like this:
-
+```xml
<Directory "/var/www/htdocs/cgit/">
AllowOverride None
Options +ExecCGI
Order allow,deny
Allow from all
</Directory>
-
+```
Runtime configuration
---------------------
@@ -80,9 +86,6 @@ the HTTP headers `Modified` and `Expires`.
Online presence
---------------
-* The cgit-pink homepage is hosted by cgit at
- <https://git.causal.agency/cgit-pink/about>
+* The cgit-magenta homepage is hosted by cgit at [cgit.rory.gay](https://cgit.rory.gay/cgit-magenta.git/about/)
-* Patches, bug reports, discussions and support should go to the cgit-pink
- mailing list: <list+cgit@causal.agency>. Archives are available at:
- <https://causal.agency/list/cgit.html>
+* Patches, bug reports, discussions and support should go to the cgit-magenta [Matrix room](https://matrix.to/#/%23cgit-magenta%3Arory.gay?via=rory.gay).
diff --git a/cgit.c b/cgit.c
index 8ea1b62..3e76a0a 100644
--- a/cgit.c
+++ b/cgit.c
@@ -972,7 +972,7 @@ static void cgit_parse_args(int argc, const char **argv)
for (i = 1; i < argc; i++) {
if (!strcmp(argv[i], "--version")) {
- printf("CGit-pink %s | https://git.causal.agency/cgit-pink/\n\nCompiled in features:\n", CGIT_VERSION);
+ printf("CGit-magenta %s | https://cgit.rory.gay/cgit-magenta.git/\n\nCompiled in features:\n", CGIT_VERSION);
#ifndef HAVE_LINUX_SENDFILE
printf("[-] ");
#else
diff --git a/ui-shared.c b/ui-shared.c
index 7eb7fc8..9927c9b 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -877,7 +877,7 @@ void cgit_print_docend(void)
if (ctx.cfg.footer)
html_include(ctx.cfg.footer);
else {
- htmlf("<div class='footer'>generated by <a href='https://git.causal.agency/cgit-pink/about/'>cgit-pink %s</a> "
+ htmlf("<div class='footer'>generated by <a href='https://cgit.rory.gay/cgit-magenta.git/about/'>cgit-magenta %s</a> "
"(<a href='https://git-scm.com/'>git %s</a>) at ", cgit_version, git_version_string);
html_txt(show_date(time(NULL), 0, cgit_date_mode(DATE_ISO8601)));
html("</div>\n");
|
