From be098ab2b8c211af475ff8d605b7279bdb05dc6d Mon Sep 17 00:00:00 2001 From: JoeServ Date: Mon, 16 May 2022 12:48:08 +0000 Subject: update --- etc/rc.conf | 14 +- root/.cshrc | 2 +- usr/local/etc/nginx/nginx.conf | 31 ++ usr/local/lib/cgit/filters/html-converters/md2html | 554 ++++++++++----------- 4 files changed, 313 insertions(+), 288 deletions(-) diff --git a/etc/rc.conf b/etc/rc.conf index 080c83d..4282bc8 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -1,12 +1,10 @@ -hostname="jozanofastora.xyz" +hostname="joe" sshd_enable="YES" ntpd_enable="YES" static_routes="linklocal" -ifconfig_vtnet0="DHCP" -ifconfig_vtnet0_ipv6="inet6 accept_rtadv" -ipv6_activate_all_interfaces="YES" -rtsold_enable="YES" -rtsold_flags="-aF" +devmatch_blacklist="virtio_random.ko" +sendmail_enable="NONE" +ifconfig_vtnet0="DHCP -rxcsum -tso" nginx_enable="YES" fcgiwrap_enable="YES" fcgiwrap_user="www" @@ -23,7 +21,3 @@ obspamd_enable="NO" obspamd_flags="-v" obspamlogd_enable="NO" dovecot_enable="NO" -sendmail_enable="NONE" -sendmail_submit_enable="NO" -sendmail_outbound_enable="NO" -sendmail_msp_queue_enable="NO" diff --git a/root/.cshrc b/root/.cshrc index 76c25b7..b1c5b5b 100644 --- a/root/.cshrc +++ b/root/.cshrc @@ -33,7 +33,7 @@ if ($?prompt) then set promptchars = "%#" set filec - set history = 1000 + set history = 10000 set savehist = (1000 merge) set autolist = ambiguous # Use history to aid expansion diff --git a/usr/local/etc/nginx/nginx.conf b/usr/local/etc/nginx/nginx.conf index 3c48000..3febbf9 100644 --- a/usr/local/etc/nginx/nginx.conf +++ b/usr/local/etc/nginx/nginx.conf @@ -89,6 +89,27 @@ http { ssl_certificate /usr/local/etc/letsencrypt/live/gitjoe.xyz/fullchain.pem; ssl_certificate_key /usr/local/etc/letsencrypt/live/gitjoe.xyz/privkey.pem; } + server{ + server_name watchoom.gitjoe.xyz; + root /usr/local/www/watchoom; + index index.html; + expires $expires; + + location / { + try_files $uri $uri/ =404; + } + location ~ /\.ht { + deny all; + } + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/local/www/nginx-dist; + } + + listen 443 ssl; + ssl_certificate /usr/local/etc/letsencrypt/live/gitjoe.xyz/fullchain.pem; + ssl_certificate_key /usr/local/etc/letsencrypt/live/gitjoe.xyz/privkey.pem; +} server { server_name fossil.jozanofastora.xyz; @@ -138,6 +159,16 @@ server{ return 404; } +server{ + if ($host = watchoom.gitjoe.xyz) { + return 301 https://$host$request_uri; + } + + server_name watchoom.gitjoe.xyz; + listen 80; + return 404; +} + #server { # if ($host = fossil.jozanofastora.xyz) { # return 301 https://$host$request_uri; diff --git a/usr/local/lib/cgit/filters/html-converters/md2html b/usr/local/lib/cgit/filters/html-converters/md2html index fd10340..7d97b1e 100755 --- a/usr/local/lib/cgit/filters/html-converters/md2html +++ b/usr/local/lib/cgit/filters/html-converters/md2html @@ -8,285 +8,285 @@ sys.stdin = io.TextIOWrapper(sys.stdin.buffer, encoding='utf-8') sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='utf-8') sys.stdout.write('''