summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjtimberman <joshua@opscode.com>2010-02-17 16:09:13 -0700
committerjtimberman <joshua@opscode.com>2010-02-17 16:09:13 -0700
commit04e2825fcf1c40b868be0ab87afa105aa00b1f1f (patch)
treebcfb33505b7f0530b3bd30f8dfae4af752d97752
parent29b9821af2437966d0dd86ac14aeda1af17cd70e (diff)
downloadchef-04e2825fcf1c40b868be0ab87afa105aa00b1f1f.tar.gz
move -j to OPTIONS, for CHEF-951
-rw-r--r--chef/distro/redhat/etc/init.d/chef-solr2
-rw-r--r--chef/distro/redhat/etc/sysconfig/chef-solr4
2 files changed, 3 insertions, 3 deletions
diff --git a/chef/distro/redhat/etc/init.d/chef-solr b/chef/distro/redhat/etc/init.d/chef-solr
index 74f1d95303..216dcf2324 100644
--- a/chef/distro/redhat/etc/init.d/chef-solr
+++ b/chef/distro/redhat/etc/init.d/chef-solr
@@ -24,7 +24,7 @@ options=${OPTIONS-}
start() {
echo -n "Starting $prog:"
- daemon $prog -d -c "$config" -u "$user" -g "$group" -L "$logfile" -j "$options" "&>/dev/null"
+ daemon $prog -d -c "$config" -u "$user" -g "$group" -L "$logfile" "$options" "&>/dev/null"
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && touch ${lockfile}
diff --git a/chef/distro/redhat/etc/sysconfig/chef-solr b/chef/distro/redhat/etc/sysconfig/chef-solr
index a7db2220fc..aa6ecbdaac 100644
--- a/chef/distro/redhat/etc/sysconfig/chef-solr
+++ b/chef/distro/redhat/etc/sysconfig/chef-solr
@@ -5,5 +5,5 @@
#CHEF_USER=chef
#CHEF_GROUP=chef
#LOGFILE=/var/log/chef/solr.log
-# options for Java.
-#OPTIONS=
+# options for Java. Need to start with -j followed by options..
+#OPTIONS="-j "