Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Changeset 401

Show
Ignore:
Timestamp:
03/07/07 01:13:59 (1 year ago)
Author:
rats
Message:

- CONFIGS:

  • RedHat?: Added support for RedHat? (seeking for maintainer)
  • Ubuntu: Added support for Ubuntu
  • updated postfix master file
  • updated Makefiles
  • added greylisting via postgrey for Debian and Ubuntu
  • DOCS:
  • RedHat?: Added support for RedHat? (seeking for maintainer)
  • changed some strings
    • Gentoo: Added INSTALL file
    • Ubuntu: Added support for Ubuntu
    • updated INSTALL files
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/CHANGELOG

    r400 r401  
    1515        - CONFIGS: 
    1616                * RedHat: Added support for RedHat (seeking for maintainer) 
     17                * Ubuntu: Added support for Ubuntu 
     18                * updated postfix master file 
     19                * updated Makefiles 
     20                * added greylisting via postgrey for Debian and Ubuntu 
    1721        - DOCS: 
    1822                * RedHat: Added support for RedHat (seeking for maintainer) 
    1923                * changed some strings 
     24                * Gentoo: Added INSTALL file 
     25                * Ubuntu: Added support for Ubuntu 
     26                * updated INSTALL files 
    2027 
    21282007-03-05 Benedikt Heintel 

  • trunk/configs/Makefile

    r370 r401  
    2222        elif [[ $(HOST_OS) == gentoo ]] ; then \ 
    2323                cd ./dists/gentoo && $(MAKE) install ; \ 
     24        elif [[ $(HOST_OS) == redhat ]] ; then \ 
     25                cd ./dists/redhat && $(MAKE) install ; \ 
    2426        elif [[ $(HOST_OS) == sles9 ]] ; then \ 
    2527                cd ./dists/sles9 && $(MAKE) install ; \ 
    …… 
    2830        elif [[ $(HOST_OS) == suse93 ]] ; then \ 
    2931                cd ./dists/suse93 && $(MAKE) install ; \ 
     32        elif [[ $(HOST_OS) == ubuntu ]] ; then \ 
     33                cd ./dists/ubuntu && $(MAKE) install ; \ 
    3034        fi 
    3135 
    …… 
    4953        elif [[ $(HOST_OS) == gentoo ]] ; then \ 
    5054                cd ./dists/gentoo && $(MAKE) uninstall ; \ 
     55        elif [[ $(HOST_OS) == redhat ]] ; then \ 
     56                cd ./dists/redhat && $(MAKE) uninstall ; \ 
    5157        elif [[ $(HOST_OS) == sles9 ]] ; then \ 
    5258                cd ./dists/sles9 && $(MAKE) uninstall ; \ 
    …… 
    5561        elif [[ $(HOST_OS) == suse100 ]] ; then \ 
    5662                cd ./dists/suse100 && $(MAKE) uninstall ; \ 
     63        elif [[ $(HOST_OS) == ubuntu ]] ; then \ 
     64                cd ./dists/ubuntu && $(MAKE) uninstall ; \ 
    5765        fi 
    5866 

  • trunk/configs/dists/fedora/Makefile

    r284 r401  
    11 
    2 export  
     2export 
    33 
    44install: 
    …… 
    77                cp ./vhcs2.conf $(SYSTEM_CONF) ; \ 
    88                cd ./apache && $(MAKE) install ; cd .. ; \ 
     9                cd ./awstats && $(MAKE) install ; cd .. ; \ 
    910                cd ./bind && $(MAKE) install ; cd .. ; \ 
    1011                cd ./crontab && $(MAKE) install ; cd .. ; \ 
    …… 
    1819                cd ./logrotate && $(MAKE) install ; cd .. ; \ 
    1920        fi 
    20     
     21 
    2122uninstall: 
    2223 
    …… 
    2425                rm -rf $(SYSTEM_CONF)/vhcs2.conf ;  \ 
    2526                cd ./apache && $(MAKE) uninstall ; cd .. ; \ 
     27                cd ./awstats && $(MAKE) uninstall ; cd .. ; \ 
    2628                cd ./bind && $(MAKE) uninstall ; cd .. ; \ 
    2729                cd ./crontab && $(MAKE) uninstall ; cd .. ; \ 

  • trunk/configs/dists/fedora/apache/parts/als_entry.tpl

    r284 r401  
    4141            Allow from all 
    4242        </Directory> 
    43  
    44         ScriptAlias /php5/ {STARTER_DIR}/{DMN_NAME}/ 
    45         <Directory "{STARTER_DIR}/{DMN_NAME}"> 
    46             AllowOverride None 
    47             Options +ExecCGI -MultiViews -Indexes 
    48             Order allow,deny 
    49             Allow from all 
    50         </Directory> 
    5143    </IfModule> 
    5244 
    …… 
    5446        <Directory {GUI_ROOT_DIR}> 
    5547            php_admin_value open_basedir "{GUI_ROOT_DIR}/:/etc/vhcs2/:/proc/:{WWW_DIR}/:/tmp/:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" 
    56             php_admin_value session.save_path "/tmp/" 
     48            php_admin_value session.save_path "{GUI_ROOT_DIR}/phptmp/" 
    5749        </Directory> 
    5850    </IfModule> 

  • trunk/configs/dists/fedora/apache/parts/als_php2_entry.tpl

    r327 r401  
    33        php_admin_value upload_tmp_dir "{WWW_DIR}/{DMN_NAME}{MOUNT_POINT}/phptmp" 
    44        php_admin_value session.save_path "{WWW_DIR}/{DMN_NAME}{MOUNT_POINT}/phptmp" 
    5         php_admin_value sendmail_path '/usr/sbin/sendmail -f{SUEXEC_USER} -t -i' 
     5        php_admin_value sendmail_path '/usr/sbin/sendmail -f {SUEXEC_USER} -t -i' 
    66    </IfModule> 

  • trunk/configs/dists/fedora/apache/parts/dmn_entry.tpl

    r327 r401  
    4040            Allow from all 
    4141        </Directory> 
    42  
    43         ScriptAlias /php5/ {STARTER_DIR}/{DMN_NAME}/ 
    44         <Directory "{STARTER_DIR}/{DMN_NAME}"> 
    45             AllowOverride None 
    46             Options +ExecCGI -MultiViews -Indexes 
    47             Order allow,deny 
    48             Allow from all 
    49         </Directory> 
    5042    </IfModule> 
    5143 
    …… 
    5345        <Directory {GUI_ROOT_DIR}> 
    5446            php_admin_value open_basedir "{GUI_ROOT_DIR}/:/etc/vhcs2/:/proc/:{WWW_DIR}/:/tmp/:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" 
    55             php_admin_value session.save_path "/tmp/" 
     47            php_admin_value session.save_path "{GUI_ROOT_DIR}/phptmp/" 
    5648        </Directory> 
    5749    </IfModule> 

  • trunk/configs/dists/fedora/apache/parts/dmn_php2_entry.tpl

    r327 r401  
    33        php_admin_value upload_tmp_dir "{WWW_DIR}/{DMN_NAME}/phptmp" 
    44        php_admin_value session.save_path "{WWW_DIR}/{DMN_NAME}/phptmp" 
    5         php_admin_value sendmail_path '/usr/sbin/sendmail -f{SUEXEC_USER} -t -i' 
     5        php_admin_value sendmail_path '/usr/sbin/sendmail -f {SUEXEC_USER} -t -i' 
    66    </IfModule> 

  • trunk/configs/dists/fedora/apache/parts/sub_entry.tpl

    r327 r401  
    4444            Allow from all 
    4545        </Directory> 
    46  
    47         ScriptAlias /php5/ {STARTER_DIR}/{DMN_NAME}/ 
    48         <Directory "{STARTER_DIR}/{DMN_NAME}"> 
    49             AllowOverride None 
    50             Options +ExecCGI -MultiViews -Indexes 
    51             Order allow,deny 
    52             Allow from all 
    53         </Directory> 
    5446    </IfModule> 
    5547 
    …… 
    5749        <Directory {GUI_ROOT_DIR}> 
    5850            php_admin_value open_basedir "{GUI_ROOT_DIR}/:/etc/vhcs2/:/proc/:{WWW_DIR}/:/tmp/:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" 
    59             php_admin_value session.save_path "/tmp/" 
     51            php_admin_value session.save_path "{GUI_ROOT_DIR}/phptmp/" 
    6052        </Directory> 
    6153    </IfModule> 

  • trunk/configs/dists/fedora/apache/parts/sub_php2_entry.tpl

    r327 r401  
    33        php_admin_value upload_tmp_dir "{WWW_DIR}/{SUB_NAME_PHP2}/phptmp" 
    44        php_admin_value session.save_path "{WWW_DIR}/{SUB_NAME_PHP2}/phptmp" 
    5         php_admin_value sendmail_path '/usr/sbin/sendmail -f{SUEXEC_USER} -t -i' 
     5        php_admin_value sendmail_path '/usr/sbin/sendmail -f {SUEXEC_USER} -t -i' 
    66    </IfModule> 

  • trunk/configs/dists/fedora/apache/parts/vhcs2_base.tpl

    r327 r401  
    5050    DocumentRoot /srv/www/vhcs2/gui 
    5151 
     52    <IfModule mod_fastcgi.c> 
     53        SuexecUserGroup vu2000 vu2000 
     54    </IfModule> 
     55 
    5256    <Directory /srv/www/vhcs2/gui> 
    5357        Options Indexes Includes FollowSymLinks MultiViews 
    …… 
    5761    </Directory> 
    5862 
     63    <IfModule mod_fastcgi.c> 
     64    ScriptAlias /php4/ /srv/www/fcgi/master/ 
     65        <Directory "/srv/www/fcgi/master"> 
     66            AllowOverride None 
     67            Options +ExecCGI MultiViews Indexes 
     68            Order allow,deny 
     69            Allow from all 
     70        </Directory> 
     71    </IfModule> 
     72 
    5973</VirtualHost> 
    6074 
    6175# 
    62 # AWStats-Alias 
     76# AWStats 
    6377# 
    6478 

  • trunk/configs/dists/fedora/apache/working/vhcs2.conf

    r327 r401  
    2121# 
    2222 
    23 Alias /vhcs2 /var/www/vhcs2/gui 
    24 <Directory /var/www/vhcs2/gui> 
     23Alias /vhcs2 /srv/www/vhcs2/gui 
     24<Directory /srv/www/vhcs2/gui> 
    2525    AllowOverride none 
    2626    Options MultiViews IncludesNoExec FollowSymLinks 
    …… 
    2929</Directory> 
    3030 
    31 <Directory /var/www/vhcs2/gui/tools/filemanager> 
     31<Directory /srv/www/vhcs2/gui/tools/filemanager> 
    3232    <IfModule mod_php4.c> 
    3333        php_flag register_globals On 
    …… 
    3636</Directory> 
    3737 
    38 Alias /vhcs_images /var/www/vhcs2/gui/images 
    39 <Directory /var/www/vhcs2/gui/images> 
    40     AllowOverride none  
     38Alias /vhcs_images /srv/www/vhcs2/gui/images 
     39<Directory /srv/www/vhcs2/gui/images> 
     40    AllowOverride none 
    4141    Options MultiViews IncludesNoExec FollowSymLinks 
    4242</Directory> 
    …… 
    4646# 
    4747 
    48 <VirtualHost _default_:*>  
     48<VirtualHost _default_:*> 
    4949 
    50     SuexecUserGroup vu2000 vu2000 
     50    DocumentRoot /srv/www/vhcs2/gui 
    5151 
    5252    <IfModule mod_fastcgi.c> 
    53         ScriptAlias /php4-fcgi-starter/ /srv/www/fcgi/master/ 
    54         <Directory "/srv/www/fcgi/master"> 
    55             AllowOverride None 
    56             Options +ExecCGI -MultiViews -Indexes 
    57             Order allow,deny 
    58             Allow from all 
    59         </Directory> 
     53        SuexecUserGroup vu2000 vu2000 
    6054    </IfModule> 
    6155 
    62     DocumentRoot /var/www/vhcs2/gui 
    63  
    64     <Directory /var/www/vhcs2/gui> 
     56    <Directory /srv/www/vhcs2/gui> 
    6557        Options Indexes Includes FollowSymLinks MultiViews 
    6658        AllowOverride None 
    …… 
    6860        Allow from all 
    6961    </Directory> 
     62 
     63    <IfModule mod_fastcgi.c> 
     64        ScriptAlias /php4/ /srv/www/fcgi/master/ 
     65        <Directory "/srv/www/fcgi/master"> 
     66            AllowOverride None 
     67            Options +ExecCGI MultiViews Indexes 
     68            Order allow,deny 
     69            Allow from all 
     70        </Directory> 
     71    </IfModule> 
    7072 
    7173</VirtualHost> 

  • trunk/configs/dists/fedora/fcgi/parts/master/php4-fcgi-starter.tpl

    r350 r401  
    99export PHP_FCGI_MAX_REQUESTS 
    1010 
    11 exec /usr/bin/php-cgi 
     11exec /usr/bin/php4-cgi 

  • trunk/configs/dists/fedora/fcgi/parts/master/php4/php.ini

    r350 r401  
    207207; It receives a comma-delimited list of function names. This directive is 
    208208; *NOT* affected by whether Safe Mode is turned On or Off. 
    209 disable_functions = show_source, system, shell_exec, passthru, exec, phpinfo, proc_open, shell, symlink 
     209disable_functions = show_source, system, shell_exec, passthru, exec, phpinfo, shell, symlink 
    210210 
    211211; This directive allows you to disable certain classes for security reasons. 

  • trunk/configs/dists/fedora/fcgi/parts/master/php5/php.ini

    r350 r401  
    156156; It receives a comma-delimited list of function names. This directive is 
    157157; *NOT* affected by whether Safe Mode is turned On or Off. 
    158 disable_functions = show_source, system, shell_exec, passthru, exec, phpinfo, proc_open, shell, symlink 
     158disable_functions = show_source, system, shell_exec, passthru, exec, phpinfo, shell, symlink 
    159159 
    160160; This directive allows you to disable certain classes for security reasons. 

  • trunk/configs/dists/fedora/fcgi/parts/php4-fcgi-starter.tpl

    r327 r401  
    11#!/bin/sh 
    22 
    3 PHPRC="{PHP_STARTER_DIR}/{DMN_NAME}/" 
     3PHPRC="{PHP_STARTER_DIR}/{DMN_NAME}/php4/" 
    44 
    55export PHPRC 

  • trunk/configs/dists/fedora/fcgi/parts/php4/php.ini

    r350 r401  
    209209; It receives a comma-delimited list of function names. This directive is 
    210210; *NOT* affected by whether Safe Mode is turned On or Off. 
    211 disable_functions = show_source, system, shell_exec, passthru, exec, phpinfo, popen, proc_open, shell, symlink 
     211disable_functions = show_source, system, shell_exec, passthru, exec, phpinfo, shell, symlink 
    212212 
    213213; This directive allows you to disable certain classes for security reasons. 

  • trunk/configs/dists/fedora/fcgi/parts/php5-fcgi-starter.tpl

    r327 r401  
    11#!/bin/sh 
    22 
    3 PHPRC="{PHP_STARTER_DIR}/{DMN_NAME}/" 
     3PHPRC="{PHP_STARTER_DIR}/{DMN_NAME}/php5/" 
    44 
    55export PHPRC 

  • trunk/configs/dists/fedora/fcgi/parts/php5/php.ini

    r350 r401  
    156156; It receives a comma-delimited list of function names. This directive is 
    157157; *NOT* affected by whether Safe Mode is turned On or Off. 
    158 disable_functions = show_source, system, shell_exec, passthru, exec, phpinfo, popen, proc_open, shell, symlink 
     158disable_functions = show_source, system, shell_exec, passthru, exec, phpinfo, shell, symlink 
    159159 
    160160; This directive allows you to disable certain classes for security reasons. 

  • trunk/configs/dists/fedora/postfix/main.cf

    r284 r401  
    1818# 
    1919 
    20 inet_interfaces = all 
     20inet_interfaces = all 
    2121mynetworks_style = host 
    2222 
    2323myhostname = {MTA_HOSTNAME} 
    24 mydomain = {MTA_LOCAL_DOMAIN} 
    25 myorigin = $mydomain 
     24mydomain   = {MTA_LOCAL_DOMAIN} 
     25myorigin   = $mydomain 
    2626 
    2727smtpd_banner = $myhostname VHCS2 {MTA_VERSION} Managed ESMTP {MTA_HOST_TYPE} 
    …… 
    3232# 
    3333 
    34 mydestination = $myhostname, $mydomain  
     34mydestination       = $myhostname, $mydomain 
    3535append_dot_mydomain = no 
    36 append_at_myorigin = yes 
    37 local_transport = local 
    38 virtual_transport = virtual 
    39 transport_maps = hash:{MTA_TRANSPORT_HASH} 
     36append_at_myorigin = yes 
     37local_transport     = local 
     38virtual_transport   = virtual 
     39transport_maps      = hash:{MTA_TRANSPORT_HASH} 
    4040 
    4141# 
    …… 
    4444 
    4545mail_spool_directory = {MTA_LOCAL_MAIL_DIR} 
     46 
    4647# Mailboxquota 
    4748# => 0 for unlimited 
    4849# => 104857600 for 100 MB 
    4950mailbox_size_limit = 0 
    50 mailbox_command = procmail -a "$EXTENSION" 
     51mailbox_command    = procmail -a "$EXTENSION" 
    5152 
    5253biff = no 
    5354 
    54 alias_database = hash:{MTA_LOCAL_ALIAS_HASH} 
     55alias_database                    = hash:{MTA_LOCAL_ALIAS_HASH} 
    5556 
    5657local_destination_recipient_limit = 1 
    57 local_recipient_maps = unix:passwd.byname $alias_database 
     58local_recipient_maps              = unix:passwd.byname $alias_database 
    5859 
    5960# 
    …… 
    6768# 
    6869 
    69 virtual_mailbox_base = {MTA_VIRTUAL_MAIL_DIR} 
    70 virtual_mailbox_limit = 0 
     70virtual_mailbox_base    = {MTA_VIRTUAL_MAIL_DIR} 
     71virtual_mailbox_limit   = 0 
    7172 
    7273virtual_mailbox_domains = hash:{MTA_VIRTUAL_DMN_HASH} 
    73 virtual_mailbox_maps = hash:{MTA_VIRTUAL_MAILBOX_HASH} 
     74virtual_mailbox_maps    = hash:{MTA_VIRTUAL_MAILBOX_HASH} 
    7475 
    75 virtual_alias_maps = hash:{MTA_VIRTUAL_ALIAS_HASH} 
     76virtual_alias_maps      = hash:{MTA_VIRTUAL_ALIAS_HASH} 
    7677 
    77 virtual_minimum_uid = {MTA_MAILBOX_MIN_UID} 
    78 virtual_uid_maps = static:{MTA_MAILBOX_UID} 
    79 virtual_gid_maps = static:{MTA_MAILBOX_GID} 
     78virtual_minimum_uid     = {MTA_MAILBOX_MIN_UID} 
     79virtual_uid_maps        = static:{MTA_MAILBOX_UID} 
     80virtual_gid_maps        = static:{MTA_MAILBOX_GID} 
    8081 
    8182# 
    …… 
    8384# 
    8485 
    85 smtpd_sasl_auth_enable = yes 
    86 smtpd_sasl2_auth_enable = yes 
    87 smtpd_sasl_security_options = noanonymous 
    88 smtpd_sasl_local_domain = 
    89 broken_sasl_auth_clients = yes 
    90 smtpd_sender_restrictions = permit_mynetworks, 
    91                             permit_sasl_authenticated, 
    92                             reject_unauth_destination 
     86smtpd_sasl_auth_enable       = yes 
     87smtpd_sasl2_auth_enable      = yes 
     88smtpd_sasl_security_options = noanonymous 
     89smtpd_sasl_local_domain      = 
     90broken_sasl_auth_clients     = yes 
     91smtpd_sender_restrictions    = permit_mynetworks, 
     92                               permit_sasl_authenticated, 
     93                               reject_unauth_destination 
    9394smtpd_recipient_restrictions = permit_mynetworks, 
    94                                permit_sasl_authenticated, 
    95                                reject_unauth_destination 
     95                               permit_sasl_authenticated, 
     96                               reject_unauth_destination 
     97#                               check_policy_service inet:127.0.0.1:60000 
     98 
    9699 
    97100# 
    …… 
    99102# 
    100103 
    101 #smtpd_tld_loglevel = 2 
    102 #smtpd_tls_cert_file = /etc/postfix/cert.pem 
    103 #smtpd_tls_key_file = /etc/postfix/privkey.pem 
    104 #smtpd_use_tls = yes 
    105 #smtpd_tls_auth_only = no 
     104#smtpd_tld_loglevel        = 2 
     105#smtpd_tls_cert_file       = /etc/postfix/cert.pem 
     106#smtpd_tls_key_file        = /etc/postfix/privkey.pem 
     107#smtpd_use_tls             = yes 
     108#smtpd_tls_auth_only       = no 
    106109#smtpd_tls_received_header = yes 
    107110 
    …… 
    117120# 
    118121 
    119 #virtual_create_maildirsize = yes 
    120 #virtual_mailbox_extended = yes 
    121 #virtual_mailbox_limit_maps = mysql:/etc/postfix/mysql_virtual_mailbox_limit_maps.cf 
     122#virtual_create_maildirsize     = yes 
     123#virtual_mailbox_extended       = yes 
     124#virtual_mailbox_limit_maps     = mysql:/etc/postfix/mysql_virtual_mailbox_limit_maps.cf 
    122125#virtual_mailbox_limit_override = yes 
    123 #virtual_maildir_limit_message = "The user you're trying to reach is over mailbox quota." 
    124 #virtual_overquota_bounce = yes 
     126#virtual_maildir_limit_message = "The user you're trying to reach is over mailbox quota." 
     127#virtual_overquota_bounce       = yes 

  • trunk/configs/dists/fedora/postfix/master.cf

    r284