- bump REVISION - change PERMIT_PACKAGE_CDROM to PERMIT_PACKAGE - change user _honk home directory mode, no longer group writable - update README, add icon and favicon
Index: Makefile =================================================================== RCS file: /cvs/ports/www/honk/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- Makefile 4 Jun 2019 02:41:49 -0000 1.6 +++ Makefile 13 Jun 2019 02:34:06 -0000 @@ -3,12 +3,13 @@ COMMENT = federated status updater DISTNAME = honk-0.6.0 +REVISION = 0 CATEGORIES = www HOMEPAGE = https://humungus.tedunangst.com/r/honk # ISC -PERMIT_PACKAGE_CDROM = Yes +PERMIT_PACKAGE = Yes WANTLIB += c pthread sqlite3 Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/www/honk/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- pkg/PLIST 4 Jun 2019 02:41:50 -0000 1.3 +++ pkg/PLIST 13 Jun 2019 02:34:06 -0000 @@ -10,15 +10,11 @@ share/doc/honk/ping.txt share/doc/honk/security.txt share/doc/honk/spec.txt share/doc/pkg-readmes/${PKGSTEM} -@mode 770 +@mode 750 @owner _honk @group _honk @sample ${VARBASE}/honk/ -@mode 750 @sample ${VARBASE}/honk/views/ -@mode -@owner -@group share/examples/honk/ share/examples/honk/schema.sql @sample ${VARBASE}/honk/schema.sql Index: pkg/README =================================================================== RCS file: /cvs/ports/www/honk/pkg/README,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 README --- pkg/README 30 Apr 2019 07:58:17 -0000 1.1.1.1 +++ pkg/README 13 Jun 2019 02:34:06 -0000 @@ -15,11 +15,18 @@ acme-client(1) # acme-client.conf(5) domain honk.example.com { domain key "/etc/ssl/private/honk.example.com.key" - domain certificate "/etc/ssl/honk.example.com.crt" domain full chain certificate "/etc/ssl/honk.example.com.fullchain.pem" sign with letsencrypt } +Icon and favicon +---------------- + +honk# mkdir /var/www/htdocs/honk +honk# ftp -o /var/www/htdocs/honk/icon.png https://honk.tedunangst.com/icon.png +honk# ftp -o /var/www/htdocs/honk/favicon.ico \ + https://honk.tedunangst.com/favicon.ico + httpd(8) -------- @@ -30,6 +37,9 @@ server "honk.example.com" { root "/acme" request strip 2 } + location "/*icon.*" { + root "/htdocs/honk" + } location "*" { block return 302 "https://honk.example.com$REQUEST_URI" } @@ -37,7 +47,7 @@ server "honk.example.com" { honk# rcctl enable httpd honk# rcctl start httpd -honk# acme-client -ADv honk.example.com +honk# acme-client -v honk.example.com relayd(8) --------- @@ -55,6 +65,8 @@ http protocol https { value "$SERVER_ADDR:$SERVER_PORT" match request header set "Connection" value "close" + match request path "/*icon.*" forward to <honk> + tcp { sack, backlog 128 } } @@ -63,6 +75,7 @@ relay wwwtls { protocol https forward to <honk> port $honk_port check tcp + forward to <honk> port http check http "/icon.png" code 200 } relay wwwtls6 { @@ -70,6 +83,7 @@ relay wwwtls6 { protocol https forward to <honk6> port $honk_port check tcp + forward to <honk> port http check http "/icon.png" code 200 } honk# cd /etc/ssl @@ -82,7 +96,6 @@ honk# ln -s honk.example.com.key 2001:0d honk# rcctl enable relayd honk# rcctl start relayd - pf(4) ----- @@ -96,11 +109,12 @@ Usage Please see /usr/local/share/doc/honk -honk# cd /var/honk && honk init +honk# doas -su _honk +honk$ umask 077; cd /var/honk && honk init listenaddr: localhost:31337 servername: honk.example.com -honk# touch /var/honk/savedinbox.json -honk# chmod 660 honk.db savedinbox.json +honk$ touch /var/honk/savedinbox.json +honk$ exit honk# rcctl enable honk honk# rcctl start honk