From 0c1f6fe2067853ef12b1ade8210caa58bc9caf85 Mon Sep 17 00:00:00 2001
From: ston1th <ston1th@giftfish.de>
Date: Thu, 16 May 2019 10:32:31 +0200
Subject: [PATCH] better install scripts

---
 README.md                  |  4 ++++
 scripts/install_linux.sh   | 19 ++++++++++++-------
 scripts/install_openbsd.sh | 12 ++++++------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index b4d7845..4e367b0 100644
--- a/README.md
+++ b/README.md
@@ -45,3 +45,7 @@ See the `scripts/` directory on how to install gowiki on Linux or OpenBSD.
         "debug": false                     // enable debugging
 }
 ```
+
+## GoWiki on OpenBSD
+
+GoWiki makes use of the OpenBSD native security features [pledge(2)](https://man.openbsd.org/pledge) and [unveil(2)](https://man.openbsd.org/unveil).
diff --git a/scripts/install_linux.sh b/scripts/install_linux.sh
index 6e418da..04d0d6b 100755
--- a/scripts/install_linux.sh
+++ b/scripts/install_linux.sh
@@ -3,6 +3,13 @@ groupadd wiki
 useradd -g wiki wiki 
 mkdir /var/lib/gowiki
 chown wiki: /var/lib/gowiki
+mkdir /etc/gowiki
+cat <<EOF> /etc/gowiki/gowiki.conf
+{
+	"data_dir": "/var/lib/gowiki",
+	"secret": "$(openssl rand -hex 32)"
+}
+EOF
 cat <<EOF> /etc/systemd/system/gowiki.service
 [Unit]
 Description=GoWiki
@@ -17,11 +24,9 @@ Restart=always
 [Install]
 WantedBy=multi-user.target
 EOF
-cat <<EOF> /etc/gowiki/gowiki.conf
-{
-	"data_dir": "/var/lib/gowiki",
-	"secret": "$(openssl rand -hex 32)"
-}
-EOF
 systemctl enable gowiki
-systemctl start gowiki
+cat <<EOF
+copy your gowiki binary to /usr/local/bin/gowiki
+
+then run: systemctl start gowiki
+EOF
diff --git a/scripts/install_openbsd.sh b/scripts/install_openbsd.sh
index 6589024..c739819 100755
--- a/scripts/install_openbsd.sh
+++ b/scripts/install_openbsd.sh
@@ -1,10 +1,9 @@
 #!/bin/sh
 
-# rc script
 cat <<'EOF'> /etc/rc.d/gowiki
 #!/bin/sh
 
-daemon="/usr/local/sbin/gowiki"
+daemon="/usr/local/bin/gowiki"
 
 . /etc/rc.d/rc.subr
 
@@ -14,13 +13,11 @@ chmod 555 /etc/rc.d/gowiki
 rcctl enable gowiki
 rcctl set gowiki flags server -c /var/wiki/gowiki.conf
 
-# user and group
 mkdir /var/wiki
 groupadd wiki
 useradd -d /var/wiki -s /sbin/nologin -g wiki wiki
 chown wiki:wiki /var/wiki
 
-# config
 cat <<EOF> /var/wiki/gowiki.conf
 {
 	"data_dir": "/var/wiki",
@@ -30,5 +27,8 @@ EOF
 chmod 640 /var/wiki/gowiki.conf
 chgrp wiki /var/wiki/gowiki.conf
 
-# start
-rcctl start gowiki
+cat <<EOF
+copy your gowiki binary to /usr/local/bin/gowiki
+
+then run: rcctl start gowiki
+EOF