Commits

Zhang Huangbin committed f81e063

Code cleanup.

  • Participants
  • Parent commits 23a0400

Comments (0)

Files changed (2)

iRedMail/functions/iredadmin.sh

 AddHandler cgi-script .py
 
 <Directory "${IREDADMIN_HTTPD_ROOT_SYMBOL_LINK}">
-    Options +ExecCGI +FollowSymLinks
+    Options +ExecCGI
     Order allow,deny
     Allow from all
-
-    <IfModule mod_rewrite.c>
-        RewriteEngine on
-        RewriteBase /
-        RewriteCond %{REQUEST_FILENAME} !-f
-        RewriteCond %{REQUEST_FILENAME} !-d
-        RewriteCond %{REQUEST_URI} !^/favicon.ico$
-        RewriteCond %{REQUEST_URI} !^(/.*)+iredadmin.py/
-        RewriteRule ^(.*)$ iredadmin.py/\$1 [PT]
-        RewriteRule ^/(static/.*)$ /static/\$1 [QSA,L,PT]
-    </IfModule>
 </Directory>
 EOF
     else

iRedMail/functions/packages.sh

         gentoo_add_use_flags 'net-analyzer/net-snmp' 'bzip2 ipv6 ssl tcpd zlib perl'
 
     elif [ X"${DISTRO}" == X'OPENBSD' ]; then
-        ALL_PKGS="${ALL_PKGS} rpm2cpio amavisd-new p5-ldap p5-DBD-mysql p5-DBD-Pg p5-Mail-SPF p5-Mail-SpamAssassin clamav"
+        [ X"${BACKEND}" == X'OPENLDAP' ] && ALL_PKGS="${ALL_PKGS} p5-ldap p5-DBD-mysql"
+        [ X"${BACKEND}" == X'MYSQL' ] && ALL_PKGS="${ALL_PKGS} p5-DBD-mysql"
+        [ X"${BACKEND}" == X'PGSQL' ] && ALL_PKGS="${ALL_PKGS} p5-DBD-Pg"
+
+        ALL_PKGS="${ALL_PKGS} rpm2cpio amavisd-new p5-Mail-SPF p5-Mail-SpamAssassin clamav"
         PKG_SCRIPTS="${PKG_SCRIPTS} ${CLAMAV_CLAMD_RC_SCRIPT_NAME} ${CLAMAV_FRESHCLAMD_RC_SCRIPT_NAME} ${AMAVISD_RC_SCRIPT_NAME} ${POSTFIX_RC_SCRIPT_NAME}"
     fi