Changeset 1134

Timestamp:

05/03/2008 12:25:41 AM (2 months ago)

Author:

rats

Message:

* Fixed #1222: FreeBSD: Fix some path and config and insert old daemon routine
* Fixed #1195: Gentoo: Somewhat large Gentoo update

Files:

• trunk/BSDmakefile (modified) (4 diffs)
• trunk/Makefile.fbsd (modified) (1 diff)
• trunk/Makefile.gentoo (modified) (2 diffs)
• trunk/configs/freebsd/apache/00_master.conf (modified) (2 diffs)
• trunk/configs/freebsd/apache/working/ispcp.conf (modified) (1 diff)
• trunk/configs/freebsd/postfix/main.cf (modified) (1 diff)
• trunk/configs/gentoo/apache/00_master.conf (modified) (1 diff)
• trunk/configs/gentoo/apache/Makefile (modified) (3 diffs)
• trunk/configs/gentoo/apache/fastcgi.conf (modified) (1 diff)
• trunk/configs/gentoo/apache/fastcgi2.conf (modified) (1 diff)
• trunk/configs/gentoo/apache/parts/als_php2_entry.tpl (modified) (1 diff)
• trunk/configs/gentoo/apache/parts/als_php_entry.tpl (modified) (1 diff)
• trunk/configs/gentoo/apache/parts/dmn_php2_entry.tpl (modified) (1 diff)
• trunk/configs/gentoo/apache/parts/dmn_php_entry.tpl (modified) (1 diff)
• trunk/configs/gentoo/apache/parts/sub_cgi_entry.tpl (modified) (1 diff)
• trunk/configs/gentoo/apache/parts/sub_php2_entry.tpl (modified) (1 diff)
• trunk/configs/gentoo/apache/parts/sub_php_entry.tpl (modified) (1 diff)
• trunk/configs/gentoo/apache/working/fastcgi_ispcp.conf (modified) (1 diff)
• trunk/configs/gentoo/courier/Makefile (modified) (1 diff)
• trunk/configs/gentoo/cron.d/Makefile (modified) (1 diff)
• trunk/configs/gentoo/database/database.sql (modified) (1 diff)
• trunk/configs/gentoo/init.d/Makefile (modified) (3 diffs)
• trunk/configs/gentoo/init.d/ispcp_daemon (modified) (3 diffs)
• trunk/configs/gentoo/init.d/ispcp_network (modified) (4 diffs)
• trunk/configs/gentoo/ispcp.conf (modified) (7 diffs)
• trunk/configs/gentoo/postfix/main.cf (modified) (1 diff)
• trunk/configs/gentoo/proftpd/Makefile (modified) (1 diff)
• trunk/configs/gentoo/proftpd/proftpd.conf (modified) (6 diffs)
• trunk/docs/FreeBSD/INSTALL (modified) (3 diffs)
• trunk/docs/FreeBSD/freebsd-packages (modified) (3 diffs)
• trunk/docs/Gentoo/gentoo-packages (modified) (1 diff)
• trunk/engine/setup/ispcp-setup-methods.pl (modified) (2 diffs)
• trunk/tools/daemon/BSDmakefile (modified) (1 diff)
• trunk/tools/daemon/helo_syntax.c (modified) (3 diffs)
• trunk/tools/daemon/lr_syntax.c (modified) (3 diffs)

trunk/BSDmakefile

@@ -31 +31 @@
-#
-
+
-.ifdef $(OSTYPE)==FreeBSD
-.include <Makefile.fbsd>
@@ -38 +39 @@
-
-install:
-
+
+
+
-        cd ./tools && $(MAKE) install
-        $(SYSTEM_MAKE_DIRS) $(SYSTEM_CONF)
@@ -53 +56 @@
-        cd ./keys && $(MAKE) install
-
+        #
-        # Patch some variable
+        #
-        /usr/bin/sed s/"\/etc\/ispcp\/ispcp.conf"/"\/usr\/local\/etc\/ispcp\/ispcp.conf"/g ./engine/ispcp_common_code.pl > $(SYSTEM_ROOT)/engine/ispcp_common_code.pl
-
+
+
+
+
+
+
+
+
+
+
-
-        cd ${INST_PREF} && cp -R * /
-        rm -rf ${INST_PREF}
-
+        #
+        #
+        # If Some error occured please read FAQ first and search at forum in http://www.isp-control.net
+        # Go to $(SYSTEM_WEB)/ispcp/engine/setup and type "ispcp-setup" to configure or "ispcp-upgrade" 
+        # to complete upgrade process
-
-uninstall:
@@ -81 +100 @@
-
-        cd ./tools/daemon && $(MAKE) clean
+
+

