Zhang Huangbin avatar Zhang Huangbin committed b4dd5c0

Fixed: Incorrect log rotate setting of iRedAPD log file on FreeBSD.
Thanks openbsdnoob <w-chi _at_ gmx.de> for the report.

Comments (0)

Files changed (3)

iRedMail/ChangeLog

 iRedMail-0.8.2:
     * Allow to use attribute domainGlobalAdmin for mail user.
+    * Fixed:
+        + Incorrect log rotate setting of iRedAPD log file on FreeBSD.
+          Thanks openbsdnoob <w-chi _at_ gmx.de> for the report.
 
 iRedMail-0.8.1:
     * It now works on Debian wheezy. Tested with Debian wheezy alpha 1.
     * Add new value of enabledService: doveadm. Required by Dovecot-2.0
       service doveadm.
     * All clients are forced to use IMAPS and POPS (via STARTTLS).
-      To enable POP3/IMAPS without STARTTLS again, set 'ssl=yes' and
+      To enable POP3/IMAP without STARTTLS again, set 'ssl=yes' and
       'disable_plaintext_auth=no' in dovecot.conf.
     * Drop support for Dovecot-1.1. At least Dovecot-1.2 is required.
     * Fixed:

iRedMail/conf/iredapd

 export IREDAPD_LISTEN_ADDR='127.0.0.1'
 export IREDAPD_LISTEN_PORT='7777'
 
+export IREDAPD_PID_FILE='/var/run/iredapd.pid'
 export IREDAPD_LOG_FILE='/var/log/iredapd.log'
+export IREDAPD_RR_PID_FILE='/var/run/iredapd-rr.pid'
 export IREDAPD_RR_LOG_FILE='/var/log/iredapd-rr.log'
 export IREDAPD_LOGROTATE_FILE="${LOGROTATE_DIR}/iredapd"

iRedMail/functions/iredapd.sh

     endscript
 }
 EOF
-    elif [ X"${KERNEL_NAME}" == X'FREEBSD' -o X"${KERNEL_NAME}" == X'OPENBSD' ]; then
+    elif [ X"${KERNEL_NAME}" == X'FREEBSD' ]; then
         if ! grep 'iredapd.log' /etc/newsyslog.conf &>/dev/null; then
+            # Define path of PID file to restart iRedAPD service after rotated
+            cat >> /etc/newsyslog.conf <<EOF
+${IREDAPD_LOG_FILE}    ${SYS_ROOT_USER}:${SYS_ROOT_GROUP}   640  7     *    24    Z ${IREDAPD_PID_FILE}
+EOF
+
+    elif [ X"${KERNEL_NAME}" == X'OPENBSD' ]; then
+        if ! grep 'iredapd.log' /etc/newsyslog.conf &>/dev/null; then
+            # Define command used to restart iRedAPD service after rotated
             cat >> /etc/newsyslog.conf <<EOF
 ${IREDAPD_LOG_FILE}    ${SYS_ROOT_USER}:${SYS_ROOT_GROUP}   640  7     *    24    Z "${DIR_RC_SCRIPTS}/iredapd restart"
 EOF
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.