Changeset 383


Ignore:
Timestamp:
Mar 22, 2010, 4:36:40 PM (11 years ago)
Author:
ben
Message:

cleaning..

Location:
bearmail
Files:
2 added
2 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • bearmail/Makefile

    r360 r383  
    2626        install -D -m 755 bin/bearmail-dspam_cleaner                        $(DESTDIR)/usr/sbin/
    2727        install -D -m 644 conf/dspam/*.conf                                 $(DESTDIR)/etc/bearmail/dspam/
    28         install -D -m 755 conf/dspam/webfrontend.pl                         $(DESTDIR)/etc/bearmail/dspam/webfrontend.conf
     28        install -D -m 644 conf/dspam/webfrontend.pl                         $(DESTDIR)/etc/bearmail/dspam/webfrontend.conf
    2929        install -D -m 644 conf/dspam/*.prefs                                $(DESTDIR)/etc/bearmail/dspam/
    3030        install -D -m 644 conf/bearmail-dspam_incoming                      $(DESTDIR)/etc/bearmail/postfix/
    31         install -D -m 744 conf/dspam/dspam_tricks/*.cgi                     $(DESTDIR)/etc/bearmail/dspam/dspam_tricks/
     31        install -D -m 755 conf/dspam/dspam_tricks/*.cgi                     $(DESTDIR)/etc/bearmail/dspam/dspam_tricks/
    3232        install -D -m 744 conf/dspam/dspam_tricks/*.pl                      $(DESTDIR)/etc/bearmail/dspam/dspam_tricks/
    3333        install -D -m 644 conf/dspam/dspam_tricks/*.html                    $(DESTDIR)/etc/bearmail/dspam/dspam_tricks/
    3434        install -D -m 644 conf/dspam/webfrontend/dspam/*.css                $(DESTDIR)/usr/share/bearmail/dspam-webfrontend/dspam/
    35         install -D -m 744 conf/dspam/webfrontend/dspam/*.cgi                $(DESTDIR)/usr/share/bearmail/dspam-webfrontend/dspam/
     35        install -D -m 755 conf/dspam/webfrontend/dspam/*.cgi                $(DESTDIR)/usr/share/bearmail/dspam-webfrontend/dspam/
    3636        install -D -m 644 conf/dspam/webfrontend/dspam/*.gif                $(DESTDIR)/usr/share/bearmail/dspam-webfrontend/dspam/
    3737        install -D -m 644 conf/dspam/webfrontend/dspam-templates/*          $(DESTDIR)/usr/share/bearmail/dspam-webfrontend/upstream-templates/
  • bearmail/bin/bearmail-switch

    r331 r383  
    5959  is_on && { echo "Bearmail is already on."; exit 0; }
    6060
    61   # check if bearmail-clamav is there and correctly configured
    62   if [ "$(grep "^## bearmail-clamav - EOC" $BMDIR/postfix/master.cf)" ] ; then
     61  # check if bearmail-antivirus is there and correctly configured
     62  if [ "$(grep "^## bearmail-antivirus - EOC" $BMDIR/postfix/master.cf)" ] ; then
    6363    if [ ! "$(grep "^LocalSocket $CVSOCK" $CVDIR/clamd.conf)" ] ; then
    6464      echo "Error: clamav is not configured to use socket at $CVSOCK"
  • bearmail/bin/bearmail-virus_notify

    r356 r383  
    1919
    2020if [ -r /etc/bearmail/bearmail.conf ]; then
    21         eval ` sed '/^#/d; /^ *$/d; s/"/\\"/g; s/ *= */="/; s/^/export /; s/$/"/' ` < \
    22         /etc/bearmail/bearmail.conf
     21#        eval ` sed '/^#/d; /^ *$/d; s/"/\\"/g; s/ *= */="/; s/^/export /; s/$/"/' ` < \
     22        . /etc/bearmail/bearmail.conf
    2323fi
    2424
     
    3131
    3232LINE="-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-"
    33 if [ ! -z "$MY_VIRUS_TIME" ] && [ "$MY_LANGUAGE" == "fr" ] ; then
     33if [ ! -z "$DAYS_TO_KEEP_VIRUSES" ] && [ "$MY_LANGUAGE" == "fr" ] ; then
    3434sendmail -i $RECIPIENTS << EOF
    3535To: $RECIPIENTS
     
    5454de vous reformuler le mail sans virus.
    5555
    56 Toutefois, durant un délais de $DAYS_TO_KEEP_VIRUSES jours à partir d'aujourd'hui,
     56Toutefois, durant un délai de $DAYS_TO_KEEP_VIRUSES jours à partir d'aujourd'hui,
    5757vous pourrez récupérer le message contaminé en envoyant un
    5858mail à $VIRUS_SENDER et en mettant pour sujet :
     
    7272
    7373## english version
    74 if [ ! -z "$MY_VIRUS_TIME" ] && [ "$MY_LANGUAGE" == "en" ] ; then
     74if [ ! -z "$DAYS_TO_KEEP_VIRUSES" ] && [ "$MY_LANGUAGE" == "en" ] ; then
    7575sendmail -i $RECIPIENTS << EOF
    7676To: $RECIPIENTS
     
    9595de vous reformuler le mail sans virus.
    9696
    97 Toutefois, durant un délais de $MY_VIRUS_TIME jours à partir d'aujourd'hui,
     97Toutefois, durant un délai de $DAYS_TO_KEEP_VIRUSES jours à partir d'aujourd'hui,
    9898vous pourrez récupérer le message contaminé en envoyant un
    9999mail à $VIRUS_SENDER et en mettant pour sujet :
  • bearmail/bin/bearmail-virus_send

    r314 r383  
    8484  Subject => "/!\\ [virus] /!\\ - $virus_subject",
    8585  'Content-Type' => "multipart/mixed; boundary=$virus_boundary",
    86   'X-Mailer' => "Bearstech quarantined viruses sender",
     86  'X-Mailer' => "Bearmail quarantined viruses sender",
    8787  );
    8888
  • bearmail/debian/bearmail-antispam.postinst

    r359 r383  
    66BMDDIR="/etc/bearmail/dspam/"
    77
    8 chown dspam:dspam /etc/bearmail/dspam -R
     8chown dspam:dspam /etc/bearmail/dspam/*{.conf,.prefs}
     9chown dspam:dspam /etc/bearmail/dspam/dspam_tricks/*{.cgi,.pl}
     10chown dspam:dspam /usr/share/bearmail/dspam-webfrontend/dspam/*.cgi
     11chmod 600 /etc/bearmail/dspam/webfrontend.conf
    912
    1013if [ "$1" = "configure" ]; then
  • bearmail/debian/bearmail.dirs

    r360 r383  
    11/usr/sbin/
    22/etc/bearmail/postfix
    3 /etc/bearmail/dovecot
     3/etc/bearmail/dovecot/bearmail-sieve
    44/usr/share/man/man8/
  • bearmail/debian/changelog

    r331 r383  
    1 bearmail (0.1-2010012003) unstable; urgency=low
     1bearmail (0.1-2010032204) unstable; urgency=low
    22
    33  * Initial Release.
  • bearmail/lib/BearMail/Backend/Files.pm

    r354 r383  
    3737# of this package.
    3838
    39 
     39my $program = "bearmail-update";
     40my $version = "0.2";
    4041my %records;
    4142my %by_domain;
Note: See TracChangeset for help on using the changeset viewer.