Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Changeset 370

Show
Ignore:
Timestamp:
02/18/07 01:04:18 (2 years ago)
Author:
Shaft
Message:

Modified Gentoo config and install files under configs/dists/gentoo

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/configs/Makefile

    r368 r370  
    4848                cd ./dists/fedora && $(MAKE) uninstall ; \ 
    4949        elif [[ $(HOST_OS) == gentoo ]] ; then \ 
    50                 cd ./dists/fedora && $(MAKE) uninstall ; \ 
     50                cd ./dists/gentoo && $(MAKE) uninstall ; \ 
    5151        elif [[ $(HOST_OS) == sles9 ]] ; then \ 
    5252                cd ./dists/sles9 && $(MAKE) uninstall ; \ 

  • trunk/configs/dists/gentoo/Makefile

    r327 r370  
    44install: 
    55 
    6         if [[ $(HOST_OS) == debian ]] ; then \ 
     6        if [[ $(HOST_OS) == gentoo ]] ; then \ 
    77                cp ./vhcs2.conf $(SYSTEM_CONF) ; \ 
    88                cd ./apache && $(MAKE) install ; cd .. ; \ 
    …… 
    1717                cd ./proftpd && $(MAKE) install ; cd .. ; \ 
    1818                cd ./logrotate && $(MAKE) install ; cd .. ; \ 
    19         elif [[ $(HOST_OS) == suse100 ]] ; then \ 
    20                 cd ./dists/suse100 && $(MAKE) install ; \ 
    21         elif [[ $(HOST_OS) == suse93 ]] ; then \ 
    22                 cd ./dists/suse93 && $(MAKE) install ; \ 
    23         elif [[ $(HOST_OS) == fedora ]] ; then \ 
    24                 cd ./dists/fedora && $(MAKE) install ; \ 
    25         elif [[ $(HOST_OS) == sles9 ]] ; then \ 
    26                 cd ./dists/sles9 && $(MAKE) install ; \ 
    2719        fi 
    2820 
    2921uninstall: 
    3022 
    31         if [[ $(HOST_OS) == debian ]] ; then \ 
     23        if [[ $(HOST_OS) == gentoo ]] ; then \ 
    3224                rm -rf $(SYSTEM_CONF)/vhcs2.conf ;  \ 
    3325                cd ./apache && $(MAKE) uninstall ; cd .. ; \ 
    …… 
    4133                cd ./proftpd && $(MAKE) uninstall ; cd .. ; \ 
    4234                cd ./logrotate && $(MAKE) uninstall ; cd .. ; \ 
    43         elif [[ $(HOST_OS) == suse ]] ; then \ 
    44                 cd ./dists/suse && $(MAKE) uninstall ; \ 
    45         elif [[ $(HOST_OS) == fedora ]] ; then \ 
    46                 cd ./dists/fedora && $(MAKE) uninstall ; \ 
    47         elif [[ $(HOST_OS) == sles9 ]] ; then \ 
    48                 cd ./dists/sles9 && $(MAKE) uninstall ; \ 
    4935        fi 
    5036 

  • trunk/configs/dists/gentoo/apache/Makefile

    r327 r370  
    1818        cp -R ./working $(SYSTEM_CONF)/apache 
    1919 
    20         cp -R ./httpd.conf $(ROOT_APACHE_CONF)/sites-available/vhcs2.conf 
    21         cp -R ./fastcgi.conf ${ROOT_APACHE_CONF}/mods-available/fastcgi.conf 
     20        cp -R ./httpd.conf $(ROOT_APACHE_CONF)/vhost.d/vhcs2.conf 
     21        cp -R ./fastcgi.conf $(ROOT_APACHE_CONF)/modules.d/21-mod-fastcgi.conf 
    2222 
    2323uninstall: 

  • trunk/configs/dists/gentoo/apache/fastcgi.conf

    r341 r370  
    2525# - Finish PHP5 Support 
    2626# - Finish config Fastcgi 
    27  
     27<IfDefine FCGID> 
    2828<IfModule mod_fastcgi.c> 
    2929FastCgiWrapper On 
    …… 
    3535              #-pass-header HTTP_AUTHORIZATION 
    3636 
    37 FastCgiServer /var/www/fcgi/master/php4-fcgi-starter -user vu2000 -group vu2000 
     37FastCgiServer {PHP_STARTER_DIR}/master/php4-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} 
    3838 
    3939# 
    …… 
    6363 
    6464#Action php5-fastcgi /php5/php5-fcgi-starter 
     65# 
     66</IfModule> 
     67</IfDefine> 

  • trunk/configs/dists/gentoo/courier/Makefile

    r327 r370  
    11 
    2 ROOT_COURIER_CONF=$(ROOT_CONF)/courier 
     2ROOT_COURIER_CONF=$(ROOT_CONF)/courier/authlib 
     3ROOT_COURIER_IMAP_CONF=$(ROOT_CONF)/courier-imap 
    34 
    45export 
    …… 
    89        $(SYSTEM_MAKE_DIRS) $(SYSTEM_CONF)/courier 
    910        $(SYSTEM_MAKE_DIRS) $(ROOT_COURIER_CONF) 
     11        $(SYSTEM_MAKE_DIRS) $(ROOT_COURIER_IMAP_CONF) 
    1012# 
    1113#       MTA Configuration Files; 
    …… 
    2628        cp ./authdaemonrc $(ROOT_COURIER_CONF) 
    2729        cp ./authmodulelist $(ROOT_COURIER_CONF) 
    28         cp ./imapd $(ROOT_COURIER_CONF) 
    29         cp ./pop3d $(ROOT_COURIER_CONF) 
    30         cp ./userdb $(ROOT_COURIER_CONF) 
     30        cp ./imapd $(ROOT_COURIER_IMAP_CONF) 
     31        cp ./pop3d $(ROOT_COURIER_IMAP_CONF) 
     32        cp ./userdb $(ROOT_COURIER_IMAP_CONF) 
    3133 
    3234uninstall: 

  • trunk/configs/dists/gentoo/proftpd/Makefile

    r327 r370  
    66        cp -R ./backup $(SYSTEM_CONF)/proftpd 
    77        cp ./proftpd.conf $(SYSTEM_CONF)/proftpd 
    8         cp ./proftpd.conf $(ROOT_CONF) 
     8        cp ./proftpd.conf $(ROOT_CONF)/proftpd 
    99 
    1010uninstall: 

  • trunk/configs/dists/gentoo/vhcs2.conf

    r367 r370  
    7474# 
    7575 
    76 PHP4_FASTCGI_BIN = /usr/bin/php4-cgi 
    77  
    78 PHP5_FASTCGI_BIN = /usr/bin/php5-cgi 
     76PHP4_FASTCGI_BIN = /usr/lib/php4/bin/php-cgi 
     77 
     78PHP5_FASTCGI_BIN = /usr/lib/php5/bin/php-cgi 
    7979 
    8080# 
    …… 
    9292# 
    9393# Either no or path to the awstats configs dir (mostly: /etc/awstats) 
    94 AWSTATS_DIR = no 
     94AWSTATS_DIR = no #/etc/awstats  
    9595 
    9696AWSTATS_WEB_DIR = /var/www/awstats 
    …… 
    251251 
    252252# Either no or path to the amavis-daemon (mostly: /etc/init.d/amavis) 
    253 CMD_AMAVIS = no 
     253CMD_AMAVIS = no #/etc/init.d/amavisd 
    254254 
    255255CMD_FTPD = /etc/init.d/proftpd