aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@alpinelinux.org>2019-10-15 13:43:35 +0000
committerLeonardo Arena <rnalrd@alpinelinux.org>2019-10-16 12:27:36 +0000
commit2af22fc23250e957d75e9e4449f842f9f1a5e16a (patch)
tree41ab5de9ffd9b37d2b8d75bdd51e77bf02d00de1
parent41e574563a228c690047bb1b5c88c58978a2cfd5 (diff)
downloadaports-2af22fc23250e957d75e9e4449f842f9f1a5e16a.tar.bz2
aports-2af22fc23250e957d75e9e4449f842f9f1a5e16a.tar.xz
main/bacula: use root as rundir owner for bacula-client
Partially revert previous commit In case other bacula daemons run on the same host, their package will create the bacula user and group and their init script will set bacula as the owner of the rundir. bacula-fd will be able to write the pidfile in the same rundir since it runs as root.
-rw-r--r--main/bacula/APKBUILD5
-rw-r--r--main/bacula/bacula-client.pre-install6
-rw-r--r--main/bacula/bacula-fd.initd3
3 files changed, 3 insertions, 11 deletions
diff --git a/main/bacula/APKBUILD b/main/bacula/APKBUILD
index 49f7dbd2d9..6fb74caae4 100644
--- a/main/bacula/APKBUILD
+++ b/main/bacula/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=bacula
pkgver=9.4.4
-pkgrel=1
+pkgrel=2
pkgdesc="Enterprise ready, network based backup program"
url="http://www.bacula.org"
arch="all"
@@ -158,7 +158,6 @@ libs() {
}
client() {
- install="$subpkgname.pre-install"
pkgdesc="Bacula client"
mkdir -p "$subpkgdir"/usr/sbin \
"$subpkgdir"/etc/init.d \
@@ -174,5 +173,5 @@ client() {
sha512sums="f973c9ab8ee9867962645b1a1388b494fd402c990be8128b892e043e16361bff2fc08ec43e2c8c9bebeae9c94afd3fdbc04a610b35f99e7dd054ed1ad2c04b31 bacula-9.4.4.tar.gz
bb954bb94bffa68ba80872046782a73012487291f019fb8d7ff77fc7f4325e25bee88612b3279b4db7d3c2002ac7448ffabcda62da7bab54642a7413904abc91 bacula-dir.initd
0505b9a74520af6982d5df4390525976f8e009e641d0acfe8f24b2ec9f155166a65eecbabee9ff70ffe188d523effa64f958acd8f657410b1c002a6d736e8aee bacula-sd.initd
-c83069da93b0f9da8449c89ab4f0167805ba04c79cce1e7d3e1a06308a18c34a0541927c3da165d6ed615068d1ffcd8b1ecff67f5606de8821cd8c82b8dffceb bacula-fd.initd
+91a53cb566cfd91b42a319bd6ff9947047cae187c6ec198767853d1a0253667d6c2c58f0e72ed43a7b9f40b76e705cafde7a1d6ac86577fa0f64f44b031dec11 bacula-fd.initd
2d3757236aacca421261a8866ff04b5b0151538e1462559bd1240119b1bece1d456acbba9fee86dbc6aaec7af2a52eb2c0b7490c5f371b7deb478731c74342ff bacula-7.4.0-path-mounted.patch"
diff --git a/main/bacula/bacula-client.pre-install b/main/bacula/bacula-client.pre-install
deleted file mode 100644
index 4116667f10..0000000000
--- a/main/bacula/bacula-client.pre-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup -S bacula 2>/dev/null
-adduser -S -D -h /var/lib/bacula/ -s /sbin/nologin -G bacula -g bacula bacula 2>/dev/null
-
-exit 0
diff --git a/main/bacula/bacula-fd.initd b/main/bacula/bacula-fd.initd
index 1e33abc1c0..9e0ee53c4e 100644
--- a/main/bacula/bacula-fd.initd
+++ b/main/bacula/bacula-fd.initd
@@ -18,6 +18,5 @@ depend() {
start_pre() {
checkpath --quiet --directory --mode 0775\
- --owner bacula:bacula $(dirname $pidfile)
+ $(dirname $pidfile)
}
-