Zhang Huangbin avatar Zhang Huangbin committed 894fc0b

Rename Apache config files for Awstats/Cluebringer webui to 'zawstats.conf' and 'zcluebringer.conf' to avoid config override.

Comments (0)

Files changed (4)

iRedMail/conf/awstats

     # This path will be changed in 'functions/awstats.sh'.
     export AWSTATS_CGI_DIR="/usr/lib/cgi-bin"
 
+    # Prepend 'z' to let Apache load this config file after others, used to
+    # prevent setting override.
+    if [ X"${DISTRO_CODENAME}" == X'saucy' ]; then
+        export AWSTATS_HTTPD_CONF="${HTTPD_CONF_DIR}/zawstats.conf"
+    fi
 elif [ X"${DISTRO}" == X"FREEBSD" ]; then
     export AWSTATS_HTTPD_ROOT="${HTTPD_SERVERROOT}/awstats"
     export AWSTATS_ICON_DIR="${AWSTATS_HTTPD_ROOT}/icon"

iRedMail/conf/cluebringer

     export CLUEBRINGER_PID_FILE='/var/run/cluebringer/cbpolicyd.pid'
     export CLUEBRINGER_HTTPD_ROOT='/usr/share/postfix-cluebringer-webui/webui'
 
+    # Prepend 'z' to let Apache load this config file after others, used to
+    # prevent setting override.
+    if [ X"${DISTRO_CODENAME}" == X'saucy' ]; then
+        export CLUEBRINGER_HTTPD_CONF="${HTTPD_CONF_DIR}/zcluebringer.conf"
+    fi
 elif [ X"${DISTRO}" == X"FREEBSD" ]; then
     export CLUEBRINGER_USER='policyd'
     export CLUEBRINGER_GROUP='policyd'

iRedMail/functions/awstats.sh

 
     if [ X"${DISTRO_CODENAME}" == X'saucy' ]; then
         a2enmod cgi &>/dev/null
-        a2enconf awstats &>/dev/null
+        a2enconf zawstats &>/dev/null
     fi
 
     # Close <Directory> container.

iRedMail/functions/cluebringer.sh

     AuthDBDUserPWQuery "SELECT password FROM mailbox WHERE username=%s AND isglobaladmin=1"
 EOF
 
-                a2enconf cluebringer &>/dev/null
+                a2enconf zcluebringer &>/dev/null
                 a2enmod authn_dbd &>/dev/null
             fi
 
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.