You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
53 lines
1.8 KiB
53 lines
1.8 KiB
--- files.c.orig 2003-02-17 12:42:27.000000000 +0100 |
|
+++ files.c 2003-05-07 10:23:58.000000000 +0200 |
|
@@ -143,7 +143,8 @@ |
|
|
|
/** |
|
* Search the system for the monit control file. Try first |
|
- * ~/.monitrc, if that fails try ./monitrc and finally /etc/monitrc. |
|
+ * ~/.monitrc, if that fails try ./monitrc and finally |
|
+ * @l_prefix@/etc/monit/monitrc. |
|
* Exit the application if the control file is not found. |
|
* @return The location of monits control file (monitrc) |
|
*/ |
|
@@ -169,12 +170,12 @@ |
|
} |
|
|
|
memset(rcfile, 0, STRLEN); |
|
- snprintf(rcfile, STRLEN, "/etc/%s", MONITRC); |
|
+ snprintf(rcfile, STRLEN, "@l_prefix@/etc/monit/%s", MONITRC); |
|
|
|
if(exist_file(rcfile)) |
|
return (rcfile); |
|
|
|
- log("%s: Cannot find the control file at ~/.%s, ./%s or at /etc/%s\n", |
|
+ log("%s: Cannot find the control file at ~/.%s, ./%s or at @l_prefix@/etc/monit/%s\n", |
|
prog, MONITRC, MONITRC, MONITRC); |
|
|
|
exit(1); |
|
--- monit.1.orig 2003-02-18 15:26:01.000000000 +0100 |
|
+++ monit.1 2003-05-07 10:52:41.000000000 +0200 |
|
@@ -1803,7 +1803,7 @@ |
|
contains a \fImonitrc\fR file, this file is used |
|
instead. |
|
.PP |
|
-\&\fI/etc/monitrc\fR |
|
+\&\fI@l_prefix@/etc/monit/monitrc\fR |
|
If the control file is not found in either of the |
|
previous two locations, and /etc contains a |
|
\fImonitrc\fR file, this file will be used instead. |
|
@@ -1812,13 +1812,9 @@ |
|
Lock file to help prevent concurrent runs (non-root |
|
mode). |
|
.PP |
|
-\&\fI/var/run/monit.pid\fR |
|
+\&\fI@l_prefix@/var/monit/monit.pid\fR |
|
Lock file to help prevent concurrent runs (root mode, |
|
Linux systems). |
|
-.PP |
|
-\&\fI/etc/monit.pid\fR |
|
- Lock file to help prevent concurrent runs (root mode, |
|
- systems without /var/run). |
|
.SH "SIGNALS" |
|
.IX Header "SIGNALS" |
|
If a monit daemon is running, \s-1SIGUSR1\s0 wakes it up from its sleep
|
|
|