Permalink
Browse files

resolved merge conflict

  • Loading branch information...
joemiller committed Jul 9, 2012
2 parents 7029cae + 7fa48d0 commit f8aaae3a00555e54fd7554d7e739db483f55f287
View
@@ -22,7 +22,7 @@ Bunchr::Software.new do |t|
unless File.directory?("#{install_prefix}/lib")
t.build_commands << "mkdir #{install_prefix}/lib"
end
-
+
t.build_commands << "./configure --prefix=#{install_prefix}"
t.build_commands << "make"
@@ -40,7 +40,6 @@ pidfile=${PIDFILE-/var/run/sensu/$prog.pid}
options=${OPTIONS}
cd $sensu_home
-export PATH=$PATH:/etc/sensu/plugins:/usr/local/sbin:/usr/local/bin
##
## Set platform specific bits here.
@@ -113,6 +112,8 @@ if [ "$system" = "debian" ]; then
fi
# TODO: support other platforms in the future: suse, gentoo, arch, slackware, etc
+export PATH=$PATH:/etc/sensu/plugins:/usr/local/sbin:/usr/local/bin
+
ensure_pid_dir () {
pid_dir=`dirname ${pidfile}`
if [ ! -d ${pid_dir} ] ; then
@@ -40,7 +40,6 @@ pidfile=${PIDFILE-/var/run/sensu/$prog.pid}
options=${OPTIONS}
cd $sensu_home
-export PATH=$PATH:/etc/sensu/plugins:/usr/local/sbin:/usr/local/bin
##
## Set platform specific bits here.
@@ -112,6 +111,7 @@ if [ "$system" = "debian" ]; then
}
fi
# TODO: support other platforms in the future: suse, gentoo, arch, slackware, etc
+export PATH=$PATH:/etc/sensu/plugins:/usr/local/sbin:/usr/local/bin
ensure_pid_dir () {
pid_dir=`dirname ${pidfile}`
@@ -40,7 +40,6 @@ pidfile=${PIDFILE-/var/run/sensu/$prog.pid}
options=${OPTIONS}
cd $sensu_home
-export PATH=$PATH:/etc/sensu/plugins:/usr/local/sbin:/usr/local/bin
##
## Set platform specific bits here.
@@ -112,6 +111,7 @@ if [ "$system" = "debian" ]; then
}
fi
# TODO: support other platforms in the future: suse, gentoo, arch, slackware, etc
+export PATH=$PATH:/etc/sensu/plugins:/usr/local/sbin:/usr/local/bin
ensure_pid_dir () {
pid_dir=`dirname ${pidfile}`
@@ -40,7 +40,6 @@ pidfile=${PIDFILE-/var/run/sensu/$prog.pid}
options=${OPTIONS}
cd $sensu_home
-export PATH=$PATH:/etc/sensu/plugins:/usr/local/sbin:/usr/local/bin
##
## Set platform specific bits here.
@@ -112,6 +111,7 @@ if [ "$system" = "debian" ]; then
}
fi
# TODO: support other platforms in the future: suse, gentoo, arch, slackware, etc
+export PATH=$PATH:/etc/sensu/plugins:/usr/local/sbin:/usr/local/bin
ensure_pid_dir () {
pid_dir=`dirname ${pidfile}`
@@ -6,6 +6,9 @@
sharedscripts
copytruncate
compress
+ postrotate
+ kill -USR2 `cat /var/run/sensu/sensu-client.pid`
+ endscript
}
/var/log/sensu/sensu-server.log {
@@ -16,6 +19,9 @@
sharedscripts
copytruncate
compress
+ postrotate
+ kill -USR2 `cat /var/run/sensu/sensu-server.pid`
+ endscript
}
/var/log/sensu/sensu-api.log {
@@ -26,6 +32,9 @@
sharedscripts
copytruncate
compress
+ postrotate
+ kill -USR2 `cat /var/run/sensu/sensu-api.pid`
+ endscript
}
/var/log/sensu/sensu-dashboard.log {
@@ -36,4 +45,7 @@
sharedscripts
copytruncate
compress
-}
+ postrotate
+ kill -USR2 `cat /var/run/sensu/sensu-dashboard.pid`
+ endscript
+}

0 comments on commit f8aaae3

Please sign in to comment.