1
0
Fork 0

Merge branch '1.2' of github.com:triAGENS/ArangoDB into devel

This commit is contained in:
Frank Celler 2013-02-15 13:55:01 +01:00
commit 812948c896
1 changed files with 2 additions and 1 deletions

View File

@ -25,7 +25,6 @@ $release=${arangodb_release}
d 0755 ${susr} ${sgrp} /etc/arangodb -
d 0755 ${susr} ${sgrp} /etc/arangodb/ -
c 0644 ${susr} ${sgrp} /etc/arangodb/arangod.conf ${project_dir}/etc/arangodb/arangod-uid.conf
c 0644 ${susr} ${sgrp} /etc/arangodb/arangosh.conf ${project_dir}/etc/arangodb/arangosh.conf
f 0755 ${susr} ${sgrp} ${sbindir}/arangod-${arangodb_version} ${project_dir}/bin/arangod
@ -65,6 +64,7 @@ d 0755 ${rusr} ${rgrp} ${mandir}/man8 -
## -----------------------------------------------------------------------------
%ifdef macosx
c 0644 ${susr} ${sgrp} /etc/arangodb/arangod.conf ${project_dir}/etc/arangodb/arangod.conf
d 0755 ${rusr} ${rgrp} /Library/LaunchDaemons/ -
f 0755 ${rusr} ${rgrp} /Library/LaunchDaemons/org.arangodb.plist.template ${project_dir}/Installation/MacOSX/org.arangodb.plist
%postinstall <<EOF
@ -90,6 +90,7 @@ EOF
## -----------------------------------------------------------------------------
%else
c 0644 ${susr} ${sgrp} /etc/arangodb/arangod.conf ${project_dir}/etc/arangodb/arangod-uid.conf
%preinstall <<EOF
getent group arangodb >/dev/null || groupadd -r arangodb
getent passwd arangodb >/dev/null || useradd -r -g arangodb -d ${static_dir}/arangodb -s /bin/false -c "ArangoDB Application User" arangodb