clean up and preserve transport settings

[weslambert]

Ref: Security-Onion-Solutions/security-onion#1132
"if sensor already configured, preserve transport settings in /etc/elasticsearch/elasticsearch.yml"

[dougburks]

Please see comments. Thanks!

[dougburks]

If I'm reading this correctly, then if ES_YAML does NOT exist (new installation), it will never get copied into place. Is that correct?

Maybe we should do something like this?

if $ES_YAML exists, copy to $ES_YAML_BAK

cp -av $SRC/$ES_YAML $ES_YAML

if $ES_YAML_BAK exists and contains transport settings, then copy those settings to $ES_YAML

[weslambert]

Agreed. Will make changes and re-submit PR.

…

On Wed, Nov 8, 2017 at 8:56 AM, Doug Burks ***@***.***> wrote: ***@***.**** requested changes on this pull request. Please see comments. Thanks! ------------------------------ In usr/sbin/so-elastic-configure-stack <#133 (comment)> : > -if [ -f /etc/elasticsearch/elasticsearch.yml ]; then - sed -i "s/cluster\.name.*/cluster\.name: \"$HOSTNAME\"/" /etc/elasticsearch/elasticsearch.yml + +for i in /nsm/elasticsearch /var/log/elasticsearch /etc/nsm/crossclustertab; do + chown -R elasticsearch:elasticsearch $i +done + +cp -av $SRC/etc/elasticsearch/log4j2.properties /etc/elasticsearch/log4j2.properties + +ES_YAML="/etc/elasticsearch/elasticsearch.yml" +if [ -f "$ES_YAML" ]; then + # Preserve transport settings if present + if grep -q transport $ES_YAML; then + : + else + cp -av $SRC/$ES_YAML $ES_YAML If I'm reading this correctly, then if ES_YAML does NOT exist (new installation), it will never get copied into place. Is that correct? Maybe we should do something like this? if $ES_YAML exists, copy to $ES_YAML_BAK cp -av $SRC/$ES_YAML $ES_YAML if $ES_YAML_BAK exists and contains transport settings, then copy those settings to $ES_YAML — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#133 (review)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AQDNqLVT9b0qHfQs1NGB5fPFU4MQZvrqks5s0bL9gaJpZM4QVlL2> .