trunk/Makefile.fbsd

@@ -38 +38 @@
-
-ROOT_CONF=$(INST_PREF)/usr/local/etc
-
+
+
-SYSTEM_CONF=$(INST_PREF)/usr/local/etc/ispcp
-SYSTEM_LOG=$(INST_PREF)/var/log/ispcp
-/usr/local/www
-/usr/local/www
-/usr/local/www
-/usr/local/www
+$(SYSTEM_WEB)
+$(SYSTEM_WEB)
+$(SYSTEM_WEB)
+$(SYSTEM_WEB)
-SYSTEM_MAIL_VIRTUAL=$(INST_PREF)/var/mail/virtual
-SYSTEM_MAKE_DIRS=/bin/mkdir -p

trunk/Makefile.gentoo

@@ -41 +41 @@
-SYSTEM_CONF=$(INST_PREF)/etc/ispcp
-SYSTEM_LOG=$(INST_PREF)/var/log/ispcp
+SYSTEM_PROFTPD_LOG=$(INST_PREF)/var/log/proftpd
-SYSTEM_APACHE_BACK_LOG=$(INST_PREF)/var/log/apache2/backup
+SYSTEM_APACHE_USERS_LOG=$(INST_PREF)/var/log/apache2/users
-SYSTEM_VIRTUAL=$(INST_PREF)/var/www/virtual
-SYSTEM_AWSTATS=$(INST_PREF)/var/www/awstats
-SYSTEM_FCGI=$(INST_PREF)/var/www/fcgi
-SYSTEM_SCOREBOARDS=$(INST_PREF)/var/www/scoreboards
-
+spool/
-SYSTEM_MAKE_DIRS=/bin/mkdir -p
-SYSTEM_MAKE_FILE=/bin/touch
-
-var/spool/postfix/etc
+etc/sasl2
-
-export
@@ -68 +70 @@
-        $(SYSTEM_MAKE_DIRS) $(SYSTEM_AWSTATS)
-        $(SYSTEM_MAKE_DIRS) $(SYSTEM_MAIL_VIRTUAL)
+        $(SYSTEM_MAKE_DIRS) $(SYSTEM_PROFTPD_LOG)
-        $(SYSTEM_MAKE_DIRS) $(SYSTEM_APACHE_BACK_LOG)
+        $(SYSTEM_MAKE_DIRS) $(SYSTEM_APACHE_USERS_LOG)
-        $(SYSTEM_MAKE_DIRS) $(POSTFIX_SASLDB2_DIR)
-

trunk/configs/freebsd/apache/00_master.conf

@@ -71 +71 @@
-    <IfModule mod_php4.c>
-        <Directory {ROOT_DIR}/gui>
-
+s
-            php_admin_value session.save_path "{ROOT_DIR}/gui/phptmp/"
-                        php_admin_value upload_tmp_dir "{ROOT_DIR}/gui/phptmp/"
@@ -78 +78 @@
-    <IfModule mod_php5.c>
-        <Directory {ROOT_DIR}/gui>
-
+s
-            php_admin_value session.save_path "{ROOT_DIR}/gui/phptmp/"
-                        php_admin_value upload_tmp_dir "{ROOT_DIR}/gui/phptmp/"

trunk/configs/freebsd/apache/working/ispcp.conf

