1. Zhang Huangbin
  2. iredmail

Commits

Zhang Huangbin  committed 3ad59f4

Make Awstats work on Ubuntu 13.10, OpenLDAP backend.

  • Participants
  • Parent commits 6a538b2
  • Branches default

Comments (0)

Files changed (4)

File iRedMail/ChangeLog

View file
     * Works on openSUSE-13.1 milestone 4.
     * Works on OpenBSD 5.4, plus Awstats support.
     * Works on Ubuntu 13.10 (saucy). NOTE:
-      - phpLDAPadmin is not available because it cannot be installed at all.
+      - phpLDAPadmin is not available for OpenLDAP bacend because it cannot be
+        installed at all.
     * Merge per-domain and per-user transport_maps MySQL lookup into one file:
       - Removed: mysql/transport_maps_domain.cf, mysql/transport_maps_user.cf
       - New: mysql/transport_maps.cf
 
     * Package update:
         + iRedAPD -> 1.4.2
+        + iRedAPD -> 0.3
         + Roundcube webmail -> 0.9.5
         + phpMyAdmin -> 4.0.8
 

File iRedMail/functions/awstats.sh

View file
         [ X"${DISTRO}" == X'SUSE' -a X"${DISTRO_CODENAME}" == X'bottle' ] && \
             perl -pi -e 's/(.*)(AuthzLDAPAuthoritative.*)/${1}#${2}/g' ${AWSTATS_HTTPD_CONF}
 
+        [ X"${DISTRO}" == X'UBUNTU' -a X"${DISTRO_CODENAME}" == X'saucy' ] && \
+            perl -pi -e 's/(.*)(AuthzLDAPAuthoritative.*)/${1}#${2}/g' ${AWSTATS_HTTPD_CONF}
+
     elif [ X"${BACKEND}" == X'MYSQL' ]; then
         # Use mod_auth_mysql.
         if [ X"${DISTRO}" == X'RHEL' \
         fi
     fi
 
+    if [ X"${DISTRO_CODENAME}" == X'saucy' ]; then
+        a2enmod cgi &>/dev/null
+        a2enconf awstats &>/dev/null
+    fi
+
     # Close <Directory> container.
     cat >> ${AWSTATS_HTTPD_CONF} <<EOF
 

File iRedMail/functions/cluebringer.sh

View file
         [ X"${DISTRO}" == X'SUSE' -a X"${DISTRO_CODENAME}" == X'bottle' ] && \
             perl -pi -e 's/(.*)(AuthzLDAPAuthoritative.*)/${1}#${2}/g' ${CLUEBRINGER_HTTPD_CONF}
 
+        [ X"${DISTRO}" == X'UBUNTU' -a X"${DISTRO_CODENAME}" == X'saucy' ] && \
+            perl -pi -e 's/(.*)(AuthzLDAPAuthoritative.*)/${1}#${2}/g' ${CLUEBRINGER_HTTPD_CONF}
+
     elif [ X"${BACKEND}" == X"MYSQL" ]; then
         # Use mod_auth_mysql.
         if [ X"${DISTRO}" == X"RHEL" -o X"${DISTRO}" == X"SUSE" -o X"${DISTRO}" == X"FREEBSD" ]; then

File iRedMail/functions/openldap.sh

View file
 moduleload  back_hdb
 
 EOF
-        else
-            :
         fi
-    else
-        :
     fi
 
     cat >> ${OPENLDAP_SLAPD_CONF} <<EOF