diff options
| -rw-r--r-- | databases/cassandra/Makefile | 1 | ||||
| -rw-r--r-- | databases/cassandra/files/cassandra.in | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/databases/cassandra/Makefile b/databases/cassandra/Makefile index 49b972e4ec0a..55899eb22085 100644 --- a/databases/cassandra/Makefile +++ b/databases/cassandra/Makefile @@ -3,6 +3,7 @@ PORTNAME= cassandra PORTVERSION= 1.2.18 +PORTREVISION= 1 CATEGORIES= databases java MASTER_SITES= APACHE MASTER_SITE_SUBDIR= cassandra/${PORTVERSION} diff --git a/databases/cassandra/files/cassandra.in b/databases/cassandra/files/cassandra.in index b148ab6043f2..220505d36689 100644 --- a/databases/cassandra/files/cassandra.in +++ b/databases/cassandra/files/cassandra.in @@ -24,15 +24,16 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH # DAMAGE. +# $FreeBSD$ +# # PROVIDE: cassandra # REQUIRE: LOGIN # KEYWORD: shutdown # -# $FreeBSD$ . /etc/rc.subr -name="cassandra" +name=cassandra rcvar=cassandra_enable load_rc_config $name @@ -44,7 +45,7 @@ cassandra_newgen=${cassandra_newgen:-"300m"} command=%%DATADIR%%/bin/cassandra command_args="-p /var/run/cassandra.pid >/dev/null" stop_precmd="${name}_prestop" -sig_stop="KILL" +sig_stop=KILL procname="%%LOCALBASE%%/openjdk7/bin/java" pidfile=/var/run/cassandra.pid @@ -59,7 +60,8 @@ export JVM_OVERRIDE_OPTS="$cassandra_vmargs" export JAVA_VENDOR=openjdk export JAVA_VERSION=1.7 -cassandra_prestop() { +cassandra_prestop() +{ $CASSANDRA_HOME/bin/nodetool -h localhost drain return 0 } |