honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'debian-pkg' of https://github.com/karussell/elasticsearch

This commit is contained in:
Shay Banon 2012-02-08 15:41:33 +02:00
parent 457f0a4266 3701f748d4
commit 7b37774a00
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -398,7 +398,7 @@
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<!-- some infos https://github.com/tcurdt/jdeb/blob/master/docs/maven.md <!-- some infos https://github.com/tcurdt/jdeb/blob/master/docs/maven.md
--> -->
<artifactId>jdeb</artifactId> <artifactId>jdeb</artifactId>
<groupId>org.vafer</groupId> <groupId>org.vafer</groupId>

7
src/deb/control/postrm
View File

@ -3,8 +3,11 @@ set -e
case "$1" in case "$1" in
remove) remove)
# Remove logs and data # Remove logs
rm -rf /var/log/elasticsearch /var/lib/elasticsearch rm -rf /var/log/elasticsearch
# remove **only** empty data dir
rmdir -p --ignore-fail-on-non-empty /var/lib/elasticsearch
;; ;;
purge) purge)

2
src/deb/init.d/elasticsearch
View File

@ -46,7 +46,7 @@ ES_USER=elasticsearch
ES_GROUP=elasticsearch ES_GROUP=elasticsearch
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT) # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
JDK_DIRS="/usr/lib/jvm/java-7-openjdk /usr/lib/jvm/java-7-oracle /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun" JDK_DIRS="/usr/lib/jvm/java-6-sun /usr/lib/jvm/java-7-oracle /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-7-openjdk"
# Look for the right JVM to use # Look for the right JVM to use
for jdir in $JDK_DIRS; do for jdir in $JDK_DIRS; do