YUKI Hiroshi
null+****@clear*****
Fri Aug 29 14:37:13 JST 2014
YUKI Hiroshi 2014-08-29 14:37:13 +0900 (Fri, 29 Aug 2014) New Revision: 880f65400ca7e963debed448b9c056f2fe73ca1e https://github.com/droonga/droonga.org/commit/880f65400ca7e963debed448b9c056f2fe73ca1e Message: Update descriptions to use droonga-engine.yaml Modified files: tutorial/1.0.6/add-replica/index.md tutorial/1.0.6/basic/index.md tutorial/1.0.6/groonga/index.md Modified: tutorial/1.0.6/add-replica/index.md (+5 -9) =================================================================== --- tutorial/1.0.6/add-replica/index.md 2014-08-27 17:48:11 +0900 (ed4d442) +++ tutorial/1.0.6/add-replica/index.md 2014-08-29 14:37:13 +0900 (cdd3f81) @@ -60,6 +60,7 @@ First, prepare a new computer, install required softwares and configure them. # gem install droonga-engine # npm install -g droonga-http-server # mkdir ~/droonga + # echo "host: 192.168.100.52" > ~/droonga/droonga-engine.yaml Then generate the `catalog.json` with only one replica, the new node itself: @@ -82,10 +83,7 @@ Let's start the server. (on 192.168.100.52) # host=192.168.100.52 # export DROONGA_BASE_DIR=$HOME/droonga - # droonga-engine --host=$host \ - --log-file=$DROONGA_BASE_DIR/droonga-engine.log \ - --daemon \ - --pid-file=$DROONGA_BASE_DIR/droonga-engine.pid + # droonga-engine # droonga-http-server --port=10041 \ --receive-host-name=$host \ --droonga-engine-host-name=$host \ @@ -308,12 +306,10 @@ Install required packages, generate the `catalog.json`, and start services. (on 192.168.100.52) # host=192.168.100.52 # export DROONGA_BASE_DIR=$HOME/droonga - # droonga-engine-catalog-generate --hosts=192.168.100.52 \ + # echo "host: $host" > $DROONGA_BASE_DIR/droonga-engine.yaml + # droonga-engine-catalog-generate --hosts=$host \ --output=$DROONGA_BASE_DIR/catalog.json - # droonga-engine --host=$host \ - --log-file=$DROONGA_BASE_DIR/droonga-engine.log \ - --daemon \ - --pid-file=$DROONGA_BASE_DIR/droonga-engine.pid + # droonga-engine # droonga-http-server --port=10041 \ --receive-host-name=$host \ --droonga-engine-host-name=$host \ Modified: tutorial/1.0.6/basic/index.md (+11 -9) =================================================================== --- tutorial/1.0.6/basic/index.md 2014-08-27 17:48:11 +0900 (d6e8182) +++ tutorial/1.0.6/basic/index.md 2014-08-29 14:37:13 +0900 (2788bec) @@ -112,7 +112,15 @@ Create a directory for a Droonga engine: # mkdir engine # cd engine -Next, put a configuration file `catalog.json` like following, into the directory: +Then put a configuration file `droonga-engine.yaml` like following, into the directory: + + host: 192.168.100.50 + port: 10031 + tag: droonga + +You must put correct host name or IP address of the computer itself. + +Next, put another configuration file `catalog.json` like following, into the directory: catalog.json: @@ -228,10 +236,7 @@ For more details of the configuration file `catalog.json`, see [the reference ma Start a Droonga engine, you can start it with the command `droonga-engine`, like: # export DROONGA_BASE_DIR=$PWD - # droonga-engine --host 192.168.100.50 \ - --log-file=$DROONGA_BASE_DIR/droonga-engine.log \ - --daemon \ - --pid-file $DROONGA_BASE_DIR/droonga-engine.pid + # droonga-engine ### Stop an instance of droonga-engine @@ -245,10 +250,7 @@ This is the way to stop droonga-engine. Start droonga-engine again: - # droonga-engine --host 192.168.100.50 \ - --log-file=$DROONGA_BASE_DIR/droonga-engine.log \ - --daemon \ - --pid-file $DROONGA_BASE_DIR/droonga-engine.pid + # droonga-engine ### Create a database Modified: tutorial/1.0.6/groonga/index.md (+15 -8) =================================================================== --- tutorial/1.0.6/groonga/index.md 2014-08-27 17:48:11 +0900 (8190bdb) +++ tutorial/1.0.6/groonga/index.md 2014-08-29 14:37:13 +0900 (19ef922) @@ -86,17 +86,27 @@ Assume that you have two computers: `192.168.100.50` and `192.168.100.51`. # mkdir ~/droonga # cd ~/droonga - 5. Create a `catalog.json`, *on one of Droonga nodes*. + 5. Create a `droonga-engine.yaml` in the directory, *on each computer*. + It includes information to work droonga-engine well. + Currently you only have to put correct host name or IP address of the computer itself, with the key `host`, like: + + (on 192.168.100.50) + # echo "host: 192.168.100.50" > ~/droonga/droonga-engine.yaml + + (on 192.168.100.51) + # echo "host: 192.168.100.51" > ~/droonga/droonga-engine.yaml + + 6. Create a `catalog.json` in the directory, *on one of Droonga nodes*. The file defines the structure of your Droonga cluster. You'll specify the name of the dataset via the `--dataset` option and the list of your Droonga node's IP addresses via the `--hosts` option, like: # droonga-engine-catalog-generate --hosts=192.168.100.50,192.168.100.51 \ - --output=./catalog.json + --output=~/droonga//catalog.json If you have only one computer and trying to set up it just for testing, then you'll do: # droonga-engine-catalog-generate --hosts=127.0.0.1 \ - --output=./catalog.json + --output=~/droonga//catalog.json 6. Share the generated `catalog.json` *to your all Droonga nodes*. @@ -121,10 +131,7 @@ To start them, run commands like following on each Droonga node: # host=192.168.100.50 # export DROONGA_BASE_DIR=$HOME/droonga - # droonga-engine --host=$host \ - --log-file=$DROONGA_BASE_DIR/droonga-engine.log \ - --daemon \ - --pid-file=$DROONGA_BASE_DIR/droonga-engine.pid + # droonga-engine # droonga-http-server --port=10041 \ --receive-host-name=$host \ --droonga-engine-host-name=$host \ @@ -139,7 +146,7 @@ So you have to specify different host name on another Droonga node, like: # host=192.168.100.51 # export DROONGA_BASE_DIR=$HOME/droonga - # droonga-engine --host=$host \ + # droonga-engine ... By the command two nodes construct a cluster and they monitor each other. -------------- next part -------------- HTML����������������������������...Download
