diff --git a/pom.xml b/pom.xml
index e5eaac351..c9ebc1449 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
0.6.0F
- 1.0.9-SNAPSHOT
+ 1.0.8-SNAPSHOT
2.1.4-SNAPSHOT
@@ -71,7 +71,7 @@
0.4.4-B-SNAPSHOT
-
+
/usr/share/fess
${packaging.fess.home.dir}/app
${packaging.fess.home.dir}/bin
@@ -266,6 +266,50 @@
maven-resources-plugin
2.6
+
+ copy-resources-deb
+ prepare-package
+
+ copy-resources
+
+
+ ${project.build.directory}/generated-packaging/deb/
+
+ ${project.basedir}/src/packaging/common/packaging.properties
+ ${project.basedir}/src/packaging/deb/packaging.properties
+
+
+
+ src/packaging/common/
+ true
+
+ **/*
+
+
+ packaging.properties
+
+
+
+ src/packaging/deb/
+ true
+
+ **/*
+
+
+ packaging.properties
+
+
+
+ ${project.basedir}
+ true
+
+ bin/fess
+ bin/fess.in.sh
+
+
+
+
+
copy-resources-rpm
prepare-package
@@ -338,6 +382,259 @@
+
+
+ jdeb
+ org.vafer
+ 1.4
+
+ ${project.build.directory}/releases/${project.artifactId}-${project.version}.deb
+ ${project.build.directory}/generated-packaging/deb/scripts
+
+
+
+ package
+
+ jdeb
+
+
+
+
+
+
+ directory
+ ${project.build.directory}/fess
+ **/fess_config.properties,**/fess_env*.properties
+
+ perm
+ ${packaging.fess.app.dir}
+ 755
+ ${packaging.fess.user}
+ ${packaging.fess.group}
+
+
+
+
+ directory
+ ${project.build.directory}/tomcat-lib
+
+ perm
+ ${packaging.fess.lib.dir}/classes
+ ${packaging.fess.user}
+ ${packaging.fess.group}
+
+
+
+ file
+ ${project.build.directory}/fess/WEB-INF/classes/org/codelibs/fess/FessBoot.class
+ ${packaging.fess.lib.dir}/classes/org/codelibs/fess/FessBoot.class
+
+ perm
+ ${packaging.fess.user}
+ ${packaging.fess.group}
+
+
+
+
+ files
+
+ ${project.basedir}/src/main/assemblies/files/tomcat_config.properties
+ ${project.basedir}/src/main/assemblies/files/logging.properties
+
+ ${packaging.fess.conf.dir}
+
+ perm
+ ${packaging.fess.user}
+ ${packaging.fess.group}
+
+
+
+ files
+
+ ${project.build.directory}/fess/WEB-INF/classes/fess_config.properties
+ ${project.build.directory}/fess/WEB-INF/classes/fess_env_crawler.properties
+ ${project.build.directory}/fess/WEB-INF/classes/fess_env_suggest.properties
+ ${project.build.directory}/fess/WEB-INF/classes/fess_env_web.properties
+
+ ${packaging.fess.conf.dir}
+
+ perm
+ ${packaging.fess.user}
+ ${packaging.fess.group}
+
+
+
+
+ directory
+ ${project.basedir}/src/main/assemblies/extension
+
+ perm
+ ${packaging.fess.extension.dir}
+ ${packaging.fess.user}
+ ${packaging.fess.group}
+
+
+
+
+ template
+
+ ${packaging.fess.var.dir}
+
+
+ perm
+ 755
+ ${packaging.fess.user}
+ ${packaging.fess.group}
+
+
+
+
+ files
+
+ ${project.basedir}/src/main/assemblies/files/fess
+ ${project.basedir}/src/main/assemblies/files/fess.in.sh
+
+ ${packaging.fess.bin.dir}
+
+ perm
+ 755
+ ${packaging.fess.user}
+ ${packaging.fess.group}
+
+
+
+
+ template
+
+ ${packaging.fess.log.dir}
+ ${packaging.fess.temp.dir}
+
+
+ perm
+ ${packaging.fess.user}
+ ${packaging.fess.group}
+
+
+
+
+ template
+
+ ${packaging.fess.dictionary.dir}
+
+
+ perm
+ elasticsearch
+ elasticsearch
+
+
+
+
+ directory
+ ${project.basedir}/plugins
+
+ perm
+ ${packaging.fess.home.dir}/es/plugins
+ ${packaging.fess.user}
+ ${packaging.fess.group}
+
+
+
+
+ file
+ ${project.build.directory}/generated-packaging/deb/env/fess
+ /etc/default/fess
+
+ perm
+ root
+ root
+
+
+
+
+ file
+ ${project.build.directory}/generated-packaging/deb/init.d/fess
+ /etc/init.d/fess
+
+ perm
+ 755
+ root
+ root
+
+
+
+
+ file
+ ${project.build.directory}/generated-packaging/deb/systemd/fess.service
+ ${packaging.fess.systemd.dir}/fess.service
+
+
+
+ file
+ ${project.build.directory}/generated-packaging/deb/systemd/sysctl/fess.conf
+ ${packaging.fess.systemd.sysctl.dir}/fess.conf
+
+
+
+ file
+ ${project.build.directory}/generated-packaging/deb/systemd/fess.conf
+ ${packaging.fess.tmpfilesd.dir}/fess.conf
+
+
+
+ directory
+ ${project.build.directory}/generated-packaging/deb/lintian
+ .DS_Store
+
+ perm
+ /usr/share/lintian/overrides
+ ${packaging.fess.user}
+ ${packaging.fess.group}
+
+
+
+
+ files
+
+ ${project.basedir}/LICENSE
+ ${project.basedir}/README.md
+
+ ${packaging.fess.home.dir}
+
+ perm
+ ${packaging.fess.user}
+ ${packaging.fess.group}
+
+
+
+
+ file
+ ${project.build.directory}/generated-packaging/deb/copyright
+ /usr/share/doc/fess/copyright
+
+
+
+ template
+
+ ${packaging.fess.pid.dir}
+
+
+ perm
+ ${packaging.fess.user}
+ ${packaging.fess.group}
+
+
+
+
+
+
+
+
org.codehaus.mojo
diff --git a/src/packaging/deb/init.d/fess b/src/packaging/deb/init.d/fess
index 0cfe91244..4012986bd 100755
--- a/src/packaging/deb/init.d/fess
+++ b/src/packaging/deb/init.d/fess
@@ -39,8 +39,8 @@ fi
# The following variables can be overwritten in $DEFAULT
# Run Fess as this user ID and group ID
-FESS_USER=fess
-FESS_GROUP=fess
+FESS_USER=${packaging.fess.user}
+FESS_GROUP=${packaging.fess.group}
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
JDK_DIRS="/usr/lib/jvm/java-8-oracle/ /usr/lib/jvm/j2sdk1.8-oracle/ /usr/lib/jvm/jdk-7-oracle-x64 /usr/lib/jvm/java-7-oracle /usr/lib/jvm/j2sdk1.7-oracle/ /usr/lib/jvm/java-7-openjdk /usr/lib/jvm/java-7-openjdk-amd64/ /usr/lib/jvm/java-7-openjdk-armhf /usr/lib/jvm/java-7-openjdk-i386/ /usr/lib/jvm/default-java"
@@ -54,7 +54,7 @@ done
export JAVA_HOME
# Directory where the Fess binary distribution resides
-FESS_HOME=/usr/share/$NAME
+FESS_HOME=${packaging.fess.home.dir}
# Heap size defaults to 256m min, 1g max
# Set FESS_HEAP_SIZE to 50% of available RAM, but no more than 31g
@@ -76,10 +76,13 @@ MAX_OPEN_FILES=65535
#MAX_LOCKED_MEMORY=
# Fess log directory
-#LOG_DIR=/var/log/$NAME
+LOG_DIR=${packaging.fess.log.dir}
# Fess data directory
-#DATA_DIR=/var/lib/$NAME
+DATA_DIR=${packaging.fess.var.dir}
+
+# Fess configuration directory
+CONF_DIR=${packaging.fess.conf.dir}
# Maximum number of VMA (Virtual Memory Areas) a process can own
MAX_MAP_COUNT=262144
@@ -88,7 +91,7 @@ MAX_MAP_COUNT=262144
#FESS_GC_LOG_FILE=/var/log/fess/gc.log
# Fess PID file directory
-PID_DIR="${packaging.fess.pid.dir}"
+PID_DIR=${packaging.fess.pid.dir}
# End of variables that can be overwritten in $DEFAULT
@@ -100,7 +103,7 @@ fi
# Define other required variables
PID_FILE="$PID_DIR/$NAME.pid"
DAEMON=$FESS_HOME/bin/fess
-DAEMON_OPTS="-d -p $PID_FILE --default.config=$CONF_FILE --default.path.home=$FESS_HOME --default.path.logs=$LOG_DIR --default.path.data=$DATA_DIR"
+DAEMON_OPTS="-d -p $PID_FILE --default.path.conf=$CONF_DIR --default.path.home=$FESS_HOME --default.path.logs=$LOG_DIR --default.path.data=$DATA_DIR"
export FESS_HEAP_SIZE
export FESS_HEAP_NEWSIZE
@@ -165,7 +168,7 @@ case "$1" in
fi
# Start Daemon
- start-stop-daemon --start -b --user "$FESS_USER" -c "$FESS_USER" --pidfile "$PID_FILE" --exec $DAEMON -- $DAEMON_OPTS
+ start-stop-daemon -d $FESS_HOME --start -b --user "$FESS_USER" -c "$FESS_USER" --pidfile "$PID_FILE" --exec $DAEMON -- $DAEMON_OPTS
return=$?
if [ $return -eq 0 ]
then
@@ -222,3 +225,4 @@ case "$1" in
esac
exit 0
+