github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7422 from jbudz/package-dirs

Browse source 
[build] Cleanup dirs on uninstall
This commit is contained in:
Jonathan Budzenski 2016-06-15 09:24:02 -05:00 • committed by GitHub
commit 314e095441
3 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tasks/build/os_packages.js
View file

@ -42,7 +42,8 @@ export default (grunt) => {
'--template-value', `user=${packages.user}`,
'--template-value', `group=${packages.group}`,
'--template-value', `optimizeDir=${packages.path.home}/optimize`,
'--template-value', `configDir=${packages.path.conf}`,
'--template-value', `pluginsDir=${packages.path.plugins}`,
//config folder is moved to path.conf, exclude {path.home}/config
//uses relative path to --prefix, strip the leading /
'--exclude', `${packages.path.home.slice(1)}/config`

22
tasks/build/package_scripts/post_remove.sh
View file

@ -10,20 +10,26 @@ user_remove() {
}
REMOVE_USER=false
REMOVE_DIRS=false
case $1 in
# Includes cases for all valid arguments, exit 1 otherwise
# Debian
purge)
REMOVE_USER=true
REMOVE_DIRS=true
;;
remove)
REMOVE_DIRS=true
;;
remove|failed-upgrade|abort-install|abort-upgrade|disappear|upgrade|disappear)
failed-upgrade|abort-install|abort-upgrade|disappear|upgrade|disappear)
;;
# Red Hat
0)
REMOVE_USER=true
REMOVE_DIRS=true
;;
1)
@ -40,3 +46,17 @@ if [ "$REMOVE_USER" = "true" ]; then
user_remove "<%= user %>"
fi
fi
if [ "$REMOVE_DIRS" = "true" ]; then
if [ -d "<%= optimizeDir %>" ]; then
rm -rf "<%= optimizeDir %>"
fi
if [ -d "<%= pluginsDir %>" ]; then
rm -rf "<%= pluginsDir %>"
fi
if [ -d "<%= configDir %>" ]; then
rmdir --ignore-fail-on-non-empty "<%= configDir %>"
fi
fi

4
tasks/config/packages.js
View file

@ -13,8 +13,8 @@ export default (grunt) => {
const PREFIX_PRODUCTION_RPM = `${FOLDER_PRODUCTION}/${FOLDERNAME_RPM}`;
const FOLDER_CONFIG = '/etc/kibana';
const FOLDER_LOGS = '/var/log/kibana';
const FOLDER_HOME = '/usr/share/kibana';
const FOLDER_PLUGINS = `${FOLDER_HOME}/installedPlugins`;
const FILE_KIBANA_CONF = `${FOLDER_CONFIG}/kibana.yml`;
const FILE_KIBANA_BINARY = `${FOLDER_HOME}/bin/kibana`;
@ -43,7 +43,7 @@ export default (grunt) => {
version: VERSION,
path: {
conf: FOLDER_CONFIG,
logs: FOLDER_LOGS,
plugins: FOLDER_PLUGINS,
home: FOLDER_HOME,
kibanaBin: FILE_KIBANA_BINARY,
kibanaConfig: FILE_KIBANA_CONF