From 0e87ce219ae9d43010cb3e87f8775b01f8780bef Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Mon, 12 Oct 2026 09:05:12 -0700 Subject: Rename convert-markdown to md2html --- roles/obsd_cgit/files/convert-markdown.c | 33 -------------------------------- roles/obsd_cgit/files/md2html.c | 33 ++++++++++++++++++++++++++++++++ roles/obsd_cgit/tasks/markdown.yml | 24 +++++++++++------------ roles/obsd_cgit/templates/cgitrc.j2 | 2 +- 4 files changed, 46 insertions(+), 46 deletions(-) delete mode 100644 roles/obsd_cgit/files/convert-markdown.c create mode 100644 roles/obsd_cgit/files/md2html.c (limited to 'roles/obsd_cgit') diff --git a/roles/obsd_cgit/files/convert-markdown.c b/roles/obsd_cgit/files/convert-markdown.c deleted file mode 100644 index 90b5e57..0000000 --- a/roles/obsd_cgit/files/convert-markdown.c +++ /dev/null @@ -1,33 +0,0 @@ -#include -#include -#include -#include -#include -#include - -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/md2html.c b/roles/obsd_cgit/files/md2html.c new file mode 100644 index 0000000..90b5e57 --- /dev/null +++ b/roles/obsd_cgit/files/md2html.c @@ -0,0 +1,33 @@ +#include +#include +#include +#include +#include +#include + +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/tasks/markdown.yml b/roles/obsd_cgit/tasks/markdown.yml index 4700df8..51053d9 100644 --- a/roles/obsd_cgit/tasks/markdown.yml +++ b/roles/obsd_cgit/tasks/markdown.yml @@ -1,17 +1,17 @@ -- name: lowdown exists # noqa: name[casing] +- name: md2html exists # noqa: name[casing] ansible.builtin.stat: - path: /var/www/bin/lowdown - register: obsd_cgit_ld_bin + path: /var/www/bin/md2html + register: obsd_cgit_md2html_bin - name: Install lowdown package ansible.builtin.package: name: lowdown state: present - when: not obsd_cgit_ld_bin.stat.exists + when: not obsd_cgit_md2html_bin.stat.exists -- name: Copy convert-markdown.c into /tmp +- name: Copy md2html into /tmp ansible.builtin.copy: - src: convert-markdown.c + src: md2html.c dest: /tmp/ owner: root group: wheel @@ -25,10 +25,10 @@ group: bin mode: "0755" -- name: Statically compile convert-markdown to /var/www/bin/convert-markdown +- name: Statically compile md2html to /var/www/bin/md2html ansible.builtin.command: | - cc convert-markdown.c \ - -o /var/www/bin/convert-markdown \ + cc md2html.c \ + -o /var/www/bin/md2html \ -I/usr/local/include \ -L/usr/local/lib \ -llowdown \ @@ -38,11 +38,11 @@ -s args: chdir: /tmp - creates: /var/www/bin/convert-markdown + creates: /var/www/bin/md2html -- name: Ensure root:daemon owns convert-markdown binary +- name: Ensure root:daemon owns md2html binary ansible.builtin.file: - path: /var/www/bin/convert-markdown + path: /var/www/bin/md2html owner: root group: daemon mode: "0755" diff --git a/roles/obsd_cgit/templates/cgitrc.j2 b/roles/obsd_cgit/templates/cgitrc.j2 index 9bb23e5..306ef84 100644 --- a/roles/obsd_cgit/templates/cgitrc.j2 +++ b/roles/obsd_cgit/templates/cgitrc.j2 @@ -15,7 +15,7 @@ enable-tree-linenumbers=1 enable-http-clone=0 snapshots=zip -about-filter=/bin/convert-markdown +about-filter=/bin/md2html head-include={{ obsd_cgit_htdocs_dir }}/head.html max-atom-items=100 -- cgit v1.2.3