mirror of https://github.com/apache/cassandra
48 lines
1.3 KiB
Diff
48 lines
1.3 KiB
Diff
--- a/bin/cassandra.in.sh
|
|
+++ b/bin/cassandra.in.sh
|
|
@@ -14,17 +14,17 @@
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
-if [ "x$CASSANDRA_HOME" = "x" ]; then
|
|
- CASSANDRA_HOME="`dirname "$0"`/.."
|
|
-fi
|
|
+CASSANDRA_HOME=/usr/share/cassandra
|
|
|
|
# The directory where Cassandra's configs live (required)
|
|
-if [ "x$CASSANDRA_CONF" = "x" ]; then
|
|
- CASSANDRA_CONF="$CASSANDRA_HOME/conf"
|
|
-fi
|
|
+CASSANDRA_CONF=/etc/cassandra
|
|
|
|
# The java classpath (required)
|
|
-CLASSPATH="$CASSANDRA_CONF"
|
|
+if [ -n "$CLASSPATH" ]; then
|
|
+ CLASSPATH=$CLASSPATH:$CASSANDRA_CONF
|
|
+else
|
|
+ CLASSPATH="$CASSANDRA_CONF"
|
|
+fi
|
|
|
|
# This can be the path to a jar file, or a directory containing the
|
|
# compiled classes. NOTE: This isn't needed by the startup script,
|
|
@@ -45,7 +45,7 @@ fi
|
|
|
|
# the default location for commitlogs, sstables, and saved caches
|
|
# if not set in cassandra.yaml
|
|
-cassandra_storagedir="$CASSANDRA_HOME/data"
|
|
+cassandra_storagedir=/var/lib/cassandra
|
|
|
|
# JAVA_HOME can optionally be set here
|
|
#JAVA_HOME=/usr/local/jdk6
|
|
@@ -59,6 +59,10 @@ for jsr223jar in "$CASSANDRA_HOME"/lib/jsr223/*/*.jar; do
|
|
CLASSPATH="$CLASSPATH:$jsr223jar"
|
|
done
|
|
|
|
+for jar in "$CASSANDRA_HOME"/*.jar; do
|
|
+ CLASSPATH="$CLASSPATH:$jar"
|
|
+done
|
|
+
|
|
CLASSPATH="$CLASSPATH:$EXTRA_CLASSPATH"
|
|
|
|
# JSR223/JRuby - set ruby lib directory
|