From 3cbd3719084e5dcbb9b470228bd6a40e6d050478 Mon Sep 17 00:00:00 2001 From: Robert Dale Date: Mon, 26 Sep 2016 11:01:53 -0400 Subject: [PATCH] fixed conf dir references --- docs/src/reference/gremlin-applications.asciidoc | 4 ++-- gremlin-console/src/main/bin/gremlin.sh | 4 ++-- gremlin-driver/src/main/bin/config-eval.sh | 4 ++-- gremlin-driver/src/main/bin/profile-driver.sh | 4 ++-- gremlin-server/src/main/bin/gremlin-server.sh | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc index cedd98f27c4..7e827f182fc 100644 --- a/docs/src/reference/gremlin-applications.asciidoc +++ b/docs/src/reference/gremlin-applications.asciidoc @@ -775,7 +775,7 @@ Configuring ~~~~~~~~~~~ As mentioned earlier, Gremlin Server is configured though a YAML file. By default, Gremlin Server will look for a -file called `config/gremlin-server.yaml` to configure itself on startup. To override this default, supply the file +file called `conf/gremlin-server.yaml` to configure itself on startup. To override this default, supply the file to use to `bin/gremlin-server.sh` as in: [source,text] @@ -920,7 +920,7 @@ Cluster cluster = Cluster.build().credentials("stephen", "password") .enableSsl(true).create(); If connecting with Gremlin Console, which utilizes `gremlin-driver` for remote script execution, use the provided -`config/remote-secure.yaml` file when defining the remote. That file contains configuration for the username and +`conf/remote-secure.yaml` file when defining the remote. That file contains configuration for the username and password as well as enablement of SSL from the client side. Similarly, Gremlin Server can be configured for REST and security. diff --git a/gremlin-console/src/main/bin/gremlin.sh b/gremlin-console/src/main/bin/gremlin.sh index 84ba81791bf..fe28773706c 100755 --- a/gremlin-console/src/main/bin/gremlin.sh +++ b/gremlin-console/src/main/bin/gremlin.sh @@ -36,11 +36,11 @@ fi case `uname` in CYGWIN*) - CP="`dirname $0`"/../config + CP="`dirname $0`"/../conf CP="$CP":$( echo `dirname $0`/../lib/*.jar . | sed 's/ /;/g') ;; *) - CP="`dirname $0`"/../config + CP="`dirname $0`"/../conf CP="$CP":$( echo `dirname $0`/../lib/*.jar . | sed 's/ /:/g') esac diff --git a/gremlin-driver/src/main/bin/config-eval.sh b/gremlin-driver/src/main/bin/config-eval.sh index c55ebf5d9fa..764d732ebc7 100644 --- a/gremlin-driver/src/main/bin/config-eval.sh +++ b/gremlin-driver/src/main/bin/config-eval.sh @@ -20,11 +20,11 @@ # case `uname` in CYGWIN*) - CP="`dirname $0`"/../config/ + CP="`dirname $0`"/../conf/ CP="$CP":$( echo `dirname $0`/../lib/*.jar . | sed 's/ /;/g') ;; *) - CP="`dirname $0`"/../config/ + CP="`dirname $0`"/../conf/ CP="$CP":$( echo `dirname $0`/../lib/*.jar . | sed 's/ /:/g') esac #echo $CP diff --git a/gremlin-driver/src/main/bin/profile-driver.sh b/gremlin-driver/src/main/bin/profile-driver.sh index ce747e51076..7b4ac1bc6bc 100644 --- a/gremlin-driver/src/main/bin/profile-driver.sh +++ b/gremlin-driver/src/main/bin/profile-driver.sh @@ -20,11 +20,11 @@ # case `uname` in CYGWIN*) - CP="`dirname $0`"/../config/ + CP="`dirname $0`"/../conf/ CP="$CP":$( echo `dirname $0`/../lib/*.jar . | sed 's/ /;/g') ;; *) - CP="`dirname $0`"/../config/ + CP="`dirname $0`"/../conf/ CP="$CP":$( echo `dirname $0`/../lib/*.jar . | sed 's/ /:/g') esac #echo $CP diff --git a/gremlin-server/src/main/bin/gremlin-server.sh b/gremlin-server/src/main/bin/gremlin-server.sh index a82f73ffdeb..fcede2bfe84 100755 --- a/gremlin-server/src/main/bin/gremlin-server.sh +++ b/gremlin-server/src/main/bin/gremlin-server.sh @@ -20,11 +20,11 @@ # case `uname` in CYGWIN*) - CP="`dirname $0`"/../config/ + CP="`dirname $0`"/../conf/ CP="$CP":$( echo `dirname $0`/../lib/*.jar . | sed 's/ /;/g') ;; *) - CP="`dirname $0`"/../config/ + CP="`dirname $0`"/../conf/ CP="$CP":$( echo `dirname $0`/../lib/*.jar . | sed 's/ /:/g') esac #echo $CP