Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Changeset 1269 for trunk/configs

Show
Ignore:
Timestamp:
07/09/08 14:49:37 (5 months ago)
Author:
rats
Message:

* Fixed #1399: CentOS Build Instructions and Config Broken

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/configs/centos/Makefile

    r1109 r1269  
    3434 
    3535install: 
    36  
    3736        if test $(HOST_OS) = centos ; then \ 
    3837                cp ./ispcp.conf $(SYSTEM_CONF) ; \ 
    …… 
    5150 
    5251uninstall: 
    53  
    5452        if test $(HOST_OS) = centos ; then \ 
    5553                rm -rf $(SYSTEM_CONF)/ispcp.conf ;  \ 

  • trunk/configs/centos/apache/Makefile

    r1118 r1269  
    3131# 
    3232 
    33 ROOT_APACHE_CONF=$(ROOT_CONF)/apache2 
     33ROOT_APACHE_CONF=$(ROOT_CONF)/httpd 
    3434 
    3535export 
    …… 
    3939        $(SYSTEM_MAKE_DIRS) $(SYSTEM_CONF)/apache 
    4040        $(SYSTEM_MAKE_DIRS) $(ROOT_APACHE_CONF) 
    41         $(SYSTEM_MAKE_DIRS) $(ROOT_APACHE_CONF)/sites-available 
    42         $(SYSTEM_MAKE_DIRS) $(ROOT_APACHE_CONF)/mods-available 
     41        $(SYSTEM_MAKE_DIRS) $(ROOT_APACHE_CONF)/vhosts 
     42        $(SYSTEM_MAKE_DIRS) $(ROOT_APACHE_CONF)/conf.d 
    4343        $(SYSTEM_MAKE_DIRS) $(ROOT_APACHE_CONF)/ispcp 
    4444 
    …… 
    5454        cp ./fastcgi.conf $(SYSTEM_CONF)/apache/working/fastcgi_ispcp.conf 
    5555 
    56         cp -R $(SYSTEM_CONF)/apache/working/fastcgi_ispcp.conf $(ROOT_APACHE_CONF)/mods-available/fastcgi_ispcp.conf 
     56        cp ./fastcgi.conf $(SYSTEM_CONF)/apache/conf.d/fastcgi_ispcp.conf 
    5757 
    5858uninstall: 

  • trunk/configs/centos/courier/Makefile

    r1118 r1269  
    3232 
    3333ROOT_COURIER_CONF=$(ROOT_CONF)/courier 
     34ROOT_AUTHLIB_CONF=$(ROOT_CONF)/authlib 
    3435 
    3536export 
    …… 
    3940        $(SYSTEM_MAKE_DIRS) $(SYSTEM_CONF)/courier 
    4041        $(SYSTEM_MAKE_DIRS) $(ROOT_COURIER_CONF) 
     42        $(SYSTEM_MAKE_DIRS) $(ROOT_AUTHLIB_CONF) 
    4143 
    4244#       MTA Configuration Files; 

  • trunk/configs/centos/init.d/ispcp_daemon

    r1059 r1269  
    11#!/bin/sh 
    2  
    3 # ispCP ω (OMEGA) a Virtual Hosting Control System 
    4 # Copyright (c) 2007 by ispCP 
    5 # http://www.isp-control.net 
    62# 
     3# chkconfig: - 91 35 
     4# description: Starts and stops the ISPCP daemon 
    75# 
    8 # License: 
    9 #    This program is free software; you can redistribute it and/or 
    10 #    modify it under the terms of the MPL Mozilla Public License 
    11 #    as published by the Free Software Foundation; either version 1.1 
    12 #    of the License, or (at your option) any later version. 
    13 # 
    14 #    This program is distributed in the hope that it will be useful, 
    15 #    but WITHOUT ANY WARRANTY; without even the implied warranty of 
    16 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    17 #    MPL Mozilla Public License for more details. 
    18 # 
    19 #    You may have received a copy of the MPL Mozilla Public License 
    20 #    along with this program. 
    21 # 
    22 #    An on-line copy of the MPL Mozilla Public License can be found 
    23 #    http://www.mozilla.org/MPL/MPL-1.1.html 
    24 # 
    25 # 
    26 # The ispCP Home Page is at: 
    27 # 
    28 #    http://www.isp-control.net 
    29 # 
    30 ### BEGIN INIT INFO 
    31 # Provides:             ispcp_daemon 
    32 # Required-Start:       $network $local_fs $remote_fs 
    33 # Required-Stop: 
    34 # Should-Stop:          $local_fs 
    35 # Default-Start:        2 3 4 5 
    36 # Default-Stop:         0 1 6 
    37 # Short-Description:    ispCP GUI-Backend communication Daemon 
    38 ### END INIT INFO 
    39 # Note: do not modify any of these vars here, use /etc/default/$NAME instead 
    40  
     6# pidfile: /var/run/ispcp.pid 
     7# config:  /etc/ispcp/ispcp.conf 
    418 
    429 

  • trunk/configs/centos/init.d/ispcp_network

    r1059 r1269  
    11#!/bin/sh 
    2  
     2# chkconfig: - 85 15 
     3# description: Starts and stops the ISPCP  networking 
     4# 
     5# pidfile: /var/run/ispcp.pid 
     6# config:  /etc/ispcp/ispcp.conf 
    37# ispCP ω (OMEGA) a Virtual Hosting Control System 
    48# Copyright (c) 2007 by ispCP 
    …… 
    2731# 
    2832#    http://www.isp-control.net 
    29 ### BEGIN INIT INFO 
    30 # Provides:             ispcp_network 
    31 # Required-Start:       $network $local_fs $remote_fs 
    32 # Required-Stop: 
    33 # Should-Stop:          $local_fs 
    34 # Default-Start:        2 3 4 5 
    35 # Default-Stop:         0 1 6 
    36 # Short-Description:    ispCP Network Traffic Logger 
    37 ### END INIT INFO 
     33 
    3834# Note: do not modify any of these vars here, use /etc/default/$NAME instead 
    3935 

  • trunk/configs/centos/ispcp.conf

    r1263 r1269  
    1717DEFAULT_ADMIN_ADDRESS = 
    1818 
    19 SERVER_HOSTNAME = centos 
     19SERVER_HOSTNAME = fedora 
    2020 
    2121BASE_SERVER_IP = 127.0.0.1 
    …… 
    5353CMD_GZCAT = /bin/zcat 
    5454 
    55 CMD_GZIP = /bin/gzip 
     55CMD_GZIP = /usr/bin/gzip 
    5656 
    5757CMD_GREP = /bin/grep 
    …… 
    144144# 
    145145 
    146 PHP4_FASTCGI_BIN = /usr/bin/php4-cgi 
    147  
    148 PHP5_FASTCGI_BIN = /usr/bin/php5-cgi 
     146PHP4_FASTCGI_BIN = /opt/php4/bin/php-cgi 
     147 
     148PHP5_FASTCGI_BIN = /usr/bin/php-cgi 
    149149 
    150150PHP_VERSION = 5 
    …… 
    160160# 
    161161 
    162 BIND_CONF_FILE = /etc/named.conf 
    163  
    164 BIND_DB_DIR = /var/named 
     162BIND_CONF_FILE = /var/named/chroot/etc/named-ispcp.conf 
     163 
     164BIND_DB_DIR = /var/named/data 
    165165 
    166166SECONDARY_DNS = 
    …… 
    175175AWSTATS_MODE = 0 
    176176 
    177 AWSTATS_CACHE_DIR = /var/cache/awstats 
     177AWSTATS_CACHE_DIR = /var/lib/awstats 
    178178 
    179179AWSTATS_CONFIG_DIR = /etc/awstats 
    180180 
    181 AWSTATS_ENGINE_DIR = /usr/lib/cgi-bin 
    182  
    183 AWSTATS_WEB_DIR = /usr/share/awstats 
    184  
    185 AWSTATS_ROOT_DIR = /var/www/ispcp/engine/awstats 
     181AWSTATS_ENGINE_DIR = /usr/share/awstats 
     182 
     183AWSTATS_WEB_DIR = /usr/share/awstats/wwwroot/cgi-bin 
     184 
     185AWSTATS_ROOT_DIR = /usr/share/awstats/wwwroot 
    186186 
    187187# 
    …… 
    195195APACHE_CONF_DIR = /etc/httpd 
    196196 
    197 APACHE_CMD = /usr/sbin/httpd 
     197APACHE_CMD = /usr/sbin/apachectl 
    198198 
    199199APACHE_LOG_DIR = /var/log/httpd 
    …… 
    203203APACHE_USERS_LOG_DIR = /var/log/httpd/users 
    204204 
    205 APACHE_MODS_DIR = /etc/httpd/conf.d/mods-available 
    206  
    207 APACHE_SITES_DIR = /etc/httpd/conf.d/mods-available 
    208  
    209 APACHE_CUSTOM_SITES_CONFIG_DIR = /etc/httpd/ispcp 
     205APACHE_MODS_DIR = /etc/httpd/conf.d 
     206 
     207APACHE_SITES_DIR = /etc/httpd/vhosts 
     208 
     209APACHE_CUSTOM_SITES_CONFIG_DIR = /etc/httpd/vhosts 
    210210 
    211211APACHE_SUEXEC_USER_PREF = vu 
    …… 
    231231MTA_VIRTUAL_MAIL_DIR = /var/mail/virtual 
    232232 
    233 MTA_LOCAL_ALIAS_HASH = /etc/postfix/aliases 
     233MTA_LOCAL_ALIAS_HASH = /etc/aliases 
    234234 
    235235MTA_VIRTUAL_CONF_DIR = /etc/postfix/ispcp 
    …… 
    245245MTA_SENDER_ACCESS_HASH = /etc/postfix/ispcp/sender-access 
    246246 
    247 MTA_MAILBOX_MIN_UID = 500 
    248  
    249 MTA_MAILBOX_UID = 500 
     247MTA_MAILBOX_MIN_UID = 1004 
     248 
     249MTA_MAILBOX_UID = 1004 
    250250 
    251251MTA_MAILBOX_UID_NAME = vmail 
    252252 
    253 MTA_MAILBOX_GID = 12 
     253MTA_MAILBOX_GID = 8 
    254254 
    255255MTA_MAILBOX_GID_NAME = mail 
    256256 
    257 MTA_SASLDB_FILE = /etc/sasldb2 
     257MTA_SASLDB_FILE = /var/spool/postfix/etc/sasldb2 
    258258 
    259259ETC_SASLDB_FILE = /etc/sasldb2 
    …… 
    295295# 
    296296 
    297 # Either no or path to the amavis-daemon (usually: /etc/init.d/amavis) 
     297# Either no or path to the amavis-daemon (usually: /etc/rc.d/init.d/amavis) 
    298298CMD_AMAVIS = no 
    299299 
    300 CMD_AUTHD = /etc/init.d/courier-authlib 
    301  
    302 CMD_FTPD = /etc/init.d/proftpd 
     300CMD_AUTHD = /etc/rc.d/init.d/courier-authlib 
     301 
     302CMD_FTPD = /etc/rc.d/init.d/proftpd 
    303303 
    304304CMD_HTTPD = /usr/sbin/apachectl 
    305305 
    306 CMD_IMAP = /etc/init.d/courier 
    307  
    308 CMD_IMAP_SSL = no 
    309  
    310 CMD_MTA = /etc/init.d/postfix 
    311  
    312 CMD_NAMED = /etc/init.d/named 
    313  
    314 CMD_POP = no 
    315  
    316 CMD_POP_SSL = no 
    317  
    318 CMD_ISPCPD = /etc/init.d/ispcp_daemon 
    319  
    320 CMD_ISPCPN = /etc/init.d/ispcp_network 
     306CMD_IMAP = /etc/rc.d/init.d/courier-imap 
     307 
     308CMD_IMAP_SSL = /etc/rc.d/init.d/courier-imap 
     309 
     310CMD_MTA = /etc/rc.d/init.d/postfix 
     311 
     312CMD_NAMED = /etc/rc.d/init.d/named 
     313 
     314CMD_POP = /etc/rc.d/init.d/courier-imap 
     315 
     316CMD_POP_SSL = /etc/rc.d/init.d/courier-imap 
     317 
     318CMD_ISPCPD = /etc/rc.d/init.d/ispcp_daemon 
     319 
     320CMD_ISPCPN = /etc/rc.d/init.d/ispcp_network 
    321321 
    322322# 
    …… 
    330330FTP_TRAFF_LOG = /proftpd/ftp_traff.log 
    331331 
    332 MAIL_TRAFF_LOG = mail.log 
     332MAIL_TRAFF_LOG = maillog 
    333333 
    334334TRAFF_ROOT_DIR = /var/www/ispcp/engine/traffic 
    …… 
    380380DATE_FORMAT = d.m.Y 
    381381 
    382 RKHUNTER_LOG = /var/log/rkhunter.log 
     382RKHUNTER_LOG = /var/log/rkhunter/rkhunter.log 
    383383 
    384384CHKROOTKIT_LOG = /var/log/chkrootkit.log 

  • trunk/configs/centos/logrotate/ispcp

    r1121 r1269  
    1 /var/log/apache2/users/*.log { 
     1/var/log/httpd/users/*.log { 
    22  weekly 
    33  missingok 
    …… 
    99  sharedscripts 
    1010  prerotate 
    11     /var/www/ispcp/engine/traffic/ispcp-vrl-traff > /var/log/ispcp/ispcp-vrl-traff.log 
     11    /srv/www/ispcp/engine/traffic/ispcp-srv-traff &>/var/log/ispcp/ispcp-srv-traff.log 
    1212  endscript 
    1313  postrotate 
    1414  for i in `seq 1 10`; do 
    15     if [ -f /var/run/apache2.pid ]; then 
    16       /etc/init.d/apache2 stop > /dev/null 
     15    if [ -f /var/run/httpd.pid ]; then 
     16      /etc/init.d/httpd stop > /dev/null 
    1717      sleep 5 
    18       /etc/init.d/apache2 start > /dev/null 
     18      /etc/init.d/httpd start > /dev/null 
    1919    fi 
    2020  done 
    …… 
    2222} 
    2323 
    24 /var/log/apache2/backup/*.log.perv { 
     24/var/log/httpd/backup/*.log.perv { 
    2525  size 5M 
    2626  missingok 
    …… 
    3232} 
    3333 
    34 /var/log/proftpd/xferlog { 
     34/var/log/xferlog { 
    3535  daily 
    3636  rotate 7 
    …… 
    4343} 
    4444 
    45 /var/log/proftpd/ftp_traff.log { 
     45/var/log/ftp_traff.log { 
    4646  daily 
    4747  rotate 7 
    …… 
    5050  delaycompress 
    5151  prerotate 
    52     /var/www/ispcp/engine/traffic/ispcp-vrl-traff > /var/log/ispcp/ispcp-vrl-traff.log 
     52    /var/www/ispcp/engine/traffic/ispcp-vrl-traff &> /var/log/ispcp/ispcp-vrl-traff.log 
    5353  endscript 
    5454  postrotate 

  • trunk/configs/centos/postfix/main.cf

    r1223 r1269  
    2121# Postfix directory settings; These are critical for normal Postfix MTA functionallity 
    2222command_directory            = /usr/sbin 
    23 daemon_directory             = /usr/lib/postfix 
     23daemon_directory             = /usr/libexec/postfix 
    2424 
    2525# Some common configuration parameters 

  • trunk/configs/centos/proftpd/Makefile

    r1118 r1269  
    3737        $(SYSTEM_MAKE_DIRS) $(SYSTEM_CONF)/proftpd 
    3838        cp -R ./backup $(SYSTEM_CONF)/proftpd 
    39         cp ./proftpd.conf $(ROOT_CONF) ; \ 
    40         cp ./proftpd.conf $(SYSTEM_CONF)/proftpd ; \ 
     39        cp ./proftpd.conf $(ROOT_CONF) 
     40        cp ./proftpd.conf $(SYSTEM_CONF)/proftpd 
     41        cp ./proftpd.conf $(ROOT_CONF) 
    4142 
    4243uninstall: 

  • trunk/configs/centos/proftpd/proftpd.conf

    r1090 r1269  
    1818# 
    1919################################################################################ 
    20 # Includes DSO modules (this is mandatory in proftpd 1.3) 
    21 #Include /etc/proftpd/modules.conf 
     20 
     21<IfModule mod_dso.c> 
     22  LoadModule mod_sql.c 
     23  LoadModule mod_sql_mysql.c 
     24  LoadModule mod_quotatab.c 
     25  LoadModule mod_quotatab_file.c 
     26  LoadModule mod_quotatab_sql.c 
     27</IfModule> 
    2228 
    2329# Set off to disable IPv6 support which is annoying on IPv4 only boxes. 
    …… 
    7682# Set the user and group that the server normally runs at. 
    7783User                       nobody 
    78 Group                      nogroup 
     84Group                      nobody 
    7985 
    8086# Normally, we want files to be overwriteable. 
    …… 
    165171</IfModule> 
    166172 
     173# Use pam to authenticate (default) and be authoritative 
     174AuthPAMConfig              proftpd 
     175AuthOrder                  mod_sql.c mod_auth_pam.c* mod_auth_unix.c 
     176 
    167177# ispCP SQL Managment 
    168 # Activate for proftpd >= 1.3 
    169 #SQLBackend                 mysql 
     178SQLBackend                 mysql 
    170179SQLAuthTypes               Crypt 
    171180SQLAuthenticate            on