@@ +1 @@
+# httpd Data BEGIN.
-
-#
-This file will be replaced by ../httpd.conf when make is executed
+wget-hack prevention
-#
+
+<IfModule mod_rewrite.c>
+    RewriteEngine on
+    RewriteCond %{HTTP_USER_AGENT} ^LWP::Simple
+    RewriteRule ^/.* http://%{REMOTE_ADDR}/ [L,E=nolog:1]
+</IfModule>
+
+#
+# Web traffic accounting.
+#
+
+LogFormat "%B" traff
+
+#
+# mod_cband configuration
+#
+
+<IfModule mod_cband.c>
+    CBandScoreFlushPeriod 10
+    CBandRandomPulse On
+</IfModule>
+
+#
+# let the customer decide what charset he likes to use
+#
+
+AddDefaultCharset Off
+
+#
+# Header End
+#
+
+# httpd [{IP}] virtual host entry BEGIN.
+# httpd [{IP}] virtual host entry END.
+
+# httpd Data END.

trunk/configs/freebsd/postfix/main.cf

@@ -109 +109 @@
-#smtpd_use_tls               = yes
-#smtpd_tls_loglevel          = 2
-
-
+usr/local/
+usr/local/
-#smtpd_tls_auth_only         = no
-#smtpd_tls_received_header   = yes

trunk/configs/gentoo/apache/00_master.conf

@@ -48 +48 @@
-
-    <IfModule suexec_module>
-vu2000 vu2000
+{APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID}
-    </IfModule>
-

trunk/configs/gentoo/apache/Makefile

@@ -33 +33 @@
-ROOT_APACHE_CONF=$(ROOT_CONF)/apache2
-
-RELEASE=`cat /etc/debian_version | awk '{print $1}'`
-
-export
-
@@ -41 +39 @@
-        $(SYSTEM_MAKE_DIRS) $(SYSTEM_CONF)/apache
-        $(SYSTEM_MAKE_DIRS) $(ROOT_APACHE_CONF)
-sites-available
-s-available
+vhosts.d
+ules.d
-        $(SYSTEM_MAKE_DIRS) $(ROOT_APACHE_CONF)/ispcp
-
-        cp ./httpd.conf $(SYSTEM_CONF)/apache
+        cp ./fastcgi_ispcp.conf $(SYSTEM_CONF)/apache
-        cp ./00_master.conf $(SYSTEM_CONF)/apache
-        cp ./01_awstats.conf $(SYSTEM_CONF)/apache
@@ -52 +51 @@
-        cp -R ./working $(SYSTEM_CONF)/apache
-
+        cp ./fastcgi_ispcp.conf $(SYSTEM_CONF)/apache/working/fastcgi_ispcp.conf
-        cp ./httpd.conf $(SYSTEM_CONF)/apache/working/ispcp.conf
-        cp ./httpd.conf $(SYSTEM_CONF)/apache/parts/ispcp_base.tpl
-
-        # Debian 4.0 "Etch"?
-        if [[ $(RELEASE) = '4.0' ]] || [[ $(RELEASE) = 'lenny/sid' ]]; then \
-                cp ./fastcgi2.conf $(SYSTEM_CONF)/apache/working/fastcgi_ispcp.conf ; \
-        else \
-                cp ./fastcgi.conf $(SYSTEM_CONF)/apache/working/fastcgi_ispcp.conf ; \
-        fi
-
-        cp -R $(SYSTEM_CONF)/apache/working/fastcgi_ispcp.conf $(ROOT_APACHE_CONF)/mods-available/fastcgi_ispcp.conf
-
-uninstall:

trunk/configs/gentoo/apache/fastcgi.conf

