diff --git a/README.md b/README.md index e351e69..c85a821 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ The following variables can be used with the solr role: solr_destination: /usr/local/src # where to install Solr to solr_home: "{{solr_destination}}/solr/example" # the Solr home directory, unless specified, this will use example solr_memory: 1024 # maximum memory for the Solr process + solr_home_system: multicore # the system loaded by jetty Dependencies ------------ diff --git a/defaults/main.yml b/defaults/main.yml index 73766f4..fa9c156 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -7,3 +7,4 @@ solr_destination: /usr/local/src solr_home: "{{solr_destination}}/solr/example" solr_memory: 1024 solr_basename: solr-{{solr_version}} +solr_home_system: multicore diff --git a/templates/solr.j2 b/templates/solr.j2 index 4039798..f7dab88 100644 --- a/templates/solr.j2 +++ b/templates/solr.j2 @@ -21,7 +21,7 @@ NAME="solr" # Daemon name, where is the actual executable DAEMON=/usr/bin/java # Read about the available options at: http://docs.oracle.com/javase/1.3/docs/tooldocs/solaris/java.html -DAEMON_ARGS="-Xmx{{solr_memory}}m -DSTOP.PORT=8079 -DSTOP.KEY=stopkey -Dsolr.solr.home=multicore -jar start.jar" +DAEMON_ARGS="-Xmx{{solr_memory}}m -DSTOP.PORT=8079 -DSTOP.KEY=stopkey -Dsolr.solr.home={{solr_home_system}} -jar start.jar" # pid file for the daemon PIDFILE=/var/run/$NAME.pid # script name