honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-09 06:25:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Respect ES_PATH_CONF during upgrades too (#50246)

Browse Source 
A previous commit taught Elasticsearch packages to respect ES_PATH_CONF
during installs. Missed in that commit was respecting ES_PATH_CONF on
upgrades. This commit does that. Additionally, while ES_PATH_CONF is not
currently used in pre-install, this commit adds respect to the preinst
script in case we do in the future.
This commit is contained in:
Jason Tedor 2019-12-16 15:07:38 -05:00
parent 463cd414aa
commit 620b84c84d
No known key found for this signature in database
GPG Key ID: FA89F05560F16BC5
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
distribution/packages/src/common/scripts/posttrans
View File

@ -1,8 +1,15 @@
if [ ! -f /etc/elasticsearch/elasticsearch.keystore ]; then # source the default env file
if [ -f "${path.env}" ]; then
. "${path.env}"
else
ES_PATH_CONF="${path.conf}"
fi
if [ ! -f "${ES_PATH_CONF}"/elasticsearch.keystore ]; then
/usr/share/elasticsearch/bin/elasticsearch-keystore create /usr/share/elasticsearch/bin/elasticsearch-keystore create
chown root:elasticsearch /etc/elasticsearch/elasticsearch.keystore chown root:elasticsearch "${ES_PATH_CONF}"/elasticsearch.keystore
chmod 660 /etc/elasticsearch/elasticsearch.keystore chmod 660 "${ES_PATH_CONF}"/elasticsearch.keystore
md5sum /etc/elasticsearch/elasticsearch.keystore > /etc/elasticsearch/.elasticsearch.keystore.initial_md5sum md5sum "${ES_PATH_CONF}"/elasticsearch.keystore > "${ES_PATH_CONF}"/.elasticsearch.keystore.initial_md5sum
else else
/usr/share/elasticsearch/bin/elasticsearch-keystore upgrade /usr/share/elasticsearch/bin/elasticsearch-keystore upgrade
fi fi

7
distribution/packages/src/common/scripts/preinst
View File

@ -15,6 +15,13 @@ err_exit() {
exit 1 exit 1
} }
# source the default env file
if [ -f "${path.env}" ]; then
. "${path.env}"
else
ES_PATH_CONF="${path.conf}"
fi
case "$1" in case "$1" in
# Debian #################################################### # Debian ####################################################