@@ -1 @@
-#
-# ispCP ω (OMEGA) a Virtual Hosting Control System
-#
-# @copyright    2006-2008 by ispCP | http://isp-control.net
-# @version              SVN: $ID$
-# @link                 http://isp-control.net
-# @author               ispCP Team
-#
-# @license
-#   This program is free software; you can redistribute it and/or modify it under
-#   the terms of the MPL General Public License as published by the Free Software
-#   Foundation; either version 1.1 of the License, or (at your option) any later
-#   version.
-#   You should have received a copy of the MPL Mozilla Public License along with
-#   this program; if not, write to the Open Source Initiative (OSI)
-#   http://opensource.org | osi@opensource.org
-#
-################################################################################
-
-<IfModule mod_fastcgi.c>
-        FastCgiWrapper On
-        FastCgiIpcDir /var/lib/apache2/fastcgi
-
-        FastCgiConfig -minProcesses 1 \
-                      -maxProcesses 400 \
-                      -maxClassProcesses 5 \
-                      -multiThreshold 80 \
-                      -killInterval 60 \
-                      -startDelay 5
-                      # -singleThreshold 100 \
-                      # -autoUpdate \
-                      # -pass-header HTTP_AUTHORIZATION
-
-        FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} -idle-timeout 300
-
-        #
-        # PHP{PHP_VERSION} SUPPORT
-        #
-
-        AddHandler php-fastcgi .php .php{PHP_VERSION}
-
-        <Location /php{PHP_VERSION}/php{PHP_VERSION}-fcgi-starter>
-            SetHandler fastcgi-script
-            Options +ExecCGI
-        </Location>
-
-        Action php-fastcgi /php{PHP_VERSION}/php{PHP_VERSION}-fcgi-starter
-        AddType application/x-httpd-php .php .php{PHP_VERSION}
-</IfModule>

trunk/configs/gentoo/apache/fastcgi2.conf

@@ -1 @@
-#
-# ispCP ω (OMEGA) a Virtual Hosting Control System
-#
-# @copyright    2006-2008 by ispCP | http://isp-control.net
-# @version              SVN: $ID$
-# @link                 http://isp-control.net
-# @author               ispCP Team
-#
-# @license
-#   This program is free software; you can redistribute it and/or modify it under
-#   the terms of the MPL General Public License as published by the Free Software
-#   Foundation; either version 1.1 of the License, or (at your option) any later
-#   version.
-#   You should have received a copy of the MPL Mozilla Public License along with
-#   this program; if not, write to the Open Source Initiative (OSI)
-#   http://opensource.org | osi@opensource.org
-#
-################################################################################
-
-<IfModule mod_fastcgi.c>
-        FastCgiWrapper On
-        FastCgiIpcDir /var/lib/apache2/fastcgi2
-
-        FastCgiConfig -minProcesses 1 \
-                      -maxProcesses 400 \
-                      -maxClassProcesses 5 \
-                      -multiThreshold 80 \
-                      -killInterval 60 \
-                      -startDelay 5
-                      # -singleThreshold 100 \
-                      # -autoUpdate \
-                      # -pass-header HTTP_AUTHORIZATION
-
-        FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} -idle-timeout 300
-
-        #
-        # PHP{PHP_VERSION} SUPPORT
-        #
-
-        AddHandler php-fastcgi .php .php{PHP_VERSION}
-
-        <Location /php{PHP_VERSION}/php{PHP_VERSION}-fcgi-starter>
-            SetHandler fastcgi-script
-            Options +ExecCGI
-        </Location>
-
-        Action php-fastcgi /php{PHP_VERSION}/php{PHP_VERSION}-fcgi-starter
-        AddType application/x-httpd-php .php .php{PHP_VERSION}
-</IfModule>

trunk/configs/gentoo/apache/parts/als_php2_entry.tpl

@@ -21 +21 @@
-        </Directory>
-    </IfModule>
+        <IfModule mod_fcgid.c>
+        ScriptAlias /php4/ {STARTER_DIR}/{DMN_NAME}/
+        ScriptAlias /php5/ {STARTER_DIR}/{DMN_NAME}/
+                <Directory "/var/www/virtual/{DMN_NAME}/htdocs">
+                        FCGIWrapper {STARTER_DIR}/{DMN_NAME}/php{PHP_VERSION}-fcgi-starter .php
+                        AddHandler fcgid-script .php
+                        Options +ExecCGI
+                </Directory>
+        </IfModule>

trunk/configs/gentoo/apache/parts/als_php_entry.tpl

@@ -9 +9 @@
-                RemoveType .php
-            </IfModule>
+            <IfModule mod_fcgid.c>
+                RemoveHandler .php
+                RemoveType .php
+            </IfModule>

