monit.patch 2.2 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374
  1. --- configure.orig 2003-02-18 15:26:03.000000000 +0100
  2. +++ configure 2003-05-07 10:17:37.000000000 +0200
  3. @@ -5263,16 +5263,7 @@
  4. done
  5. -# Find the right directory to put the root-mode PID file in
  6. -echo "$as_me:$LINENO: checking pid file location" >&5
  7. -echo $ECHO_N "checking pid file location... $ECHO_C" >&6
  8. -if test -d "/var/run"
  9. -then
  10. - piddir="/var/run"
  11. -elif test -d "/etc"
  12. -then
  13. - piddir="/etc"
  14. -fi
  15. +piddir="@l_prefix@/var/monit"
  16. cat >>confdefs.h <<_ACEOF
  17. --- files.c.orig 2003-02-17 12:42:27.000000000 +0100
  18. +++ files.c 2003-05-07 10:23:58.000000000 +0200
  19. @@ -143,7 +143,8 @@
  20. /**
  21. * Search the system for the monit control file. Try first
  22. - * ~/.monitrc, if that fails try ./monitrc and finally /etc/monitrc.
  23. + * ~/.monitrc, if that fails try ./monitrc and finally
  24. + * @l_prefix@/etc/monit/monitrc.
  25. * Exit the application if the control file is not found.
  26. * @return The location of monits control file (monitrc)
  27. */
  28. @@ -169,12 +170,12 @@
  29. }
  30. memset(rcfile, 0, STRLEN);
  31. - snprintf(rcfile, STRLEN, "/etc/%s", MONITRC);
  32. + snprintf(rcfile, STRLEN, "@l_prefix@/etc/monit/%s", MONITRC);
  33. if(exist_file(rcfile))
  34. return (rcfile);
  35. - log("%s: Cannot find the control file at ~/.%s, ./%s or at /etc/%s\n",
  36. + log("%s: Cannot find the control file at ~/.%s, ./%s or at @l_prefix@/etc/monit/%s\n",
  37. prog, MONITRC, MONITRC, MONITRC);
  38. exit(1);
  39. --- monit.1.orig 2003-02-18 15:26:01.000000000 +0100
  40. +++ monit.1 2003-05-07 10:52:41.000000000 +0200
  41. @@ -1803,7 +1803,7 @@
  42. contains a \fImonitrc\fR file, this file is used
  43. instead.
  44. .PP
  45. -\&\fI/etc/monitrc\fR
  46. +\&\fI@l_prefix@/etc/monit/monitrc\fR
  47. If the control file is not found in either of the
  48. previous two locations, and /etc contains a
  49. \fImonitrc\fR file, this file will be used instead.
  50. @@ -1812,13 +1812,9 @@
  51. Lock file to help prevent concurrent runs (non-root
  52. mode).
  53. .PP
  54. -\&\fI/var/run/monit.pid\fR
  55. +\&\fI@l_prefix@/var/monit/monit.pid\fR
  56. Lock file to help prevent concurrent runs (root mode,
  57. Linux systems).
  58. -.PP
  59. -\&\fI/etc/monit.pid\fR
  60. - Lock file to help prevent concurrent runs (root mode,
  61. - systems without /var/run).
  62. .SH "SIGNALS"
  63. .IX Header "SIGNALS"
  64. If a monit daemon is running, \s-1SIGUSR1\s0 wakes it up from its sleep