|
@@ -330,8 +330,10 @@ run_elasticsearch_service() {
|
|
if [ ! -z "$CONF_DIR" ] ; then
|
|
if [ ! -z "$CONF_DIR" ] ; then
|
|
if is_dpkg ; then
|
|
if is_dpkg ; then
|
|
echo "CONF_DIR=$CONF_DIR" >> /etc/default/elasticsearch;
|
|
echo "CONF_DIR=$CONF_DIR" >> /etc/default/elasticsearch;
|
|
|
|
+ echo "ES_JVM_OPTIONS=$ES_JVM_OPTIONS" >> /etc/default/elasticsearch;
|
|
elif is_rpm; then
|
|
elif is_rpm; then
|
|
echo "CONF_DIR=$CONF_DIR" >> /etc/sysconfig/elasticsearch;
|
|
echo "CONF_DIR=$CONF_DIR" >> /etc/sysconfig/elasticsearch;
|
|
|
|
+ echo "ES_JVM_OPTIONS=$ES_JVM_OPTIONS" >> /etc/sysconfig/elasticsearch
|
|
fi
|
|
fi
|
|
fi
|
|
fi
|
|
|
|
|
|
@@ -525,6 +527,7 @@ move_config() {
|
|
mv "$oldConfig"/* "$ESCONFIG"
|
|
mv "$oldConfig"/* "$ESCONFIG"
|
|
chown -R elasticsearch:elasticsearch "$ESCONFIG"
|
|
chown -R elasticsearch:elasticsearch "$ESCONFIG"
|
|
assert_file_exist "$ESCONFIG/elasticsearch.yml"
|
|
assert_file_exist "$ESCONFIG/elasticsearch.yml"
|
|
|
|
+ assert_file_exist "$ESCONFIG/jvm.options"
|
|
assert_file_exist "$ESCONFIG/log4j2.properties"
|
|
assert_file_exist "$ESCONFIG/log4j2.properties"
|
|
}
|
|
}
|
|
|
|
|