aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHimbeer <himbeerserverde@gmail.com>2024-02-17 19:13:52 +0100
committerHimbeer <himbeerserverde@gmail.com>2024-02-17 19:13:52 +0100
commit2570a15c4393a7e232a3478fc09130fe43ba06c8 (patch)
treebbefeea7c705ee6868bbcf5d507b6a0e35517c95
parentac06c3370755c8c48c5da12db91cdb7df99af8e9 (diff)
grant access to /base/*.png and load cgit.css directly from /usr/share/webapps/cgit
-rw-r--r--.gitignore1
-rw-r--r--README.md4
-rwxr-xr-xinstall.sh2
-rw-r--r--sys/etc/caddy/Caddyfile4
-rw-r--r--sys/etc/cgitrc2
-rwxr-xr-xuninstall.sh2
6 files changed, 7 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index e6cf993..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-static/base/cgit.css
diff --git a/README.md b/README.md
index aab745f..33e4760 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,8 @@ No JavaScript is used, but there is a global CSS stylesheet.
The `sys` directory contains the filesystem structure to copy to the rootfs.
This repository should be cloned to `/srv/www`.
-The `install.sh` script creates symlinks for configuration files to `/srv/www`
-and copies the cgit stylesheet to the base directory, overwriting existing files.
+The `install.sh` script creates symlinks for configuration files to `/srv/www`,
+overwriting existing files.
The `uninstall.sh` script removes them again without restoring the original files.
## Required system packages
diff --git a/install.sh b/install.sh
index d71547e..1a3afe2 100755
--- a/install.sh
+++ b/install.sh
@@ -5,5 +5,3 @@ source /srv/www/lib.sh
for FILE in ${FILES}; do
ln -sf "/srv/www/sys/${FILE}" "/${FILE}"
done
-
-cp -p /usr/share/webapps/cgit/cgit.css /srv/www/static/base/cgit.css
diff --git a/sys/etc/caddy/Caddyfile b/sys/etc/caddy/Caddyfile
index bf589bb..7fde486 100644
--- a/sys/etc/caddy/Caddyfile
+++ b/sys/etc/caddy/Caddyfile
@@ -14,7 +14,9 @@ himbeerserver.de {
@base {
path /base/*
+
not path /base/*.css
+ not path /base/*.png
}
@markdown {
@@ -58,7 +60,9 @@ git.himbeerserver.de {
@base {
path /base/*
+
not path /base/*.css
+ not path /base/*.png
}
@well_known {
diff --git a/sys/etc/cgitrc b/sys/etc/cgitrc
index a764f3e..77dbb92 100644
--- a/sys/etc/cgitrc
+++ b/sys/etc/cgitrc
@@ -1,4 +1,4 @@
-css=/base/cgit.css
+css=/cgit/cgit.css
logo=/base/himbeerlogo.png
favicon=/favicon.ico
diff --git a/uninstall.sh b/uninstall.sh
index c6cccbb..9ff5f45 100755
--- a/uninstall.sh
+++ b/uninstall.sh
@@ -5,5 +5,3 @@ source /srv/www/lib.sh
for FILE in ${FILES}; do
rm "/${FILE}"
done
-
-rm /srv/www/static/base/cgit.css