From d32086317ee461518550a59fdab72868ee01ed79 Mon Sep 17 00:00:00 2001
From: "yakumo.izuru" <yakumo.izuru@f3bd38d9-da89-464d-a02a-eb04e43141b5>
Date: Sun, 24 Mar 2024 22:42:12 +0000
Subject: [PATCH] =?UTF-8?q?=E3=82=AD=E3=83=A3=E3=83=83=E3=83=81=E3=83=BB?=
 =?UTF-8?q?=E3=82=A2=E3=83=B3=E3=83=89=E3=83=BB=E3=83=AA=E3=83=AA=E3=83=BC?=
 =?UTF-8?q?=E3=82=B9=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Izuru Yakumo <yakumo.izuru@chaotic.ninja>

git-svn-id: file:///srv/svn/repo/yukari/trunk@151 f3bd38d9-da89-464d-a02a-eb04e43141b5
---
 CHANGELOG.md           |   4 ++++
 cmd/yukari/favicon.ico | Bin 0 -> 3262 bytes
 cmd/yukari/main.go     |   8 +++-----
 rc.d/yukari            |  23 +++++++++++++++++++++++
 rc.d/yukarid           |  10 ++++++++++
 5 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 cmd/yukari/favicon.ico
 create mode 100644 rc.d/yukari
 create mode 100644 rc.d/yukarid

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8aa2c3c..e24aace 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v0.2.4 - 2024.03.24
+* Replace invalid favicon with one sourced from [here](https://en.touhouwiki.net/wiki/File:Th123YukariSigil.png), as well as using `//go:embed` for it
+* Add rc.d files for FreeBSD and OpenBSD, respectively
+
 # v0.2.3 - 2024.03.21
 * Document the configuration file format, which is INI-style (which is compatible to the old format in the codebase, though it's now called as `config.Config.<key>`)
 * Manual page has been rewritten (using `mdoc(7)`)
diff --git a/cmd/yukari/favicon.ico b/cmd/yukari/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..905b254630b5718e660bfd947b98dd96ca85f142
GIT binary patch
literal 3262
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
CZ!V|+

literal 0
HcmV?d00001

diff --git a/cmd/yukari/main.go b/cmd/yukari/main.go
index e286ef5..b2c6ccf 100644
--- a/cmd/yukari/main.go
+++ b/cmd/yukari/main.go
@@ -76,7 +76,6 @@ type HTMLMainPageFormParam struct {
 	URLParamName string
 }
 
-var faviconBytes []byte
 var htmlFormExtension *template.Template
 var htmlBodyExtension *template.Template
 var htmlMainPageForm *template.Template
@@ -87,11 +86,10 @@ var htmlHeadContentType string
 var htmlPageStart string
 //go:embed templates/yukari_stop.html
 var htmlPageStop string
+//go:embed favicon.ico
+var faviconBytes []byte
 
 func init() {
-	FaviconBase64 := "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQEAYAAABPYyMiAAAABmJLR0T///////8JWPfcAAAACXBIWXMAAABIAAAASABGyWs+AAAAF0lEQVRIx2NgGAWjYBSMglEwCkbBSAcACBAAAeaR9cIAAAAASUVORK5CYII"
-
-	faviconBytes, _ = base64.StdEncoding.DecodeString(FaviconBase64)
 	var err error
 	htmlFormExtension, err = template.New("html_form_extension").Parse(
 		`<input type="hidden" name="yukariurl" value="{{.BaseURL}}" />{{if .YukariHash}}<input type="hidden" name="yukarihash" value="{{.YukariHash}}" />{{end}}`)
@@ -387,7 +385,7 @@ func appRequestHandler(ctx *fasthttp.RequestCtx) bool {
 
 	// server favicon.ico
 	if bytes.Equal(ctx.Path(), []byte("/favicon.ico")) {
-		ctx.SetContentType("image/png")
+		ctx.SetContentType("image/vnd.microsoft.icon")
 		ctx.Write(faviconBytes)
 		return true
 	}
diff --git a/rc.d/yukari b/rc.d/yukari
new file mode 100644
index 0000000..47ad80c
--- /dev/null
+++ b/rc.d/yukari
@@ -0,0 +1,23 @@
+#!/bin/sh
+# $TheSupernovaDuo$
+
+# PROVIDE: yukari
+# REQUIRE: DAEMON NETWORKING
+# KEYWORD: shutdown
+
+. /etc/rc.subr
+
+name="yukari"
+rcvar="yukari_enable"
+
+load_rc_config "${name}"
+
+: ${yukari_enable="NO"}
+: ${yukari_config=""}
+
+pidfile="/var/run/${name}.pid"
+command="/usr/sbin/daemon"
+procname="/usr/local/bin/${name}"
+command_args="-S -m 3 -s info -l daemon -p ${pidfile} /usr/bin/env ${procname} ${yukari_args}"
+
+run_rc_command "$1"
diff --git a/rc.d/yukarid b/rc.d/yukarid
new file mode 100644
index 0000000..2a28636
--- /dev/null
+++ b/rc.d/yukarid
@@ -0,0 +1,10 @@
+#!/bin/ksh
+# $TheSupernovaDuo
+daemon="/usr/local/bin/yukari"
+
+. /etc/rc.d/rc.subr
+
+rc_bg=YES
+rc_reload=NO
+
+rc_cmd "$1"