YUKI Hiroshi
null+****@clear*****
Thu Sep 25 11:35:02 JST 2014
YUKI Hiroshi 2014-09-25 11:35:02 +0900 (Thu, 25 Sep 2014) New Revision: 2f833faf29897ac59651c58bbd07d34688e5dfbb https://github.com/droonga/droonga-http-server/commit/2f833faf29897ac59651c58bbd07d34688e5dfbb Message: Put PID file under /var/run/droonga-http-server/ Modified files: install.sh install/debian/droonga-http-server Modified: install.sh (+6 -1) =================================================================== --- install.sh 2014-09-25 09:50:40 +0900 (ad782ef) +++ install.sh 2014-09-25 11:35:02 +0900 (19e089b) @@ -37,6 +37,7 @@ NAME=droonga-http-server SCRIPT_URL=https://raw.githubusercontent.com/droonga/$NAME/master/install REPOSITORY_URL=https://github.com/droonga/$NAME.git USER=$NAME +GROUP=$USER DROONGA_BASE_DIR=/home/$USER/droonga EXPRESS_DROONGA_REPOSITORY_URL=git://github.com/droonga/express-droonga.git#master @@ -159,7 +160,7 @@ setup_configuration_directory() { --receive-host-name=$HOST fi - chown -R $USER.$USER $DROONGA_BASE_DIR + chown -R $USER:$GROUP $DROONGA_BASE_DIR } @@ -249,6 +250,10 @@ prepare_environment_in_debian() { } register_service_in_debian() { + pid_dir=/var/run/$NAME + mkdir -p $pid_dir + chown -R $USER:$GROUP $pid_dir + install_service_script /etc/init.d/$NAME debian update-rc.d $NAME defaults } Modified: install/debian/droonga-http-server (+3 -1) =================================================================== --- install/debian/droonga-http-server 2014-09-25 09:50:40 +0900 (ffa5e89) +++ install/debian/droonga-http-server 2014-09-25 11:35:02 +0900 (7eca662) @@ -14,9 +14,11 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin DESC="" NAME=droonga-http-server +USER=$NAME +GROUP=$USER DAEMON=/usr/local/bin/$NAME export DROONGA_BASE_DIR=/home/$NAME/droonga -PIDFILE=/var/run/$NAME.pid +PIDFILE=/var/run/$NAME/$NAME.pid DAEMON_ARGS="--daemon --pid-file=$PIDFILE" SCRIPTNAME=/etc/init.d/$NAME -------------- next part -------------- HTML����������������������������...Download