You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/09/16 05:16:55 UTC
[2/3] git commit: Fix logging dir in debian package
Fix logging dir in debian package
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-7941
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3909567d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3909567d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3909567d
Branch: refs/heads/trunk
Commit: 3909567da619a20f53110487f78093a5358f2d85
Parents: b3573f3
Author: Brandon Williams <br...@apache.org>
Authored: Mon Sep 15 20:15:21 2014 +0000
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Sep 15 20:15:21 2014 +0000
----------------------------------------------------------------------
debian/patches/002cassandra_logdir_fix.dpatch | 19 +++++++++++++++++++
debian/patches/00list | 1 +
2 files changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3909567d/debian/patches/002cassandra_logdir_fix.dpatch
----------------------------------------------------------------------
diff --git a/debian/patches/002cassandra_logdir_fix.dpatch b/debian/patches/002cassandra_logdir_fix.dpatch
new file mode 100644
index 0000000..8836eb4
--- /dev/null
+++ b/debian/patches/002cassandra_logdir_fix.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## cassandra_logdir_fix.dpatch by Michael Shuler <mi...@pbandjelly.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' cassandra~/bin/cassandra cassandra/bin/cassandra
+--- cassandra~/bin/cassandra 2014-09-15 19:42:28.000000000 -0500
++++ cassandra/bin/cassandra 2014-09-15 21:15:15.627505503 -0500
+@@ -134,7 +134,7 @@
+ props="$3"
+ class="$4"
+ cassandra_parms="-Dlogback.configurationFile=logback.xml"
+- cassandra_parms="$cassandra_parms -Dcassandra.logdir=$CASSANDRA_HOME/logs"
++ cassandra_parms="$cassandra_parms -Dcassandra.logdir=/var/log/cassandra"
+ cassandra_parms="$cassandra_parms -Dcassandra.storagedir=$cassandra_storagedir"
+
+ if [ "x$pidpath" != "x" ]; then
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3909567d/debian/patches/00list
----------------------------------------------------------------------
diff --git a/debian/patches/00list b/debian/patches/00list
index 508c180..59b0d8b 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1 +1,2 @@
001cassandra_yaml_dirs.dpatch
+002cassandra_logdir_fix.dpatch