Author: eevans
Date: Tue Dec 14 01:46:19 2010
New Revision: 1048901
URL: http://svn.apache.org/viewvc?rev=1048901&view=rev
Log:
enable use of jna in redhat rpms
Patch by Nick Bailey; reviewed by eevans for CASSANDRA-1689
Added:
cassandra/trunk/redhat/cassandra.conf
cassandra/trunk/redhat/default
Modified:
cassandra/trunk/redhat/apache-cassandra.spec
cassandra/trunk/redhat/cassandra
cassandra/trunk/redhat/cassandra.in.sh
Modified: cassandra/trunk/redhat/apache-cassandra.spec
URL:
http://svn.apache.org/viewvc/cassandra/trunk/redhat/apache-cassandra.spec?rev=1048901&r1=1048900&r2=1048901&view=diff
==============================================================================
--- cassandra/trunk/redhat/apache-cassandra.spec (original)
+++ cassandra/trunk/redhat/apache-cassandra.spec Tue Dec 14 01:46:19 2010
@@ -51,11 +51,15 @@ mkdir -p %{buildroot}/usr/share/%{userna
mkdir -p %{buildroot}/usr/share/%{username}/default.conf
mkdir -p %{buildroot}/etc/%{username}/default.conf
mkdir -p %{buildroot}/etc/rc.d/init.d/
+mkdir -p %{buildroot}/etc/security/limits.d/
+mkdir -p %{buildroot}/etc/default/
mkdir -p %{buildroot}/usr/sbin
mkdir -p %{buildroot}/usr/bin
cp -p conf/* %{buildroot}/etc/%{username}/default.conf
cp -p conf/* %{buildroot}/usr/share/%{username}/default.conf
cp -p redhat/%{username} %{buildroot}/etc/rc.d/init.d/
+cp -p redhat/%{username}.conf %{buildroot}/etc/security/limits.d/
+cp -p redhat/default %{buildroot}/etc/default/%{username}
cp -p lib/*.jar %{buildroot}/usr/share/%{username}/lib
mv redhat/cassandra.in.sh %{buildroot}/usr/share/%{username}
rm bin/cassandra.in.sh
@@ -90,6 +94,8 @@ fi
%attr(755,root,root) %{_bindir}/*
%attr(755,root,root) %{_sbindir}/cassandra
%attr(755,root,root) /etc/rc.d/init.d/%{username}
+%attr(755,root,root) /etc/default/%{username}
+%attr(755,root,root) /etc/security/limits.d/%{username}.conf
%attr(755,%{username},%{username}) /usr/share/%{username}*
%attr(755,%{username},%{username}) %config(noreplace)
/%{_sysconfdir}/%{username}
%attr(755,%{username},%{username}) %config(noreplace) /var/lib/%{username}/*
Modified: cassandra/trunk/redhat/cassandra
URL:
http://svn.apache.org/viewvc/cassandra/trunk/redhat/cassandra?rev=1048901&r1=1048900&r2=1048901&view=diff
==============================================================================
--- cassandra/trunk/redhat/cassandra (original)
+++ cassandra/trunk/redhat/cassandra Tue Dec 14 01:46:19 2010
@@ -14,10 +14,13 @@ export CASSANDRA_HOME=/usr/share/cassand
export CASSANDRA_INCLUDE=/usr/share/cassandra/cassandra.in.sh
export CASSANDRA_CONF=/etc/cassandra/conf
export CASSANDRA_OWNR=cassandra
+NAME="cassandra"
log_file=/var/log/cassandra/cassandra.log
pid_file=/var/run/cassandra/cassandra.pid
CASSANDRA_PROG=/usr/sbin/cassandra
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
case "$1" in
start)
Added: cassandra/trunk/redhat/cassandra.conf
URL:
http://svn.apache.org/viewvc/cassandra/trunk/redhat/cassandra.conf?rev=1048901&view=auto
==============================================================================
--- cassandra/trunk/redhat/cassandra.conf (added)
+++ cassandra/trunk/redhat/cassandra.conf Tue Dec 14 01:46:19 2010
@@ -0,0 +1 @@
+cassandra - memlock unlimited
Modified: cassandra/trunk/redhat/cassandra.in.sh
URL:
http://svn.apache.org/viewvc/cassandra/trunk/redhat/cassandra.in.sh?rev=1048901&r1=1048900&r2=1048901&view=diff
==============================================================================
--- cassandra/trunk/redhat/cassandra.in.sh (original)
+++ cassandra/trunk/redhat/cassandra.in.sh Tue Dec 14 01:46:19 2010
@@ -2,6 +2,9 @@
# The directory where Cassandra's configs live (required)
CASSANDRA_CONF=/etc/cassandra/conf
+# use JNA if installed in standard location
+[ -r /usr/share/java/jna.jar ] &&
CLASSPATH="$CLASSPATH:/usr/share/java/jna.jar"
+
# The java classpath (required)
CLASSPATH=$CLASSPATH:$CASSANDRA_CONF
Added: cassandra/trunk/redhat/default
URL:
http://svn.apache.org/viewvc/cassandra/trunk/redhat/default?rev=1048901&view=auto
==============================================================================
--- cassandra/trunk/redhat/default (added)
+++ cassandra/trunk/redhat/default Tue Dec 14 01:46:19 2010
@@ -0,0 +1,7 @@
+# NOTICE: See also /etc/cassandra/cassandra-env.sh
+
+# EXTRA_CLASSPATH provides the means to extend Cassandra's classpath with
+# additional libraries. It is formatted as a colon-delimited list of
+# class directories and/or jar files. For example, to enable the
+# JMX-to-web bridge install libmx4j-java and uncomment the following.
+#EXTRA_CLASSPATH="/usr/share/java/mx4j-tools.jar"
