Changeset 477


Ignore:
Timestamp:
Apr 22, 2010, 4:49:20 PM (10 years ago)
Author:
zerodeux
Message:

Release 0.3.1: gave up bearmail- prefix on config files (which are already in /etc/bearmail/)

Location:
bearmail
Files:
9 edited
3 moved

Legend:

Unmodified
Added
Removed
  • bearmail/Makefile

    r464 r477  
    2626        install -D -m 644 conf/dspam/*.conf                                 $(DESTDIR)/etc/bearmail/dspam/
    2727        install -D -m 644 conf/dspam/*.prefs                                $(DESTDIR)/etc/bearmail/dspam/
    28         install -D -m 644 conf/bearmail-dspam_incoming                      $(DESTDIR)/etc/bearmail/postfix/
     28        install -D -m 644 conf/dspam_incoming                               $(DESTDIR)/etc/bearmail/postfix/
    2929        install -D -m 644 doc/man/bearmail-dspam_cleaner.8                  $(DESTDIR)/usr/share/man/man8/
    3030install-web:
  • bearmail/bin/bearmail-sieve_forwarder

    r329 r477  
    2424
    2525NAME=${0##*/}
    26 SIEVE_DIR="/etc/bearmail/dovecot/bearmail-sieve"
     26SIEVE_DIR="/etc/bearmail/dovecot/sieve"
    2727BMMAILMAP="/etc/bearmail/mailmap"
    2828BMSUC="/usr/sbin/bearmail-sieve_userconf"
  • bearmail/bin/bearmail-sieve_responder

    r329 r477  
    2525
    2626NAME=${0##*/}
    27 SIEVE_DIR="/etc/bearmail/dovecot/bearmail-sieve"
     27SIEVE_DIR="/etc/bearmail/dovecot/sieve"
    2828BMMAILMAP="/etc/bearmail/mailmap"
    2929BMSUC="/usr/sbin/bearmail-sieve_userconf"
  • bearmail/bin/bearmail-sieve_userconf

    r329 r477  
    2222
    2323NAME=${0##*/}
    24 SIEVE_DIR="/etc/bearmail/dovecot/bearmail-sieve"
     24SIEVE_DIR="/etc/bearmail/dovecot/sieve"
    2525BMMAILMAP="/etc/bearmail/mailmap"
    2626BMDIR="/var/spool/bearmail"
  • bearmail/debian/bearmail-antispam.postinst

    r454 r477  
    6060    sed -e '\!^# RCPT TO access restrictions - EOC$!i\
    6161  check_policy_service inet:127.0.0.1:60000\
    62   check_recipient_access pcre:/etc/postfix/bearmail-dspam_incoming
     62  check_recipient_access pcre:/etc/postfix/dspam_incoming
    6363' -i $BMPMAI
    6464    sed '/./,/^$/!d' -i $BMPMAI
  • bearmail/debian/bearmail-antivirus.prerm

    r454 r477  
    44BMPMAS="/etc/bearmail/postfix/master.cf"
    55BMPMAI="/etc/bearmail/postfix/main.cf"
    6 BMPTRA="/etc/bearmail/postfix/bearmail-transport"
     6BMPTRA="/etc/bearmail/postfix/transport"
    77
    88set -e
  • bearmail/debian/bearmail.postinst

    r454 r477  
    2929
    3030    # set global conf file for sieve
    31     touch /etc/bearmail/dovecot/bearmail-sieve/global.conf
    32     chown -R bearmail:bearmail /etc/bearmail/dovecot/bearmail-sieve
     31    touch /etc/bearmail/dovecot/sieve/global.conf
     32    chown -R bearmail:bearmail /etc/bearmail/dovecot/sieve
    3333
    3434    # set hostname in conf files
     
    7575
    7676#    echo "$HOSTNAME" > /etc/mailname
    77     echo "$HOSTNAME REJECT You are not me!" >> /etc/bearmail/postfix/bearmail-helo_access
     77    echo "$HOSTNAME REJECT You are not me!" >> /etc/bearmail/postfix/helo_access
    7878  fi
    7979fi
  • bearmail/debian/changelog

    r464 r477  
     1bearmail (0.3.1) unstable; urgency=low
     2
     3  * Gave up with the 'bearmail-' prefix for config files, they
     4    are already in /etc/bearmail/ folder.  Untested patch.
     5
     6 -- Vincent CARON <vcaron@bearstech.com>  Thu, 22 Apr 2010 16:47:10 +0200
     7
    18bearmail (0.3) unstable; urgency=low
    29
  • bearmail/lib/BearMail/Backend/Files.pm

    r453 r477  
    317317
    318318# Postfix conf files, expected settings in main.cf:
    319 #   virtual_mailbox_domains   = hash:/etc/bearmail/postfix/bearmail-virtual_domains
    320 #   virtual_mailbox_mailboxes = hash:/etc/bearmail/postfix/bearmail-virtual_mailboxes
    321 #   virtual_alias_maps        = hash:/etc/bearmail/postfix/bearmail-virtual_aliases
     319#   virtual_mailbox_domains   = hash:/etc/bearmail/postfix/virtual_domains
     320#   virtual_mailbox_mailboxes = hash:/etc/bearmail/postfix/virtual_mailboxes
     321#   virtual_alias_maps        = hash:/etc/bearmail/postfix/virtual_aliases
    322322#   alias_maps                = hash:/etc/aliases,
    323 #                               hash:/etc/bearmail/postfix/bearmail-virtual_pipes
     323#                               hash:/etc/bearmail/postfix/virtual_pipes
    324324sub _prepare_postfix_conf {
    325325  my $virtual_domains   = join("\n", map { "$_ dummy" } @domains);
     
    355355  }
    356356
    357   $files{'/etc/bearmail/postfix/bearmail-virtual_domains'}   = $virtual_domains;
    358   $files{'/etc/bearmail/postfix/bearmail-virtual_mailboxes'} = $virtual_mailboxes;
    359   $files{'/etc/bearmail/postfix/bearmail-virtual_aliases'}   = $virtual_aliases;
    360   $files{'/etc/bearmail/postfix/bearmail-virtual_pipes'}     = $virtual_pipes;
     357  $files{'/etc/bearmail/postfix/virtual_domains'}   = $virtual_domains;
     358  $files{'/etc/bearmail/postfix/virtual_mailboxes'} = $virtual_mailboxes;
     359  $files{'/etc/bearmail/postfix/virtual_aliases'}   = $virtual_aliases;
     360  $files{'/etc/bearmail/postfix/virtual_pipes'}     = $virtual_pipes;
    361361}
    362362
     
    383383    }
    384384  }
    385   $files{"/etc/bearmail/dovecot/bearmail-passwd"} = $passwd;
     385  $files{"/etc/bearmail/dovecot/passwd"} = $passwd;
    386386}
    387387
Note: See TracChangeset for help on using the changeset viewer.