Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Changeset 867

Show
Ignore:
Timestamp:
10/16/07 21:25:07 (11 months ago)
Author:
rats
Message:

Deleted: Old SASL vaiables and use of them
small fixes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/CHANGELOG

    r865 r867  
    1212                * Fixed #781: htdocs folder is empty (on new installed domain) 
    1313                * Fixed #779: Makefile Error 
     14                * Deleted: Old SASL vaiables and use of them 
    1415 
    15162007-10-16 Malte Geierhos 

  • trunk/configs/apache/parts/dmn_awstats_static_entry.tpl

    r864 r867  
    1     Alias /stats    {WWW_DIR}/{DMN_NAME}/statistics/ 
     1    Alias /stats    {WWW_DIR}/{DMN_NAME}/statistics/ 
    22 
    33    <Directory "{WWW_DIR}/{DMN_NAME}/statistics"> 

  • trunk/configs/ispcp.conf

    r850 r867  
    229229MTA_MAILBOX_GID_NAME = mail 
    230230 
    231 MTA_SASLDB_LOCAL_DOMAIN = isp-control.net 
    232  
    233231MTA_SASLDB_FILE = /var/spool/postfix/etc/sasldb2 
    234232 

  • trunk/engine/BSDmakefile

    r849 r867  
    5757        $(CMD_INSTALL) ./setup/ispcp-uninstall $(SYSTEM_ENGINE_ROOT)/setup 
    5858        $(CMD_INSTALL) ./setup/vhcs2ispcp.pl $(SYSTEM_ENGINE_ROOT)/setup 
    59         $(CMD_INSTALL) ./setup/vhcs2ispcp.sql $(SYSTEM_ENGINE_ROOT)/setup 
    60         $(CMD_INSTALL) ./setup/vhcs2-remover.pl $(SYSTEM_ENGINE_ROOT)/setup 
    61        $(CMD_INSTALL) ./setup/copy-errordocs.sh $(SYSTEM_ENGINE_ROOT)/setup 
     59        $(CMD_INSTALL) ./setup/vhcs2.4.7-ispcp.sql $(SYSTEM_ENGINE_ROOT)/setup 
     60       $(CMD_INSTALL) ./setup/vhcs2.4.8-ispcp.sql $(SYSTEM_ENGINE_ROOT)/setup 
     61    $(CMD_INSTALL) ./setup/vhcs2-remover.pl $(SYSTEM_ENGINE_ROOT)/setup 
    6262        $(CMD_INSTALL) ./tools/ispcp-httpd-logs-mngr $(SYSTEM_ENGINE_ROOT)/tools/ispcp-httpd-logs-mngr 
    6363        $(CMD_INSTALL) ./tools/ispcpphptemp.sh $(SYSTEM_ENGINE_ROOT)/tools/ispcpphptemp.sh 
    64          
     64 
    6565uninstall: 
    6666        $(CMD_RM) $(SYSTEM_ENGINE_ROOT) 

  • trunk/engine/Makefile

    r866 r867  
    7979        $(CMD_INSTALL) ./setup/vhcs2ispcp.pl $(SYSTEM_ENGINE_ROOT)/setup 
    8080        $(CMD_INSTALL) ./setup/vhcs2-remover.pl $(SYSTEM_ENGINE_ROOT)/setup 
    81         $(CMD_INSTALL) ./setup/copy-errordocs.sh $(SYSTEM_ENGINE_ROOT)/setup 
    8281 
    8382        $(CMD_INSTALL) ./tools/ispcp-httpd-logs-mngr $(SYSTEM_ENGINE_ROOT)/tools/ispcp-httpd-logs-mngr 

  • trunk/engine/ispcp-mbox-mngr

    r819 r867  
    27842784    my $dmn_name = $main::domain_id_name{$mail_dmn_id}; 
    27852785 
    2786     my $mta_sasldb_local_domain = $main::cfg{'MTA_SASLDB_LOCAL_DOMAIN'}; 
    2787  
    27882786    my $mta_sasldb_file = $main::cfg{'MTA_SASLDB_FILE'}; 
    27892787 
    …… 
    28092807 
    28102808    do { 
    2811  
    2812  
    2813         # Old SASL mamangment; 
    2814  
    2815         #$check_user = "$mail_acc:$dmn_name"; 
    2816  
    2817         #$cmd_del_user = "$cmd_sasldb_passwd2 -d -f $etc_sasldb_file -u $mta_sasldb_local_domain $mail_acc:$dmn_name"; 
    2818  
    2819         #$cmd_add_user = "$cmd_echo \"$mail_pass\" | $cmd_sasldb_passwd2 -p -c -f $etc_sasldb_file -u $mta_sasldb_local_domain $mail_acc:$dmn_name"; 
    2820  
    28212809 
    28222810        $check_user = "$mail_acc\@$dmn_name"; 
    …… 
    28402828    do { 
    28412829 
    2842  
    2843         # Old SASL mamangment; 
    2844  
    2845         #$check_user = "$mail_acc:$dmn_name"; 
    2846  
    2847         #$cmd_del_user = "$cmd_sasldb_passwd2 -d -f $etc_sasldb_file -u $mta_sasldb_local_domain $mail_acc:$dmn_name"; 
    2848  
    2849         #$cmd_add_user = "$cmd_echo \"$mail_pass\" | $cmd_sasldb_passwd2 -p -c -f $etc_sasldb_file -u $mta_sasldb_local_domain $mail_acc:$dmn_name"; 
    2850  
    28512830        $dmn_name = $main::als_id_name{$mail_sub_id}; 
    28522831 
    …… 
    28772856        my $sub_name = "$sub_pref.$dmn_name"; 
    28782857 
    2879  
    2880         # Old SASL managment; 
    2881  
    2882         #$check_user = "$mail_acc:$sub_name"; 
    2883  
    2884         #$cmd_del_user = "$cmd_sasldb_passwd2 -d -f $etc_sasldb_file -u $mta_sasldb_local_domain $mail_acc:$sub_name"; 
    2885  
    2886         #$cmd_add_user = "$cmd_echo \"$mail_pass\" | $cmd_sasldb_passwd2 -p -c -f $etc_sasldb_file -u $mta_sasldb_local_domain $mail_acc:$sub_name"; 
    2887  
    2888  
    28892858        $check_user = "$mail_acc\@$sub_name"; 
    28902859 
    …… 
    29882957    my $dmn_name = $main::domain_id_name{$mail_dmn_id}; 
    29892958 
    2990     my $mta_sasldb_local_domain = $main::cfg{'MTA_SASLDB_LOCAL_DOMAIN'}; 
    2991  
    29922959    my $mta_sasldb_file = $main::cfg{'MTA_SASLDB_FILE'}; 
    29932960 
    …… 
    30132980 
    30142981    do { 
    3015  
    3016  
    3017         # Old SASL managment; 
    3018  
    3019         #$check_user = "$mail_acc:$dmn_name"; 
    3020  
    3021         #$cmd_del_user = "$cmd_sasldb_passwd2 -d -f $etc_sasldb_file -u $mta_sasldb_local_domain $mail_acc:$dmn_name"; 
    3022  
    3023         #$cmd_add_user = "$cmd_echo \"$mail_pass\" | $cmd_sasldb_passwd2 -p -c -f $etc_sasldb_file -u $mta_sasldb_local_domain $mail_acc:$dmn_name"; 
    3024  
    30252982 
    30262983        $check_user = "$mail_acc\@$dmn_name"; 
    …… 
    30433000    do { 
    30443001 
    3045  
    3046         # Old SASL managment; 
    3047  
    3048         #$check_user = "$mail_acc:$dmn_name"; 
    3049  
    3050         #$cmd_del_user = "$cmd_sasldb_passwd2 -d -f $etc_sasldb_file -u $mta_sasldb_local_domain $mail_acc:$dmn_name"; 
    3051  
    3052         #$cmd_add_user = "$cmd_echo \"$mail_pass\" | $cmd_sasldb_passwd2 -p -c -f $etc_sasldb_file -u $mta_sasldb_local_domain $mail_acc:$dmn_name"; 
    3053  
    30543002        $dmn_name = $main::als_id_name{$mail_sub_id}; 
    30553003 
    …… 
    30803028        my $sub_name = "$sub_pref.$dmn_name"; 
    30813029 
    3082         # Old SASL mangment; 
    3083  
    3084         #$check_user = "$mail_acc:$sub_name"; 
    3085  
    3086         #$cmd_del_user = "$cmd_sasldb_passwd2 -d -f $etc_sasldb_file -u $mta_sasldb_local_domain $mail_acc:$sub_name"; 
    3087  
    3088         #$cmd_add_user = "$cmd_echo \"$mail_pass\" | $cmd_sasldb_passwd2 -p -c -f $etc_sasldb_file -u $mta_sasldb_local_domain $mail_acc:$sub_name"; 
    3089  
    3090  
    30913030        $check_user = "$mail_acc\@$sub_name"; 
    30923031