trunk/configs/gentoo/apache/parts/dmn_php2_entry.tpl

@@ -21 +21 @@
-        </Directory>
-    </IfModule>
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/configs/gentoo/apache/parts/dmn_php_entry.tpl

@@ -9 +9 @@
-                RemoveType .php
-            </IfModule>
+            <IfModule mod_fcgid.c>
+                RemoveHandler .php
+                RemoveType .php
+            </IfModule>

trunk/configs/gentoo/apache/parts/sub_cgi_entry.tpl

@@ -2 +2 @@
-    <Directory {WWW_DIR}/{DMN_NAME}{MOUNT_POINT}/cgi-bin>
-        AllowOverride AuthConfig
-#
+
-        Order allow,deny
-        Allow from all

trunk/configs/gentoo/apache/parts/sub_php2_entry.tpl

@@ -21 +21 @@
-        </Directory>
-    </IfModule>
+        <IfModule mod_fcgid.c>
+                <Directory "{STARTER_DIR}/{DMN_NAME}">
+                        AllowOverride None
+                        Options +ExecCGI -MultiViews -Indexes
+                        Order allow,deny
+                        Allow from all
+                </Directory>
+                <Location />
+                        FCGIWrapper {STARTER_DIR}/{DMN_NAME}/php{PHP_VERSION}-fcgi-starter .php
+                        AddHandler fcgid-script .php
+                        Options +ExecCGI
+                        Order allow,deny
+                        Allow from all
+                </Location>
+        </IfModule>

trunk/configs/gentoo/apache/parts/sub_php_entry.tpl

@@ -9 +9 @@
-                RemoveType .php
-            </IfModule>
+            <IfModule mod_fcgid.c>
+                RemoveHandler .php
+                RemoveType .php
+            </IfModule>

trunk/configs/gentoo/apache/working/fastcgi_ispcp.conf

@@ -1 @@
-
-
+
-#
+# This file will be replaced by ../ispcp when make is executed
-#
-# License:
-#    This program is free software; you can redistribute it and/or
-#    modify it under the terms of the GPL General Public License
-#    as published by the Free Software Foundation; either version 2.0
-#    of the License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GPL General Public License for more details.
-#
-#    You may have received a copy of the GPL General Public License
-#    along with this program.
-#
-#    An on-line copy of the GPL General Public License can be found
-#    http://www.fsf.org/licensing/licenses/gpl.txt
-#
-########################################################################
-#
-# @TODO :
-# - Finish config Fastcgi
-
-<IfModule mod_fastcgi.c>
-        FastCgiWrapper On
-        FastCgiIpcDir /var/lib/apache2/fastcgi
-        FastCgiConfig -minProcesses 1 \
-                  -maxProcesses 400 \
-                  -maxClassProcesses 5 \
-                  -multiThreshold 80 \
-                  -killInterval 60 \
-                  -startDelay 5
-                  # -singleThreshold 100 \
-                  # -autoUpdate \
-                  # -pass-header HTTP_AUTHORIZATION
-
-        FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID}  -idle-timeout 300
-
-        #
-        # PHP{PHP_VERSION} SUPPORT
-        #
-
-        AddHandler php-fastcgi .php .php{PHP_VERSION}
-
-        <Location /php{PHP_VERSION}/php{PHP_VERSION}-fcgi-starter>
-                SetHandler fastcgi-script
-                Options +ExecCGI
-        </Location>
-
-        Action php-fastcgi /php{PHP_VERSION}/php{PHP_VERSION}-fcgi-starter
-        AddType application/x-httpd-php .php .php{PHP_VERSION}
-</IfModule>

trunk/configs/gentoo/courier/Makefile

@@ -42 +42 @@
-        $(SYSTEM_MAKE_DIRS) $(ROOT_AUTHLIB_CONF)
-        $(SYSTEM_MAKE_DIRS) $(ROOT_COURIER_IMAP_CONF)
-        $(SYSTEM_MAKE_DIRS) $(INST_PREF)/var/run/courier
-        $(SYSTEM_MAKE_FILE) $(INST_PREF)/var/log/mail.log
-

