YUKI Hiroshi
null+****@clear*****
Tue Oct 7 10:11:43 JST 2014
YUKI Hiroshi 2014-10-07 10:11:43 +0900 (Tue, 07 Oct 2014) New Revision: 81906707f4cc662663ce1210bed8cb3e223c2601 https://github.com/droonga/droonga-http-server/commit/81906707f4cc662663ce1210bed8cb3e223c2601 Message: Revert "Put PID file under DROONGA_BASE_DIR." This reverts commit 5c7025783d824ad106ec5cd5a4ee956d04bf4627. PID file still should be placed under /var/run (or /run). Modified files: install/centos/droonga-http-server install/centos/functions.sh install/debian/droonga-http-server install/debian/functions.sh Modified: install/centos/droonga-http-server (+1 -1) =================================================================== --- install/centos/droonga-http-server 2014-10-06 21:32:08 +0900 (6722261) +++ install/centos/droonga-http-server 2014-10-07 10:11:43 +0900 (834fd63) @@ -17,7 +17,7 @@ GROUP=droonga DAEMON=/usr/bin/$NAME export DROONGA_BASE_DIR=/home/$NAME/droonga cd $DROONGA_BASE_DIR -PIDFILE=$DROONGA_BASE_DIR/$NAME.pid +PIDFILE=/run/$NAME/$NAME.pid DAEMON_ARGS="--daemon --pid-file=$PIDFILE" [ -x $DAEMON ] || exit 0 Modified: install/centos/functions.sh (+4 -0) =================================================================== --- install/centos/functions.sh 2014-10-06 21:32:08 +0900 (3f5ed34) +++ install/centos/functions.sh 2014-10-07 10:11:43 +0900 (b198969) @@ -20,6 +20,10 @@ register_service() { #TODO: we should migrate to systemd in near future... + local pid_dir=/run/$NAME + mkdir -p $pid_dir + chown -R $USER:$GROUP $pid_dir + curl -o /etc/rc.d/init.d/$NAME $(download_url "install/centos/$NAME") if [ $? -ne 0 ]; then echo "ERROR: Failed to download service script!" Modified: install/debian/droonga-http-server (+1 -1) =================================================================== --- install/debian/droonga-http-server 2014-10-06 21:32:08 +0900 (4ef0a11) +++ install/debian/droonga-http-server 2014-10-07 10:11:43 +0900 (79f45d8) @@ -18,7 +18,7 @@ USER=$NAME GROUP=droonga DAEMON=/usr/local/bin/$NAME export DROONGA_BASE_DIR=/home/$NAME/droonga -PIDFILE=$DROONGA_BASE_DIR/$NAME.pid +PIDFILE=/var/run/$NAME/$NAME.pid DAEMON_ARGS="--daemon --pid-file=$PIDFILE" SCRIPTNAME=/etc/init.d/$NAME Modified: install/debian/functions.sh (+4 -0) =================================================================== --- install/debian/functions.sh 2014-10-06 21:32:08 +0900 (5d754b4) +++ install/debian/functions.sh 2014-10-07 10:11:43 +0900 (0c65ba7) @@ -18,6 +18,10 @@ register_service() { local USER=$2 local GROUP=$3 + local pid_dir=/var/run/$NAME + mkdir -p $pid_dir + chown -R $USER:$GROUP $pid_dir + curl -o /etc/init.d/$NAME $(download_url "install/debian/$NAME") if [ $? -ne 0 ]; then echo "ERROR: Failed to download service script!" -------------- next part -------------- HTML����������������������������...Download
