Merge branch 'cgit-alpine-port'

Port the cgit docker image to build from Alpine Linux, and finish the
file tree clean up started by the previous merge.

* cgit-alpine-port:
  cgit: Update SSH clone URLs
  cgit: Update scan-path / repository mount location
  cgit: Update user and file paths for alpine distro
  cgit: Port Dockerfile for alpine base
  cgit: Consolidate config files into a single directory

3 files changed, 85 insertions, 0 deletions

diff --git a/cgit/Dockerfile b/cgit/Dockerfile
new file mode 100644
index 0000000..9e1c442
--- /dev/null
+++ b/cgit/Dockerfile
@@ -0,0 +1,12 @@
+# https://git.zx2c4.com/cgit/
+
+FROM alpine
+
+RUN apk --no-cache upgrade
+RUN apk --no-cache add apache2 cgit
+
+COPY httpd.conf /etc/apache2/
+COPY cgitrc /etc/
+
+EXPOSE 80
+CMD ["/usr/sbin/httpd", "-DFOREGROUND"]
diff --git a/cgit/cgitrc b/cgit/cgitrc
new file mode 100644
index 0000000..34bbe81
--- /dev/null
+++ b/cgit/cgitrc
@@ -0,0 +1,38 @@
+# cgit config
+# see cgitrc(5) for details
+#
+# possible todos: header, footer
+
+css=/cgit.css
+logo=/cgit.png
+logo-link=/
+
+root-title=NormalMode.org Repositories
+root-desc=Public repositories hosted on normalmode.org
+
+clone-url=https://$HTTP_HOST$SCRIPT_NAME/$CGIT_REPO_URL ssh://git@$HTTP_HOST/$CGIT_REPO_URL
+
+enable-blame=1
+enable-follow-links=1
+enable-git-config=1
+enable-http-clone=1
+enable-index-links=1
+enable-index-owner=1
+enable-log-filecount=1
+enable-log-linecount=1
+enable-tree-linenumbers=1
+
+section-sort=1
+repository-sort=age
+branch-sort=age
+agefile=agefile
+
+max-repo-count=512
+max-stats=year
+
+snapshots=tar.gz zip
+remove-suffix=1
+section-from-path=-1
+strict-export=gl-creator
+
+scan-path=/repositories/
diff --git a/cgit/httpd.conf b/cgit/httpd.conf
new file mode 100644
index 0000000..e8ee772
--- /dev/null
+++ b/cgit/httpd.conf
@@ -0,0 +1,35 @@
+# https://httpd.apache.org/docs/current/
+# https://httpd.apache.org/docs/current/mod/directives.html
+
+LoadModule alias_module /usr/lib/apache2/mod_alias.so
+LoadModule authz_core_module /usr/lib/apache2/mod_authz_core.so
+LoadModule cgid_module /usr/lib/apache2/mod_cgid.so
+LoadModule mpm_event_module /usr/lib/apache2/mod_mpm_event.so
+LoadModule unixd_module /usr/lib/apache2/mod_unixd.so
+
+ServerRoot "/etc/apache2"
+ServerAdmin webmaster@example.com
+ServerName localhost
+Listen 80
+User apache
+Group apache
+
+ErrorLog "/var/log/apache2/error_log"
+LogLevel warn
+
+<Directory "/">
+    AllowOverride None
+    Require all denied
+</Directory>
+
+<Directory "/usr/share/webapps/cgit/">
+    AllowOverride None
+    Options ExecCGI FollowSymlinks
+    Require all granted
+</Directory>
+
+Alias /cgit.css "/usr/share/webapps/cgit/cgit.css"
+Alias /cgit.png "/usr/share/webapps/cgit/cgit.png"
+Alias /favicon.ico "/usr/share/webapps/cgit/favicon.ico"
+
+ScriptAlias / "/usr/share/webapps/cgit/cgit.cgi/"