monit.patch 1.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354
  1. --- files.c.orig 2003-02-17 12:42:27.000000000 +0100
  2. +++ files.c 2003-05-07 10:23:58.000000000 +0200
  3. @@ -143,7 +143,8 @@
  4. /**
  5. * Search the system for the monit control file. Try first
  6. - * ~/.monitrc, if that fails try ./monitrc and finally /etc/monitrc.
  7. + * ~/.monitrc, if that fails try ./monitrc and finally
  8. + * @l_prefix@/etc/monit/monitrc.
  9. * Exit the application if the control file is not found.
  10. * @return The location of monits control file (monitrc)
  11. */
  12. @@ -169,12 +170,12 @@
  13. }
  14. memset(rcfile, 0, STRLEN);
  15. - snprintf(rcfile, STRLEN, "/etc/%s", MONITRC);
  16. + snprintf(rcfile, STRLEN, "@l_prefix@/etc/monit/%s", MONITRC);
  17. if(exist_file(rcfile))
  18. return (rcfile);
  19. - log("%s: Cannot find the control file at ~/.%s, ./%s or at /etc/%s\n",
  20. + log("%s: Cannot find the control file at ~/.%s, ./%s or at @l_prefix@/etc/monit/%s\n",
  21. prog, MONITRC, MONITRC, MONITRC);
  22. exit(1);
  23. --- monit.1.orig 2003-02-18 15:26:01.000000000 +0100
  24. +++ monit.1 2003-05-07 10:52:41.000000000 +0200
  25. @@ -1803,7 +1803,7 @@
  26. contains a \fImonitrc\fR file, this file is used
  27. instead.
  28. .PP
  29. -\&\fI/etc/monitrc\fR
  30. +\&\fI@l_prefix@/etc/monit/monitrc\fR
  31. If the control file is not found in either of the
  32. previous two locations, and /etc contains a
  33. \fImonitrc\fR file, this file will be used instead.
  34. @@ -1812,13 +1812,9 @@
  35. Lock file to help prevent concurrent runs (non-root
  36. mode).
  37. .PP
  38. -\&\fI/var/run/monit.pid\fR
  39. +\&\fI@l_prefix@/var/monit/monit.pid\fR
  40. Lock file to help prevent concurrent runs (root mode,
  41. Linux systems).
  42. -.PP
  43. -\&\fI/etc/monit.pid\fR
  44. - Lock file to help prevent concurrent runs (root mode,
  45. - systems without /var/run).
  46. .SH "SIGNALS"
  47. .IX Header "SIGNALS"
  48. If a monit daemon is running, \s-1SIGUSR1\s0 wakes it up from its sleep