Changeset 2580

Show
Ignore:
Timestamp:
02/06/10 22:58:48 (7 months ago)
Author:
benedikt
Message:

* Fixed #2189: Small patch for opensuse

Location:
trunk
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • trunk/CHANGELOG

    r2579 r2580  
    442010-02-06 Benedikt Heintel 
    55        - CONFIGS: 
     6                * Fixed #2189: Small patch for opensuse 
    67                * Fixed #2197: ispcp-vrl-traff-correction should be disabled 
    78        - GUI: 

  • trunk/configs/opensuse/ispcp.conf

    r2512 r2580  
    5353CMD_AWK = /usr/bin/awk 
    5454 
    55 CMD_BZCAT = /bin/bzcat 
    56  
    57 CMD_BZIP = /bin/bzip2 
     55CMD_BZCAT = /usr/bin/bzcat 
     56 
     57CMD_BZIP = /usr/bin/bzip2 
    5858 
    5959CMD_CHOWN = /bin/chown 
    … …  
    7373CMD_ECHO = /bin/echo 
    7474 
    75 CMD_EGREP = /bin/egrep 
    76  
    77 CMD_GZCAT = /bin/zcat 
     75CMD_EGREP = /usr/bin/egrep 
     76 
     77CMD_GZCAT = /usr/bin/zcat 
    7878 
    7979CMD_GZIP = /bin/gzip 
    8080 
    81 CMD_GREP = /bin/grep 
     81CMD_GREP = /usr/bin/grep 
    8282 
    8383CMD_GROUPADD = /usr/sbin/groupadd 
    … …  
    105105CMD_RM = /bin/rm 
    106106 
    107 CMD_SED = /bin/sed 
     107CMD_SED = /usr/bin/sed 
    108108 
    109109CMD_SHELL = /bin/bash 
    … …  
    119119CMD_WC = /usr/bin/wc 
    120120 
    121 PEAR_DIR = /usr/share/php 
     121PEAR_DIR = /usr/share/php5 
    122122 
    123123# 

  • trunk/configs/opensuse/logrotate/ispcp

    r1944 r2580  
     1# ispCP ω (OMEGA) a Virtual Hosting Control Panel 
     2# Copyright (C) 2001-2006 by moleSoftware GmbH - http://www.molesoftware.com 
     3# Copyright (C) 2006-2010 by isp Control Panel - http://ispcp.net 
     4# 
     5# Version: $id$ 
     6# 
     7# The contents of this file are subject to the Mozilla Public License 
     8# Version 1.1 (the "License"); you may not use this file except in 
     9# compliance with the License. You may obtain a copy of the License at 
     10# http://www.mozilla.org/MPL/ 
     11# 
     12# Software distributed under the License is distributed on an "AS IS" 
     13# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the 
     14# License for the specific language governing rights and limitations 
     15# under the License. 
     16# 
     17# The Original Code is "VHCS - Virtual Hosting Control System". 
     18# 
     19# The Initial Developer of the Original Code is moleSoftware GmbH. 
     20# Portions created by Initial Developer are Copyright (C) 2001-2006 
     21# by moleSoftware GmbH. All Rights Reserved. 
     22# Portions created by the ispCP Team are Copyright (C) 2006-2010 by 
     23# isp Control Panel. All Rights Reserved. 
     24# 
     25# The ispCP ω Home Page is: 
     26# 
     27#    http://isp-control.net 
     28# 
     29 
     30# Rotation for user logs for ispCP traffic count 
     31# 
    132/var/log/apache2/users/*.log { 
    233  weekly 
    … …  
    940  sharedscripts 
    1041  prerotate 
    11     /srv/www/ispcp/engine/traffic/ispcp-srv-traff &>/var/log/ispcp/ispcp-srv-traff.log 
     42    /srv/www/ispcp/engine/traffic/ispcp-srv-traff-SUSE &>/var/log/ispcp/ispcp-srv-traff.log 
    1243  endscript 
    1344  postrotate 
    14     /etc/init.d/apache2 reload > /dev/null 
     45    if [ -f "`. /etc/apache2/envvars ; echo ${APACHE_PID_FILE:-/var/run/apache2.pid}`" ]; then 
     46      /etc/init.d/apache2 reload > /dev/null 
     47    fi 
    1548  endscript 
    1649} 
    1750 
    18 /var/log/apache2/backup/*.log.perv { 
     51# Rotation for user traffic prevs 
     52# 
     53/var/log/apache2/backup/*.log.prev { 
    1954  size 5M 
    2055  missingok 
    … …  
    2661} 
    2762 
     63# Transfer rotation for ProFTPd 
     64# 
    2865/var/log/proftpd/xferlog { 
    2966  daily 
    … …  
    3370  delaycompress 
    3471  postrotate 
    35     if [ -e /var/run/syslog-nd.pid ]; then 
     72    if [ -e /var/run/syslog-ng.pid ]; then 
    3673      /usr/bin/killall -HUP syslog-ng 
    3774    elif [ -e /var/run/rsyslogd.pid ]; then 
    3875      /usr/bin/killall -HUP rsyslogd 
    39         fi 
     76    fi 
    4077  endscript 
    4178} 
    4279 
     80# ProFTPd traffic rotation for ispCP traffic count 
     81# 
    4382/var/log/proftpd/ftp_traff.log { 
    4483  daily 
    … …  
    5190  endscript 
    5291  postrotate 
    53     if [ -e /var/run/syslog-nd.pid ]; then 
     92    if [ -e /var/run/syslog-ng.pid ]; then 
    5493      /usr/bin/killall -HUP syslog-ng 
    5594    elif [ -e /var/run/rsyslogd.pid ]; then 

  • trunk/docs/OpenSuse/postinst

    r2505 r2580  
    181181                                $CMD_SED -i 's/POSTGREY_CONN_OPTIONS="--unix=\/var\/spool\/postfix\/postgrey\/socket"/#POSTGREY_CONN_OPTIONS="--unix=\/var\/spool\/postfix\/postgrey\/socket"/' /etc/sysconfig/postgrey 
    182182                        fi 
     183                         
     184                        #  
     185                        # rkhunter  
     186                        #  
     187                        echo " Building rkhunter database"  
     188                        /usr/bin/rkhunter --propupd & 
    183189 
    184190                        #