diff options
| author | Eugene Triguba <hello@eugenetriguba.com> | 2026-10-04 07:51:05 -0700 |
|---|---|---|
| committer | Eugene Triguba <hello@eugenetriguba.com> | 2026-10-11 18:36:50 -0700 |
| commit | 0e702b68e777ed1f2273fcb5fa877b8fd3143188 (patch) | |
| tree | be920555ee969ba1903a69894721ae5b5aea3759 | |
| parent | Remove extra / location in httpd cgit conf and remove server header (diff) | |
| download | site-configs-0e702b68e777ed1f2273fcb5fa877b8fd3143188.zip | |
Enable more cgit features, add markdown renderer, and extra head
- I went through `man cgitrc` and enabled a bunch of the features
that are off by default because they look fun.
- Add `lowdown` to chroot to enable rendering markdown in the web view.
- The extra head.html file ensures mobile devices don't try to render it
in desktop view. I mean...it still looks awful on mobile...but it's
kinda better than before.
| -rw-r--r-- | roles/obsd_cgit/files/convert-markdown.c | 33 | ||||
| -rw-r--r-- | roles/obsd_cgit/files/head.html | 1 | ||||
| -rw-r--r-- | roles/obsd_cgit/tasks/lowdown.yml | 43 | ||||
| -rw-r--r-- | roles/obsd_cgit/tasks/main.yml | 27 | ||||
| -rw-r--r-- | roles/obsd_cgit/templates/cgitrc.j2 | 35 |
5 files changed, 120 insertions, 19 deletions
diff --git a/roles/obsd_cgit/files/convert-markdown.c b/roles/obsd_cgit/files/convert-markdown.c new file mode 100644 index 0000000..90b5e57 --- /dev/null +++ b/roles/obsd_cgit/files/convert-markdown.c @@ -0,0 +1,33 @@ +#include <err.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/queue.h> +#include <lowdown.h> + +int main(void) { + struct lowdown_opts opts; + char *buf; + size_t bufsz; + + memset(&opts, 0, sizeof(struct lowdown_opts)); + opts.type = LOWDOWN_HTML; + opts.feat = LOWDOWN_FOOTNOTES | + LOWDOWN_AUTOLINK | + LOWDOWN_TABLES | + LOWDOWN_SUPER | + LOWDOWN_STRIKE | + LOWDOWN_FENCED | + LOWDOWN_COMMONMARK | + LOWDOWN_DEFLIST | + LOWDOWN_IMG_EXT | + LOWDOWN_METADATA; + opts.oflags = LOWDOWN_HTML_HEAD_IDS | + LOWDOWN_HTML_NUM_ENT | + LOWDOWN_HTML_OWASP | + LOWDOWN_SMARTY; + if (!lowdown_file(&opts, stdin, &buf, &bufsz, NULL)) + errx(1, "lowdown_file"); + fwrite(buf, 1, bufsz, stdout); + free(buf); +} diff --git a/roles/obsd_cgit/files/head.html b/roles/obsd_cgit/files/head.html new file mode 100644 index 0000000..3dee41f --- /dev/null +++ b/roles/obsd_cgit/files/head.html @@ -0,0 +1 @@ +<meta name="viewport" content="width=device-width, initial-scale=1" /> diff --git a/roles/obsd_cgit/tasks/lowdown.yml b/roles/obsd_cgit/tasks/lowdown.yml new file mode 100644 index 0000000..9d6b466 --- /dev/null +++ b/roles/obsd_cgit/tasks/lowdown.yml @@ -0,0 +1,43 @@ +- name: Install lowdown package + ansible.builtin.package: + name: lowdown + state: present + +- name: Copy lowdown binary into chroot + ansible.builtin.copy: + src: convert-markdown.c + dest: /tmp/ + owner: root + group: wheel + mode: "0755" + +- name: Ensure chroot bin directory exists + ansible.builtin.file: + path: "/var/www/bin" + state: directory + owner: root + group: bin + mode: "0755" + +- name: Statically compile convert-markdown to /var/www/bin/convert-markdown + ansible.builtin.command: | + cc convert-markdown.c \ + -o /var/www/bin/convert-markdown \ + -I/usr/local/include \ + -L/usr/local/lib \ + -llowdown \ + -lm \ + -static \ + -pie + args: + chdir: /tmp + +- name: Strip /var/www/bin/convert-markdown + ansible.builtin.command: strip /var/www/bin/convert-markdown + +- name: Update ownership + ansible.builtin.file: + path: /var/www/bin/convert-markdown + owner: root + group: daemon + mode: "0755" diff --git a/roles/obsd_cgit/tasks/main.yml b/roles/obsd_cgit/tasks/main.yml index 3bb2593..3971803 100644 --- a/roles/obsd_cgit/tasks/main.yml +++ b/roles/obsd_cgit/tasks/main.yml @@ -12,14 +12,6 @@ mode: "0644" notify: restart httpd -- name: Deploy cgitrc - ansible.builtin.template: - src: cgitrc.j2 - dest: /var/www/conf/cgitrc - owner: www - group: daemon - mode: "0644" - - name: Create cgit cache directory ansible.builtin.file: path: "{{ cgit_cache_dir }}" @@ -27,3 +19,22 @@ owner: www group: daemon mode: "0755" + +- name: Set up lowdown markdown renderer in chroot + ansible.builtin.include_tasks: lowdown.yml + +- name: Copy extra html head file into chroot + ansible.builtin.copy: + src: head.html + dest: /var/www/cgit/ + owner: root + group: daemon + mode: "0644" + +- name: Deploy cgitrc configuration + ansible.builtin.template: + src: cgitrc.j2 + dest: /var/www/conf/cgitrc + owner: www + group: daemon + mode: "0644" diff --git a/roles/obsd_cgit/templates/cgitrc.j2 b/roles/obsd_cgit/templates/cgitrc.j2 index 9633092..c8eb111 100644 --- a/roles/obsd_cgit/templates/cgitrc.j2 +++ b/roles/obsd_cgit/templates/cgitrc.j2 @@ -1,17 +1,30 @@ -css=/cgit.css -logo=/cgit.png +root-title=Eugene Triguba's Git Repositories +enable-blame=1 +enable-commit-graph=1 +enable-follow-links=1 enable-git-config=1 +enable-index-links=1 +enable-index-owner=1 +enable-log-filecount=1 +enable-log-linecount=1 +enable-remote-branches=1 +enable-subject=links=1 +enable-tree-linenumbers=1 +# Disable cgit's 'dumb' http support +enable-http-clone=0 -cache-root={{ cgit_cache_dir }} -cache-size=1000 +about-filter=/bin/convert-markdown +head-include=/cgit/head.html -# Set the title and heading of the repository index page -root-title=Eugene Triguba's Git Repositories - -## Search for these files in the root of the default branch of repositories -## for coming up with the about page: -readme=:README +max-atom-items=100 +max-stats=year +remove-suffix=1 +readme=:README.md +css=/cgit.css +logo=/cgit.png virtual-root=/ -scan-path={{ cgit_repos_dir }} +scan-path=/pub/git +cache-root=/var/www/cgit/cache +cache-size=1000 |