Zhang Huangbin avatar Zhang Huangbin committed 845674b

Code cleanup.

Comments (0)

Files changed (3)

iRedMail/functions/roundcubemail.sh

     cd ${RCM_HTTPD_ROOT}/config/
     cp -f db.inc.php.dist db.inc.php
     cp -f main.inc.php.dist main.inc.php
-    cp -f ${SAMPLE_DIR}/dovecot.sieve ${RCM_SIEVE_SAMPLE_FILE}
+    cp -f ${SAMPLE_DIR}/dovecot.sieve.roundcube ${RCM_SIEVE_SAMPLE_FILE}
     chown ${HTTPD_USER}:${HTTPD_GROUP} db.inc.php main.inc.php ${RCM_SIEVE_SAMPLE_FILE}
     chmod 0640 db.inc.php main.inc.php ${RCM_SIEVE_SAMPLE_FILE}
 

iRedMail/samples/dovecot.sieve

-#---------------------------------------------------------------------
-# This file is part of iRedMail, which is an open source mail server
-# solution for Red Hat(R) Enterprise Linux, CentOS, Debian and Ubuntu.
-#
-# iRedMail is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# iRedMail is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with iRedMail.  If not, see <http://www.gnu.org/licenses/>.
-#---------------------------------------------------------------------
-
-#
-# Sample dovecot sieve global rules. It should be localted at:
-#   /var/vmail/sieve/dovecot.sieve
-#
-# Refer to 'sieve_global_path' parameter for the file localtion
-# in dovecot.conf on your server.
-#
-
-# For more information, please refer to official documentation:
-# http://wiki.dovecot.org/LDA/Sieve
-
-require ["fileinto", "vacation"];
-
-# -------------------------------------------------
-# --------------- Global sieve rules --------------
-# -------------------------------------------------
-
-# Sample rule of vacation message, disabled by default.
-# rule:[Vacation]
-if false # true
-{
-    vacation :days 1 "I'm on vacation.";
-}
+require ["fileinto"];
 
 # rule:[Move Spam to Junk Folder]
-if false # header :is "X-Spam-Flag" "YES"
+if header :is "X-Spam-Flag" "YES"
 {
     fileinto "Junk";
     stop;

iRedMail/samples/dovecot.sieve.roundcube

+require ["fileinto", "vacation"];
+
+# Sample rule of vacation message, disabled by default.
+# rule:[Vacation]
+if false # true
+{
+    vacation :days 1 "I'm on vacation.";
+}
+
+# rule:[Move Spam to Junk Folder]
+if false # header :is "X-Spam-Flag" "YES"
+{
+    fileinto "Junk";
+    stop;
+}
+
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.