summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorredfish2016-03-15 00:27:53 -0500
committerredfish2016-03-15 00:27:53 -0500
commit8f3ced7bf4cd7fc9f69635041ecb49d92a2aa329 (patch)
treea19433d8e194f5fed1517dc29a5871882063fb5f
parent50da6a751e363ff40ba15d18af6e4a08ed2199bf (diff)
downloadaur-8f3ced7bf4cd7fc9f69635041ecb49d92a2aa329.tar.gz
use /var/lib for data dir and /var/log for logs
Change zeronet user home dir to /var/lib/zeronet, to be consistent with how other packages do it.
-rw-r--r--PKGBUILD6
-rw-r--r--zeronet.conf3
-rw-r--r--zeronet.install9
-rw-r--r--zeronet.service2
4 files changed, 15 insertions, 5 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 767a6b98ccdf..9218d491443d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,8 +22,8 @@ source=("git://github.com/HelloZeroNet/ZeroNet.git"
"zeronet.conf"
"zeronet.service")
md5sums=('SKIP'
- '1c2281156533c912e407cf64f6a57e96'
- '35a1d8325701eb000a4c3a28b7499096')
+ 'c5216860cfc435a4861c55fd3933391c'
+ 'b7733fe1d55d954f3eb7c04cf9e73e0d')
install="zeronet.install"
backup=("etc/zeronet.conf")
options=(!strip) # attempt to strip binaries fromA dependent libs fial
@@ -64,4 +64,4 @@ package() {
# install license
install -D -m644 "$srcdir/$_gitname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-} \ No newline at end of file
+}
diff --git a/zeronet.conf b/zeronet.conf
index 1eacf7206323..a4ed52cb6e91 100644
--- a/zeronet.conf
+++ b/zeronet.conf
@@ -1,3 +1,6 @@
[global]
+data_dir = /var/lib/zeronet
+log_dir = /var/log/zeronet
+
# ui_ip = *
# ui_password = anypassword
diff --git a/zeronet.install b/zeronet.install
index 1c38d0b68225..c7450dfe97e0 100644
--- a/zeronet.install
+++ b/zeronet.install
@@ -1,7 +1,7 @@
post_install() {
getent passwd zeronet &>/dev/null || {
echo -n ">>> Creating zeronet user... "
- useradd --system --user-group --home /opt/zeronet zeronet
+ useradd --system --user-group --home /var/lib/zeronet zeronet
echo "done"
}
post_upgrade
@@ -27,6 +27,13 @@ post_install() {
post_upgrade() {
chown -R zeronet:zeronet /opt/zeronet
+
+ # Because prior versions did not use /var/lib for zeronet user home
+ mkdir -p /var/lib/zeronet
+ chown zeronet:zeronet /var/lib/zeronet
+
+ mkdir -p /var/log/zeronet
+ chown zeronet:zeronet /var/log/zeronet
}
pre_remove() {
diff --git a/zeronet.service b/zeronet.service
index 82afee10ea77..2b2bfc529515 100644
--- a/zeronet.service
+++ b/zeronet.service
@@ -4,7 +4,7 @@ Description=ZeroNet: a decentralized web platform
[Service]
User=zeronet
Group=zeronet
-WorkingDirectory=~
+WorkingDirectory=/opt/zeronet
ExecStart=/usr/bin/env python2 zeronet.py --config_file /etc/zeronet.conf
Restart=on-failure