YUKI Hiroshi
null+****@clear*****
Thu Nov 29 11:09:55 JST 2012
YUKI Hiroshi 2012-11-29 11:09:55 +0900 (Thu, 29 Nov 2012) New Revision: 8c1749a721e906532f403684d87cb177ec99e8b1 https://github.com/groonga/gcs-console/commit/8c1749a721e906532f403684d87cb177ec99e8b1 Log: Use GCS_CONSOLE_* environment variables from the daemon, and define default values in /etc/defaults/gcs-console Modified files: packages/debian/gcs-console.default packages/debian/gcs-console.init packages/debian/gcs-console.upstart Modified: packages/debian/gcs-console.default (+11 -1) =================================================================== --- packages/debian/gcs-console.default 2012-11-27 14:10:54 +0900 (1f5d478) +++ packages/debian/gcs-console.default 2012-11-29 11:09:55 +0900 (5d42c02) @@ -1,7 +1,17 @@ # Default #USER=gcs-console #GROUP=gcs-console -#PORT=7576 + +# The endpoint of the configuration API of your Groonga CloudSearch instance. +GCS_CONSOLE_ENDPOINT=http://localhost:7575 + +# The port number to listen +GCS_CONSOLE_PORT=7576 + +# A pair of username and password (plaintext, not encrypted) +# For example, if you wish to use "admin" as the username and "abcd1234", then: +# GCS_CONSOLE_AUTH=admin:abcd1234 +GCS_CONSOLE_AUTH= # Comment out this to disable Groonga CloudSearch Console daemon. ENABLE=yes Modified: packages/debian/gcs-console.init (+3 -1) =================================================================== --- packages/debian/gcs-console.init 2012-11-27 14:10:54 +0900 (226ebfe) +++ packages/debian/gcs-console.init 2012-11-29 11:09:55 +0900 (7d26f68) @@ -24,7 +24,6 @@ FOREVER=$LIB_DIR/gcs-console/node_modules/.bin/forever LOG_DIR=/var/log/$NAME USER=gcs-console GROUP=gcs-console -PORT=7576 PIDFILE=/var/run/gcs-console/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME NODE_ENV=production @@ -42,6 +41,9 @@ DEFAULT_FILE=/etc/default/$NAME # Read configuration variable file if it is present [ -r $DEFAEULT_FILE ] && . $DEFAULT_FILE +export GCS_CONSOLE_ENDPOINT +export GCS_CONSOLE_PORT +export GCS_CONSOLE_AUTH [ "$ENABLE" = "yes" ] || exit 0 Modified: packages/debian/gcs-console.upstart (+7 -0) =================================================================== --- packages/debian/gcs-console.upstart 2012-11-27 14:10:54 +0900 (8311538) +++ packages/debian/gcs-console.upstart 2012-11-29 11:09:55 +0900 (432c489) @@ -12,5 +12,12 @@ setgid gcs-console script HOME=`echo ~gcs-console` export HOME + + DEFAULT_FILE=/etc/default/gcs-console + [ -r $DEFAULT_FILE ] && . $DEFAULT_FILE + export GCS_CONSOLE_ENDPOINT + export GCS_CONSOLE_PORT + export GCS_CONSOLE_AUTH + exec /usr/sbin/gcs-console end script -------------- next part -------------- HTML����������������������������...下载
