Revert "defaults"
This reverts commit dc2c335e94750e5ba10535184b2975e28d90914a.
diff --git a/kibana/files/kibana.default b/kibana/files/kibana.default
deleted file mode 100644
index 55968c3..0000000
--- a/kibana/files/kibana.default
+++ /dev/null
@@ -1,5 +0,0 @@
-user="kibana"
-group="root"
-chroot="/"
-chdir="/"
-nice=""
\ No newline at end of file
diff --git a/kibana/files/kibana.init b/kibana/files/kibana.init
index 0bc2dd6..d19ba7c 100755
--- a/kibana/files/kibana.init
+++ b/kibana/files/kibana.init
@@ -1,6 +1,6 @@
#!/bin/sh
# Init script for kibana
-# From Kibana package
+# Maintained by
# Generated by pleaserun.
# Implemented based on LSB Core 3.1:
# * Sections: 20.2, 20.3
@@ -11,7 +11,7 @@
# Required-Stop: $remote_fs $syslog
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
-# Short-Description:
+# Short-Description:
# Description: no description given
### END INIT INFO
@@ -44,12 +44,12 @@
# Setup any environmental stuff beforehand
-
+
# Run the program!
-
+
chroot --userspec "$user":"$group" "$chroot" sh -c "
-
+
cd \"$chdir\"
exec \"$program\" $args
" >> /var/log/kibana/kibana.stdout 2>> /var/log/kibana/kibana.stderr &
@@ -133,7 +133,7 @@
;;
stop) stop ;;
force-stop) force_stop ;;
- status)
+ status)
status
code=$?
if [ $code -eq 0 ] ; then
@@ -143,9 +143,9 @@
fi
exit $code
;;
- restart)
-
- stop && start
+ restart)
+
+ stop && start
;;
*)
echo "Usage: $SCRIPTNAME {start|force-start|stop|force-start|force-stop|status|restart}" >&2
@@ -153,4 +153,4 @@
;;
esac
-exit $?
\ No newline at end of file
+exit $?
diff --git a/kibana/server.sls b/kibana/server.sls
index fe4f5d3..7a47212 100644
--- a/kibana/server.sls
+++ b/kibana/server.sls
@@ -27,20 +27,12 @@
cmd.run:
- name: chown kibana:kibana /opt/kibana-4.3.0-linux-x64 -R
-/etc/default/kibana:
- file.managed:
- - source: salt://kibana/files/kibana.default
- - mode: 755
- - template: jinja
- - require:
- - user: kibana_user
- - watch_in:
- - service: kibana_service
-
/etc/init.d/kibana:
file.managed:
- source: salt://kibana/files/kibana.init
- - mode: 755
+ - user: kibana
+ - group: kibana
+ - mode: 700
- template: jinja
- require:
- user: kibana_user