trunk/configs/gentoo/cron.d/Makefile

@@ -40 +40 @@
-        cp -R ./parts $(SYSTEM_CONF)/cron.d
-        cp -R ./working $(SYSTEM_CONF)/cron.d
-        $(SYSTEM_MAKE_FILE) $(SYSTEM_CONF)/cron.d/backup/ispcp
-        $(SYSTEM_MAKE_FILE) $(SYSTEM_CONF)/cron.d/working/ispcp
-        cp $(SYSTEM_CONF)/cron.d/ispcp $(SYSTEM_CONF)/cron.d/working
-

trunk/configs/gentoo/database/database.sql

@@ -75 +75 @@
-('PORT_DNS', '53;tcp;DNS;1;0'),
-('PORT_HTTP', '80;tcp;HTTP;1;0'),
-0
+1
-('PORT_POP3', '110;tcp;POP3;1;0'),
-('PORT_POP3-SSL', '995;tcp;POP3-SSL;1;0'),
-('PORT_IMAP', '143;tcp;IMAP;1;0'),
-0
-6000
+1
+1003
-('PORT_AMAVIS', '10024;tcp;AMaVis;1;1'),
-('PORT_SPAMASSASSIN', '783;tcp;SPAMASSASSIN;1;1'),

trunk/configs/gentoo/init.d/Makefile

@@ -36 +36 @@
-
-        $(SYSTEM_MAKE_DIRS) $(ROOT_CONF)/init.d
-default
+conf.d
-
-        cp ispcp_daemon $(ROOT_CONF)/init.d
@@ -44 +44 @@
-        chmod 0755 $(ROOT_CONF)/init.d/ispcp_network $(ROOT_CONF)/init.d/ispcp_daemon
-
-ispcp_daemon.default
-.default $(ROOT_CONF)/default
+conf.d/ispcp_daemon
+ $(ROOT_CONF)/conf.d
-        fi
-ispcp_network.default
-.default $(ROOT_CONF)/default
+conf.d/ispcp_network
+ $(ROOT_CONF)/conf.d
-        fi
-
@@ -55 +55 @@
-        rm -f $(ROOT_CONF)/init.d/ispcp_daemon
-        rm -f $(ROOT_CONF)/init.d/ispcp_network
-default
-default
+conf.d
+conf.d

trunk/configs/gentoo/init.d/ispcp_daemon

