summaryrefslogtreecommitdiff
path: root/social
diff options
context:
space:
mode:
Diffstat (limited to 'social')
-rw-r--r--social/diaspora-git/PKGBUILD10
-rw-r--r--social/tinc/tincd.rcd14
2 files changed, 14 insertions, 10 deletions
diff --git a/social/diaspora-git/PKGBUILD b/social/diaspora-git/PKGBUILD
index 1cf183cf7..57459173d 100644
--- a/social/diaspora-git/PKGBUILD
+++ b/social/diaspora-git/PKGBUILD
@@ -7,7 +7,7 @@
pkgbase=diaspora-git
pkgname=('diaspora-mysql-git' 'diaspora-postgresql-git' 'diaspora-sqlite-git')
-pkgver=20110623
+pkgver=20111229
pkgrel=1
pkgdesc="A privacy aware, personally controlled, do-it-all, open source social network"
arch=('i686' 'x86_64')
@@ -39,18 +39,18 @@ build() {
if [[ -d $_gitname ]] ; then
pushd $_gitname
- git pull origin
+ $tsocks git pull origin
msg "The local files are updated."
popd
else
- git clone $_gitroot
+ $tsocks git clone $_gitroot
msg "Git clone done."
fi
msg "Start making..."
[[ -d $_gitname-build ]] && rm -fr $_gitname-build
- git clone $_gitname $_gitname-build
+ $tsocks git clone $_gitname $_gitname-build
# Include all gems
export GEM_HOME="${PWD}/vendor"
@@ -59,7 +59,7 @@ build() {
cd ${srcdir}/${_gitname}-build
- gem install bundler
+ $tsocks gem install bundler
}
# Helper
diff --git a/social/tinc/tincd.rcd b/social/tinc/tincd.rcd
index d790ef86f..16f39f8ca 100644
--- a/social/tinc/tincd.rcd
+++ b/social/tinc/tincd.rcd
@@ -4,9 +4,10 @@ daemon_name=tincd
. /etc/rc.conf
. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
+. /etc/conf.d/${daemon_name}.conf
-PID=`pidof -o %PPID /usr/sbin/tincd`
+PIDFILE=/var/run/tinc.${NETNAME}
+[ -f "${PIDFILE}" ] && PID=$(<${PIDFILE})
case "$1" in
start)
@@ -14,7 +15,7 @@ case "$1" in
[ -z "$PID" ] && \
/usr/sbin/tincd -n ${NETNAME} \
${OPTIONS} \
- --pidfile=/var/run/tinc.${NETNAME} &> /dev/null
+ --pidfile=${PIDFILE} &> /dev/null
if [ $? -gt 0 ]; then
stat_fail
@@ -25,7 +26,7 @@ case "$1" in
;;
stop)
stat_busy "Stopping ${daemon_name}"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
+ [ ! -z "$PID" ] && /usr/sbin/tincd -n ${NETNAME} -k
if [ $? -gt 0 ]; then
stat_fail
else
@@ -38,7 +39,10 @@ case "$1" in
sleep 3
$0 start
;;
+ reload)
+ [ ! -z "$PID" ] && /usr/sbin/tincd -n ${NETNAME} -k HUP
+ ;;
*)
- echo "usage: $0 {start|stop|restart}"
+ echo "usage: $0 {start|stop|restart|reload}"
esac
exit 0