[gentoo-commits] gentoo-x86 commit in app-misc/elasticsearch/files: elasticsearch.service3 elasticsearch.init4

[Tony Vroon (chainsaw)]

chainsaw    15/06/11 15:36:30

  Added:                elasticsearch.service3 elasticsearch.init4
  Log:
  Security fix relating to an unspecified arbitrary file modification 
vulnerability. Ebuild, init script and systemd service file by Ferenc Erki. 
Closes bug #537314 by Austin M. Matherne and bug #547964 by Tomas Mozes. Adding 
Ferenc Erki as proxy maintainer. Removing all vulnerable ebuilds for security 
bug #551776.
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 
0xB5058F9A)

Revision  Changes    Path
1.1                  app-misc/elasticsearch/files/elasticsearch.service3

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/elasticsearch/files/elasticsearch.service3?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/elasticsearch/files/elasticsearch.service3?rev=1.1&content-type=text/plain

Index: elasticsearch.service3
===================================================================
[Unit]
Description=Elasticsearch
After=network.target

[Service]
User=elasticsearch
Environment=ES_INCLUDE=/usr/share/elasticsaerch/bin/elasticsearch.in.sh
ExecStart=/usr/share/elasticsearch/bin/elasticsearch 
-Des.default.path.conf=/etc/elasticsearch

[Install]
WantedBy=multi-user.target



1.1                  app-misc/elasticsearch/files/elasticsearch.init4

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/elasticsearch/files/elasticsearch.init4?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/elasticsearch/files/elasticsearch.init4?rev=1.1&content-type=text/plain

Index: elasticsearch.init4
===================================================================
#!/sbin/runscript

name="Elasticsearch"
description=""

ES_USER=${ES_USER:="elasticsearch"}
ES_INSTANCE=${SVCNAME#*.}

if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then
        PIDFILE="/run/elasticsearch/elasticsearch.${ES_INSTANCE}.pid"
        ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
        ES_CONF_PATH="/etc/elasticsearch/${ES_INSTANCE}"
        ES_LOG_PATH="/var/log/elasticsearch/${ES_INSTANCE}"
else
        PIDFILE="/run/elasticsearch/elasticsearch.pid"
        ES_BASE_PATH="/var/lib/elasticsearch/_default"
        ES_CONF_PATH="/etc/elasticsearch"
        ES_LOG_PATH="/var/log/elasticsearch/_default"
fi

ES_DATA_PATH="${ES_BASE_PATH}/data"
ES_WORK_PATH="${ES_BASE_PATH}/work"

export ES_INCLUDE="/usr/share/elasticsearch/bin/elasticsearch.in.sh"
export JAVA_OPTS
export ES_JAVA_OPTS
export ES_HEAP_SIZE
export ES_HEAP_NEWSIZE
export ES_DIRECT_SIZE
export ES_USE_IPV4

server_command="/usr/share/elasticsearch/bin/elasticsearch"
server_args=" -p ${PIDFILE} -Des.default.path.conf=\"${ES_CONF_PATH}\" 
-Des.default.path.data=\"${ES_DATA_PATH}\" 
-Des.default.path.work=\"${ES_WORK_PATH}\" 
-Des.default.path.logs=\"${ES_LOG_PATH}\""

depend() {
        use net
}

start() {
        # elasticsearch -Des.config=/path/to/config/file
        # elasticsearch -Des.network.host=10.0.0.4
        
        [ ! -f "${ES_INCLUDE}" ] && {
                eerror "${ES_INCLUDE} must be copied into place"
                return 1
        }

        local conf
        local conf_file
        for conf in elasticsearch.yml logging.yml; do
                conf_file="${ES_CONF_PATH}/${conf}"
                if [ ! -f "${conf_file}" ]; then
                        eerror "${conf_file} must be copied into place"
                        return 1
                fi
        done

        ebegin "Starting ${SVCNAME}"

        if [ -n "${ES_MAX_FD}" ]; then
                ulimit -n ${ES_MAX_FD}
                einfo "Max open filedescriptors  : ${ES_MAX_FD}"
        fi

        checkpath -d -o "${ES_USER}" -m750 "/var/lib/elasticsearch"
        checkpath -d -o "${ES_USER}" -m750 "/var/log/elasticsearch"
        checkpath -d -o "${ES_USER}" -m750 "$(dirname "${PIDFILE}")"
        checkpath -d -o "${ES_USER}" -m750 "${ES_BASE_PATH}"
        checkpath -d -o "${ES_USER}" -m750 "${ES_LOG_PATH}"
        
        start-stop-daemon --start \
                --background \
                --chdir "${ES_BASE_PATH}" \
                --user="${ES_USER}" \
                --pidfile="${PIDFILE}" \
                --exec ${server_command} -- ${server_args}
        eend $?
}

stop() {
        ebegin "Stopping ${SVCNAME}"
        start-stop-daemon --stop \
                --pidfile=${PIDFILE} \
                --user="${ES_USER}" \
                --retry=TERM/20/KILL/5
        eend $?
}