@@ -29 +29 @@
-#
-
-NAME="ispCP Deamon"
-DAEMON=/var/www/ispcp/daemon/ispcp_daemon
-
-
+
-
-opts=""
@@ -43 +41 @@
-
-start() {
-NAME:
+SVCNAME
-    start-stop-daemon --start --exec $DAEMON \
-                --pidfile $PID
@@ -51 +49 @@
-
-stop() {
-NAME:
+SVCNAME
-    start-stop-daemon --stop --exec $DAEMON \
-                --pidfile $PID

trunk/configs/gentoo/init.d/ispcp_network

@@ -1 @@
-bin/sh
+sbin/runscript
-
-# ispCP ω (OMEGA) a Virtual Hosting Control System
@@ -28 +28 @@
-#    http://www.isp-control.net
-#
-### BEGIN INIT INFO
-# Provides:             ispcp_network
-# Required-Start:       $network $local_fs $remote_fs
-# Required-Stop:
-# Should-Stop:          $local_fs
-# Default-Start:        2 3 4 5
-# Default-Stop:         0 1 6
-# Short-Description:    ispCP Network Traffic Logger
-### END INIT INFO
-# Note: do not modify any of these vars here, use /etc/default/$NAME instead
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
-}
-log_end_msg() {
-        local status="$1"
-}
-log_progress_msg () {
-        log_success_msg " $@"
-}
-
-# Logging of warn messages
-function log_warning_msg () {
-    echo -en "$@" echo -e "${stat}${attn} warning${norm}"
-}
-
-# if not present (e.g. *BSD) make sure to provide compatible methods via /etc/default/$NAME
-if [ -f /lib/lsb/init-functions ]; then
-        . /lib/lsb/init-functions
-fi
-
-# Read config file if present.
-if [ -r /etc/default/$NAME ]; then
-        . /etc/default/$NAME
-fi
-
-if [ $START -eq 0 ]; then
-        log_warning_msg "Not starting $DESC: edit /etc/default/$NAME."
-        exit 1
-fi
-
-add_rules() {
@@ -128 +81 @@
-        ${IPTABLES} -A ISPCP_INPUT -j RETURN
-        ${IPTABLES} -A ISPCP_OUTPUT -j RETURN
-
-        # Touch lock file
-        touch $LFILE
-}
-
@@ -140 +90 @@
-        ${IPTABLES} -X ISPCP_INPUT 2>> "$LOGFILE"
-        ${IPTABLES} -X ISPCP_OUTPUT 2>> "$LOGFILE"
-
-        # Remove lock file
-        rm $LFILE
-}
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
-
-        log_end_msg $?
-        ;;
-  stop)
-        log_daemon_msg "Stopping $DESC" "$NAME"
-        if [ ! -e "$LFILE" ]; then
-                echo ""
-                log_warning_msg "${NAME} is already stopped" >&2
-        else
-                remove_rules
-        fi
-
-        log_end_msg $?
-        ;;
-  restart|force-reload)
-        log_daemon_msg "Stopping $DESC" "$NAME"
-
-        if [ ! -e "$LFILE" ]; then
-                echo ""
-                log_warning_msg "${NAME} is already stopped" >&2
-        else
-                remove_rules
-                log_end_msg $?
-                [ -n "$DIETIME" ] && sleep "$DIETIME"
-        fi
-
-        log_daemon_msg "Starting $DESC" "$NAME"
-
-        add_rules
-
-        log_end_msg $?
-
-        ;;
-  status)
-        log_daemon_msg "Checking status of $DESC" "$NAME"
-
-        if [ ! -e "$LFILE" ]; then
-           log_progress_msg "stopped"
-        else
-           log_progress_msg "started"
-        fi
-
-        echo ""
-        ;;
-  *)
-        echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload|status}" >&2
-        exit 1
-        ;;
-esac
-
-exit 0

trunk/configs/gentoo/ispcp.conf

@@ -152 +152 @@
-FTPD_CONF_FILE = /etc/proftpd/proftpd.conf
-
+FTPD_MIN_UID = 10000
+FTPD_MIN_GID = 10000
+
-#
-# BIND data
@@ -175 +178 @@
-AWSTATS_CONFIG_DIR = /etc/awstats
-
-usr/lib
-
-usr/share
+var/www/localhost
+
+var/www/localhost/htdocs
-
-AWSTATS_ROOT_DIR = /var/www/ispcp/engine/awstats
@@ -201 +204 @@
-APACHE_MODS_DIR = /etc/apache2/modules.d
-
-/
+
-
-APACHE_CUSTOM_SITES_CONFIG_DIR = /etc/apache2/ispcp
@@ -207 +210 @@
-APACHE_SUEXEC_USER_PREF = vu
-
-2
-
-2
+10
+
+10
-
-APACHE_USER = apache
@@ -223 +226 @@
-POSTFIX_MASTER_CONF_FILE = /etc/postfix/master.cf
-
-
-
-
+spool/
+
+spool/
-
-MTA_LOCAL_ALIAS_HASH = /etc/mail/aliases
@@ -241 +244 @@
-MTA_SENDER_ACCESS_HASH = /etc/postfix/ispcp/sender-access
-
-4
-
-4
+00
+
+00
-
-MTA_MAILBOX_UID_NAME = vmail
@@ -251 +254 @@
-MTA_MAILBOX_GID_NAME = mail
-
-var/spool/postfix/etc
+etc/sasl2
-
-ETC_SASLDB_FILE = /etc/sasl2/sasldb2

trunk/configs/gentoo/postfix/main.cf

@@ -100 +100 @@
-                               reject_unlisted_recipient,
-                               check_policy_service inet:127.0.0.1:12525,
-1003
+6000