1. Zhang Huangbin
  2. iredmail

Commits

Zhang Huangbin  committed ac1c8b9

Fix incorrect variable name: CLUEBRINGER_LOGFILE -> CLUEBRINGER_LOG_FILE.

  • Participants
  • Parent commits 55da5cc
  • Branches default

Comments (0)

Files changed (4)

File iRedMail/conf/awstats

View file
  • Ignore whitespace
     # This path will be changed in 'functions/awstats.sh'.
     export AWSTATS_CGI_DIR="/usr/lib/cgi-bin"
 
+    # Load awstats as last Apache config file
+    export AWSTATS_HTTPD_CONF="${HTTPD_CONF_DIR}/zawstats.conf"
+
 elif [ X"${DISTRO}" == X"FREEBSD" ]; then
     export AWSTATS_HTTPD_ROOT="${HTTPD_SERVERROOT}/awstats"
     export AWSTATS_ICON_DIR="${AWSTATS_HTTPD_ROOT}/icon"

File iRedMail/conf/cluebringer

View file
  • Ignore whitespace
     export CLUEBRINGER_PID_FILE='/var/run/cluebringer/cbpolicyd.pid'
     export CLUEBRINGER_HTTPD_ROOT='/usr/share/postfix-cluebringer-webui/webui'
 
+    export CLUEBRINGER_HTTPD_CONF="${HTTPD_CONF_DIR}/zcluebringer.conf"
+
 elif [ X"${DISTRO}" == X"FREEBSD" ]; then
     export CLUEBRINGER_USER='policyd'
     export CLUEBRINGER_GROUP='policyd'

File iRedMail/functions/awstats.sh

View file
  • Ignore whitespace
 Auth_MySQL_Info ${SQL_SERVER} ${VMAIL_DB_BIND_USER} ${VMAIL_DB_BIND_PASSWD}
 Auth_MySQL_General_DB ${VMAIL_DB}
 EOF
-            a2enconf awstats &>/dev/null
 
             # Set file permission.
             chmod 0600 ${AWSTATS_HTTPD_CONF}
 EOF
     fi
 
-    if [ X"${DISTRO}" == X'UBUNTU' ]; then
-        a2enmod cgi &>/dev/null
-        a2enconf awstats &>/dev/null
-    fi
-
     # Close <Directory> container.
     cat >> ${AWSTATS_HTTPD_CONF} <<EOF
 
     perl -pi -e 's#^(\s*</VirtualHost>)#Alias /awstatsicon "$ENV{AWSTATS_ICON_DIR}/"\n${1}#' ${HTTPD_SSL_CONF}
     perl -pi -e 's#^(\s*</VirtualHost>)#ScriptAlias /awstats "$ENV{AWSTATS_CGI_DIR}/"\n${1}#' ${HTTPD_SSL_CONF}
 
+    if [ X"${DISTRO}" == X'UBUNTU' ]; then
+        a2enmod cgi &>/dev/null
+        a2enconf awstats &>/dev/null
+    fi
+
     cat >> ${TIP_FILE} <<EOF
 Awstats:
     * Configuration files:

File iRedMail/functions/cluebringer.sh

View file
  • Ignore whitespace
     freebsd_enable_service_in_rc_conf 'policyd2_enable' 'YES'
 
     if [ X"${CLUEBRINGER_SEPARATE_LOG}" == X"YES" ]; then
-        echo -e "local1.*\t\t\t\t\t\t-${CLUEBRINGER_LOGFILE}" >> ${SYSLOG_CONF}
+        echo -e "local1.*\t\t\t\t\t\t-${CLUEBRINGER_LOG_FILE}" >> ${SYSLOG_CONF}
         cat > ${CLUEBRINGER_LOGROTATE_FILE} <<EOF
 ${CONF_MSG}
 ${AMAVISD_LOGFILE} {