YUKI Hiroshi
null+****@clear*****
Wed Jun 25 15:24:27 JST 2014
YUKI Hiroshi 2014-06-25 15:24:27 +0900 (Wed, 25 Jun 2014) New Revision: 360fd48359701e13739d074943b5787acf7dc850 https://github.com/droonga/droonga.org/commit/360fd48359701e13739d074943b5787acf7dc850 Message: Reduce use of "$PWD" Modified files: _po/ja/tutorial/1.0.4/dump-restore/index.po _po/ja/tutorial/1.0.4/groonga/index.po ja/tutorial/1.0.4/dump-restore/index.md ja/tutorial/1.0.4/groonga/index.md tutorial/1.0.4/dump-restore/index.md tutorial/1.0.4/groonga/index.md Modified: _po/ja/tutorial/1.0.4/dump-restore/index.po (+8 -8) =================================================================== --- _po/ja/tutorial/1.0.4/dump-restore/index.po 2014-06-25 14:09:47 +0900 (e5526c6) +++ _po/ja/tutorial/1.0.4/dump-restore/index.po 2014-06-25 15:24:27 +0900 (85c2d11) @@ -243,33 +243,33 @@ msgstr "もし順番にこのチュートリアルを読み進めているので msgid "" " (on 192.168.0.10)\n" " # cd ~/droonga\n" -" # kill $(cat $PWD/droonga-engine.pid)\n" +" # kill $(cat $DROONGA_BASE_DIR/droonga-engine.pid)\n" " # rm -r 000\n" " # host=192.168.0.10\n" " # droonga-engine --host=$host \\\n" -" --log-file=$PWD/droonga-engine.log \\\n" +" --log-file=$DROONGA_BASE_DIR/droonga-engine.log \\\n" " --daemon \\\n" -" --pid-file=$PWD/droonga-engine.pid" +" --pid-file=$DROONGA_BASE_DIR/droonga-engine.pid" msgstr "" msgid "" " (on 192.168.0.11)\n" " # cd ~/droonga\n" -" # kill $(cat $PWD/droonga-engine.pid)\n" +" # kill $(cat $DROONGA_BASE_DIR/droonga-engine.pid)\n" " # rm -r 000\n" " # host=192.168.0.11\n" " # droonga-engine --host=$host \\\n" -" --log-file=$PWD/droonga-engine.log \\\n" +" --log-file=$DROONGA_BASE_DIR/droonga-engine.log \\\n" " --daemon \\\n" -" --pid-file=$PWD/droonga-engine.pid" +" --pid-file=$DROONGA_BASE_DIR/droonga-engine.pid" msgstr "" msgid "After that the cluster becomes empty. Confirm it:" msgstr "これでクラスタは空になりました。確かめてみましょう:" msgid "" -" # endpoint=\"http://192.168.0.10:10041/d\"\n" -" # curl \"${endpoint}/select?table=Store&output_columns=name&limit=10\"\n" +" # endpoint=\"http://192.168.0.10:10041\"\n" +" # curl \"${endpoint}/d/select?table=Store&output_columns=name&limit=10\"\n" " [[0,1401363465.610241,0],[[[null],[]]]]" msgstr "" Modified: _po/ja/tutorial/1.0.4/groonga/index.po (+2 -2) =================================================================== --- _po/ja/tutorial/1.0.4/groonga/index.po 2014-06-25 14:09:47 +0900 (ee4906a) +++ _po/ja/tutorial/1.0.4/groonga/index.po 2014-06-25 15:24:27 +0900 (ca29647) @@ -292,8 +292,8 @@ msgid "To stop services, run commands like following on each Droonga node:" msgstr "サービスを停止するには、以下のコマンドを各Droongaノード上で実行します:" msgid "" -" # kill $(cat ~/droonga/droonga-engine.pid)\n" -" # kill $(cat ~/droonga/droonga-http-server.pid)" +" # kill $(cat $DROONGA_BASE_DIR/droonga-engine.pid)\n" +" # kill $(cat $DROONGA_BASE_DIR/droonga-http-server.pid)" msgstr "" msgid "### Create a table, columns, and indexes" Modified: ja/tutorial/1.0.4/dump-restore/index.md (+8 -8) =================================================================== --- ja/tutorial/1.0.4/dump-restore/index.md 2014-06-25 14:09:47 +0900 (054b29f) +++ ja/tutorial/1.0.4/dump-restore/index.md 2014-06-25 15:24:27 +0900 (327c9f3) @@ -149,28 +149,28 @@ Droongaクラスタにそれらのメッセージを送信するには、`droong (on 192.168.0.10) # cd ~/droonga - # kill $(cat $PWD/droonga-engine.pid) + # kill $(cat $DROONGA_BASE_DIR/droonga-engine.pid) # rm -r 000 # host=192.168.0.10 # droonga-engine --host=$host \ - --log-file=$PWD/droonga-engine.log \ + --log-file=$DROONGA_BASE_DIR/droonga-engine.log \ --daemon \ - --pid-file=$PWD/droonga-engine.pid + --pid-file=$DROONGA_BASE_DIR/droonga-engine.pid (on 192.168.0.11) # cd ~/droonga - # kill $(cat $PWD/droonga-engine.pid) + # kill $(cat $DROONGA_BASE_DIR/droonga-engine.pid) # rm -r 000 # host=192.168.0.11 # droonga-engine --host=$host \ - --log-file=$PWD/droonga-engine.log \ + --log-file=$DROONGA_BASE_DIR/droonga-engine.log \ --daemon \ - --pid-file=$PWD/droonga-engine.pid + --pid-file=$DROONGA_BASE_DIR/droonga-engine.pid これでクラスタは空になりました。確かめてみましょう: - # endpoint="http://192.168.0.10:10041/d" - # curl "${endpoint}/select?table=Store&output_columns=name&limit=10" + # endpoint="http://192.168.0.10:10041" + # curl "${endpoint}/d/select?table=Store&output_columns=name&limit=10" [[0,1401363465.610241,0],[[[null],[]]]] ### ダンプ結果から空のDroongaクラスタへデータを復元する Modified: ja/tutorial/1.0.4/groonga/index.md (+2 -2) =================================================================== --- ja/tutorial/1.0.4/groonga/index.md 2014-06-25 14:09:47 +0900 (65d848c) +++ ja/tutorial/1.0.4/groonga/index.md 2014-06-25 15:24:27 +0900 (a7e5c33) @@ -144,8 +144,8 @@ GroongaをHTTPサーバとして使う場合は、以下のように `-d` オプ サービスを停止するには、以下のコマンドを各Droongaノード上で実行します: - # kill $(cat ~/droonga/droonga-engine.pid) - # kill $(cat ~/droonga/droonga-http-server.pid) + # kill $(cat $DROONGA_BASE_DIR/droonga-engine.pid) + # kill $(cat $DROONGA_BASE_DIR/droonga-http-server.pid) ### テーブル、カラム、インデックスの作成 Modified: tutorial/1.0.4/dump-restore/index.md (+8 -8) =================================================================== --- tutorial/1.0.4/dump-restore/index.md 2014-06-25 14:09:47 +0900 (9d618c5) +++ tutorial/1.0.4/dump-restore/index.md 2014-06-25 15:24:27 +0900 (3f5eb9c) @@ -142,28 +142,28 @@ Make it empty with these commands: (on 192.168.0.10) # cd ~/droonga - # kill $(cat $PWD/droonga-engine.pid) + # kill $(cat $DROONGA_BASE_DIR/droonga-engine.pid) # rm -r 000 # host=192.168.0.10 # droonga-engine --host=$host \ - --log-file=$PWD/droonga-engine.log \ + --log-file=$DROONGA_BASE_DIR/droonga-engine.log \ --daemon \ - --pid-file=$PWD/droonga-engine.pid + --pid-file=$DROONGA_BASE_DIR/droonga-engine.pid (on 192.168.0.11) # cd ~/droonga - # kill $(cat $PWD/droonga-engine.pid) + # kill $(cat $DROONGA_BASE_DIR/droonga-engine.pid) # rm -r 000 # host=192.168.0.11 # droonga-engine --host=$host \ - --log-file=$PWD/droonga-engine.log \ + --log-file=$DROONGA_BASE_DIR/droonga-engine.log \ --daemon \ - --pid-file=$PWD/droonga-engine.pid + --pid-file=$DROONGA_BASE_DIR/droonga-engine.pid After that the cluster becomes empty. Confirm it: - # endpoint="http://192.168.0.10:10041/d" - # curl "${endpoint}/select?table=Store&output_columns=name&limit=10" + # endpoint="http://192.168.0.10:10041" + # curl "${endpoint}/d/select?table=Store&output_columns=name&limit=10" [[0,1401363465.610241,0],[[[null],[]]]] ### Restore data from a dump result, to an empty Droonga cluster Modified: tutorial/1.0.4/groonga/index.md (+2 -2) =================================================================== --- tutorial/1.0.4/groonga/index.md 2014-06-25 14:09:47 +0900 (9a15d49) +++ tutorial/1.0.4/groonga/index.md 2014-06-25 15:24:27 +0900 (2512992) @@ -137,8 +137,8 @@ Then you can recover the dead node and re-join it to the cluster secretly. To stop services, run commands like following on each Droonga node: - # kill $(cat ~/droonga/droonga-engine.pid) - # kill $(cat ~/droonga/droonga-http-server.pid) + # kill $(cat $DROONGA_BASE_DIR/droonga-engine.pid) + # kill $(cat $DROONGA_BASE_DIR/droonga-http-server.pid) ### Create a table, columns, and indexes -------------- next part -------------- HTML����������������������������... 下载