YUKI Hiroshi
null+****@clear*****
Thu Sep 25 12:01:23 JST 2014
YUKI Hiroshi 2014-09-25 12:01:23 +0900 (Thu, 25 Sep 2014) New Revision: 0abe779415e89b8975ba541df945b3947dbd6599 https://github.com/droonga/droonga-engine/commit/0abe779415e89b8975ba541df945b3947dbd6599 Message: Use common "droonga" group for file permissions Modified files: install.sh install/debian/droonga-engine Modified: install.sh (+14 -9) =================================================================== --- install.sh 2014-09-25 11:32:24 +0900 (ed44f57) +++ install.sh 2014-09-25 12:01:23 +0900 (41038cd) @@ -37,7 +37,7 @@ NAME=droonga-engine SCRIPT_URL=https://raw.githubusercontent.com/droonga/$NAME/master/install REPOSITORY_URL=https://github.com/droonga/$NAME.git USER=$NAME -GROUP=$USER +GROUP=droonga DROONGA_BASE_DIR=/home/$USER/droonga : ${VERSION:=release} @@ -69,14 +69,6 @@ exist_user() { id "$1" > /dev/null 2>&1 } -prepare_user() { - if ! exist_user $USER; then - echo "" - echo "Preparing the user..." - useradd -m $USER - fi -} - prepare_environment() { if exist_all_commands $REQUIRED_COMMANDS; then return 0 @@ -87,6 +79,19 @@ prepare_environment() { return 0 } +prepare_user() { + echo "" + echo "Preparing the user..." + + groupadd $GROUP + + if ! exist_user $USER; then + useradd -m $USER + fi + + usermod -G $GROUP $USER +} + setup_configuration_directory() { echo "" echo "Setting up the configuration directory..." Modified: install/debian/droonga-engine (+2 -2) =================================================================== --- install/debian/droonga-engine 2014-09-25 11:32:24 +0900 (c358e98) +++ install/debian/droonga-engine 2014-09-25 12:01:23 +0900 (4b96c26) @@ -15,7 +15,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin DESC="" NAME=droonga-engine USER=$NAME -GROUP=$USER +GROUP=droonga DAEMON=/usr/local/bin/$NAME export DROONGA_BASE_DIR=/home/$NAME/droonga PIDFILE=/var/run/$NAME/$NAME.pid @@ -45,7 +45,7 @@ do_start() # 0 if daemon has been started # 1 if daemon was already running # 2 if daemon could not be started - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --user $USER --test > /dev/null \ + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --user $USER --test > /dev/null \ || return 1 start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --user $USER --chuid $USER:$GROUP --chdir $DROONGA_BASE_DIR -- \ $DAEMON_ARGS \ -------------- next part -------------- HTML����������������������������...Descargar
