Changeset 994

Timestamp:

02/07/08 10:24:06 (7 months ago)

Author:

rats

Message:

CentOS / Slackware:
* Fixed #760: ispcp_daemon not working under Slackware 12.0 or CentOS 5
* Fixed #900: /tmp/ispcp-1.0.0/etc/ispcp empty after make install on CentOS 5
* Added: Slackware documentation
* Updated Debian, CentOS, Slackware

Files:

• trunk/CHANGELOG (modified) (1 diff)
• trunk/Makefile.centos (modified) (1 diff)
• trunk/configs/dists/centos/Makefile (modified) (2 diffs)
• trunk/configs/dists/centos/apache/00_master.conf (modified) (1 diff)
• trunk/configs/dists/centos/apache/01_awstats.conf (modified) (2 diffs)
• trunk/configs/dists/centos/apache/Makefile (modified) (2 diffs)
• trunk/configs/dists/centos/apache/fastcgi.conf (modified) (1 diff)
• trunk/configs/dists/centos/apache/fastcgi2.conf (modified) (2 diffs)
• trunk/configs/dists/centos/apache/httpd.conf (modified) (1 diff)
• trunk/configs/dists/centos/apache/parts/als_entry.tpl (modified) (2 diffs)
• trunk/configs/dists/centos/apache/parts/custom.conf.tpl (added)
• trunk/configs/dists/centos/apache/parts/dmn_awstats_b.tpl (modified) (1 diff)
• trunk/configs/dists/centos/apache/parts/dmn_awstats_dynamic_entry.tpl (added)
• trunk/configs/dists/centos/apache/parts/dmn_awstats_e.tpl (modified) (1 diff)
• trunk/configs/dists/centos/apache/parts/dmn_awstats_entry.tpl (deleted)
• trunk/configs/dists/centos/apache/parts/dmn_awstats_static_entry.tpl (added)
• trunk/configs/dists/centos/apache/parts/dmn_entry.tpl (modified) (3 diffs)
• trunk/configs/dists/centos/apache/parts/sub_entry.tpl (modified) (2 diffs)
• trunk/configs/dists/centos/awstats/Makefile (modified) (1 diff)
• trunk/configs/dists/centos/awstats/awstats.ispcp_tpl.conf (modified) (66 diffs)
• trunk/configs/dists/centos/bind/parts/db_e.tpl (modified) (1 diff)
• trunk/configs/dists/centos/bind/parts/db_master_e.tpl (modified) (1 diff)
• trunk/configs/dists/centos/cron.d/Makefile (modified) (1 diff)
• trunk/configs/dists/centos/cron.d/ispcp (modified) (2 diffs)
• trunk/configs/dists/centos/cron.d/parts/dmn_awstats_b.tpl (added)
• trunk/configs/dists/centos/cron.d/parts/dmn_awstats_e.tpl (added)
• trunk/configs/dists/centos/cron.d/parts/dmn_awstats_entry.tpl (added)
• trunk/configs/dists/centos/cron.d/working/ispcp (modified) (1 diff)
• trunk/configs/dists/centos/database/database.sql (modified) (4 diffs)
• trunk/configs/dists/centos/database/languages.sql (modified) (3 diffs)
• trunk/configs/dists/centos/fcgi/parts/master/php4-fcgi-starter.tpl (modified) (1 diff)
• trunk/configs/dists/centos/fcgi/parts/master/php4/php.ini (modified) (1 diff)
• trunk/configs/dists/centos/fcgi/parts/master/php5-fcgi-starter.tpl (modified) (1 diff)
• trunk/configs/dists/centos/fcgi/parts/master/php5/php.ini (modified) (2 diffs)
• trunk/configs/dists/centos/fcgi/parts/php4-fcgi-starter.tpl (modified) (1 diff)
• trunk/configs/dists/centos/fcgi/parts/php4/php.ini (modified) (27 diffs)
• trunk/configs/dists/centos/fcgi/parts/php5-fcgi-starter.tpl (modified) (1 diff)
• trunk/configs/dists/centos/fcgi/parts/php5/php.ini (modified) (5 diffs)
• trunk/configs/dists/centos/init.d/ispcp_daemon (modified) (1 diff)
• trunk/configs/dists/centos/init.d/ispcp_network (modified) (1 diff)
• trunk/configs/dists/centos/ispcp.conf (modified) (14 diffs)
• trunk/configs/dists/centos/logrotate/ispcp (modified) (2 diffs)
• trunk/configs/dists/centos/postfix/main.cf (modified) (5 diffs)
• trunk/configs/dists/centos/postfix/master.cf (modified) (1 diff)
• trunk/configs/dists/centos/proftpd/proftpd.conf (modified) (8 diffs)
• trunk/configs/dists/centos/proftpd/proftpd1.3.conf (added)
• trunk/configs/dists/centos/proftpd/proftpd3.conf (deleted)
• trunk/configs/ispcp.conf (modified) (2 diffs)
• trunk/docs/CentOS/INSTALL (modified) (10 diffs)
• trunk/docs/CentOS/centos-packages (modified) (6 diffs)
• trunk/docs/CentOS/centos-perl (modified) (2 diffs)
• trunk/docs/Debian/INSTALL (modified) (5 diffs)
• trunk/docs/Slackware (added)
• trunk/docs/Slackware/INSTALL (added)

trunk/CHANGELOG

@@ -2 +2 @@
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
+2008-02-07 Benedikt Heintel
+        - DISTS:
+                CentOS / Slackware:
+                * Fixed #760: ispcp_daemon not working under Slackware 12.0 or CentOS 5
+                * Fixed #900: /tmp/ispcp-1.0.0/etc/ispcp empty after make install on CentOS 5
+                * Added: Slackware documentation
+        - DOCU:
+                * Updated Debian, CentOS, Slackware
+
-2008-02-07 Christian Hernmarck
-        - GUI:
-                * Added: use utf8 with the database, including config var to switch off
-
-2008-02-05 Benedikt Heintel
-        - RELEASE ispCP ω Omega 1.0.0 RC3
-
-5
+6
-        - GUI:
-                * Fixed: Graphical issue on reseller/order.php

trunk/Makefile.centos

@@ -5 +5 @@
-endif
-
-centos
+redhat
-
-ROOT_CONF=$(INST_PREF)/etc

trunk/configs/dists/centos/Makefile

@@ -6 +6 @@
-        if test $(HOST_OS) = centos ; then \
-                cp ./ispcp.conf $(SYSTEM_CONF) ; \
-cd ./apache && $(MAKE) install ; cd .. 
-cd ./awstats && $(MAKE) install ; cd .. 
-cd ./bind && $(MAKE) install ; cd .. 
-cd ./cron.d && $(MAKE) install ; cd .. 
-cd ./database && $(MAKE) install ; cd .. 
-cd ./fcgi && $(MAKE) install ; cd .. 
-cd ./init.d && $(MAKE) install ; cd .. 
-cd ./postfix && $(MAKE) install ; cd .. 
-cd ./courier && $(MAKE) install ; cd .. 
-cd ./proftpd && $(MAKE) install ; cd .. 
-cd ./logrotate && $(MAKE) install ; cd .. 
+(cd ./apache && $(MAKE) install &)
+(cd ./awstats && $(MAKE) install &)
+(cd ./bind && $(MAKE) install &)
+(cd ./cron.d && $(MAKE) install &)
+(cd ./database && $(MAKE) install &)
+(cd ./fcgi && $(MAKE) install &)
+(cd ./init.d && $(MAKE) install &)
+(cd ./postfix && $(MAKE) install &)
+(cd ./courier && $(MAKE) install &)
+(cd ./proftpd && $(MAKE) install &)
+(cd ./logrotate && $(MAKE) install)
-        fi
-
@@ -23 +23 @@
-        if test $(HOST_OS) = centos ; then \
-                rm -rf $(SYSTEM_CONF)/ispcp.conf ;  \
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        fi

trunk/configs/dists/centos/apache/00_master.conf

@@ -29 +29 @@
-    Alias /ftp      {ROOT_DIR}/gui/tools/filemanager/
-
-
+
+
+
-
-    <Directory {ROOT_DIR}/gui>

trunk/configs/dists/centos/apache/01_awstats.conf

@@ -3 +3 @@
-# AWStats Begin
-#
+
+Alias /awstatsicons "{AWSTATS_WEB_DIR}/icon/"
+
-
-NameVirtualHost 127.0.0.1:80
@@ -10 +13 @@
-    <IfModule mod_rewrite.c>
-        RewriteEngine on
-       
-       
+        
+        
-    </IfModule>
-
-/usr/lib/cgi-bin
+{AWSTATS_ENGINE_DIR}
-
-/usr/lib/cgi-bin
+{AWSTATS_ENGINE_DIR}
-        AllowOverride none
-        Options +ExecCGI

trunk/configs/dists/centos/apache/Makefile

@@ -11 +11 @@
-        $(SYSTEM_MAKE_DIRS) $(ROOT_APACHE_CONF)/ispcp
-
-        cp ./httpd.conf ./working/ispcp.conf
-        cp ./fastcgi.conf ./working/fastcgi_ispcp.conf
-        cp ./httpd.conf $(SYSTEM_CONF)/apache
-        cp ./00_master.conf $(SYSTEM_CONF)/apache
@@ -20 +18 @@
-        cp -R ./working $(SYSTEM_CONF)/apache
-
-
+
+
+
+
-
-uninstall:
-
-        rm -rf $(SYSTEM_CONF)/apache
-
-
+
+
+
+

trunk/configs/dists/centos/apache/fastcgi.conf

@@ -28 +28 @@
-        FastCgiWrapper On
-        FastCgiIpcDir /var/lib/apache2/fastcgi
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-        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}

trunk/configs/dists/centos/apache/fastcgi2.conf

@@ -1 @@
-- Virtual Hosting Control System | Omega Version
+a Virtual Hosting Control System
-# Copyright (c) 2006-2007 by ispCP | http://isp-control.net
-#
@@ -23 +23 @@
-#
-# @TODO :
-# - Finish PHP5 Support
-# - Finish config Fastcgi
-
-<IfModule mod_fastcgi.c>
-
-
-
-
-
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
-
-
+
+
+
-
-
-
-
-
+
-
-
-
+
+
+
+
+
+
+
+

trunk/configs/dists/centos/apache/httpd.conf

@@ -27 +27 @@
-
-#
+# let the customer decide what charset he likes to use
+#
+
+AddDefaultCharset Off
+
+#
-# Header End
-#

trunk/configs/dists/centos/apache/parts/als_entry.tpl

@@ -6 +6 @@
-    #
-
-
+
+
+
-
-    ServerAdmin     webmaster@{ALS_NAME}
@@ -50 +52 @@
-    </Directory>
-
+    Include {CUSTOM_SITES_CONFIG_DIR}/{ALS_NAME}.conf
+
-</VirtualHost>

trunk/configs/dists/centos/apache/parts/dmn_awstats_b.tpl

@@ -1 @@
- 
+

trunk/configs/dists/centos/apache/parts/dmn_awstats_e.tpl

@@ -1 @@
- 
+

trunk/configs/dists/centos/apache/parts/dmn_entry.tpl

@@ -1 +1 @@
-<VirtualHost {DMN_IP}:80>
-
-
+
+
+
-
-    ServerAdmin     webmaster@{DMN_NAME}
@@ -22 +24 @@
-    ErrorDocument 500 /errors/500.html
-    ErrorDocument 503 /errors/503.html
-
-    Redirect /ispcp http://{BASE_SERVER_VHOST}
-
-    <IfModule mod_cband.c>
@@ -47 +47 @@
-    </Directory>
-
+    Include {CUSTOM_SITES_CONFIG_DIR}/{DMN_NAME}.conf
+
-</VirtualHost>

trunk/configs/dists/centos/apache/parts/sub_entry.tpl

@@ -6 +6 @@
-    #
-
-
+
+
+
-
-    ServerAdmin     webmaster@{DMN_NAME}
@@ -47 +49 @@
-    </Directory>
-
+    Include {CUSTOM_SITES_CONFIG_DIR}/{SUB_NAME}.conf
+
-</VirtualHost>

trunk/configs/dists/centos/awstats/Makefile

@@ -4 +4 @@
-
-        $(SYSTEM_MAKE_DIRS) $(SYSTEM_CONF)/awstats
- $(SYSTEM_CONF)/awstats/awstats.ispcp_tpl.conf
+awstats.ispcp_tpl.conf $(SYSTEM_CONF)/awstats
-
-uninstall:

trunk/configs/dists/centos/awstats/awstats.ispcp_tpl.conf

@@ -1 @@
-4
+6
-#-----------------------------------------------------------------------------
-# Copy this file into awstats.www.mydomain.conf and edit this new config file
@@ -11 +11 @@
-# the config value in an AWStats running session and can be used like others.
-#-----------------------------------------------------------------------------
-18 $ - $Author: eldy $ - $Date: 2005/06/22 23:20:2
+27 $ - $Author: eldy $ - $Date: 2006/04/21 22:28:4
-
-
@@ -46 +46 @@
-# You can also use a pipe if log file come from a pipe :
-# Example: "gzip -d </var/log/apache/access.log.gz |"
-is
+are
-# Example: "/pathtotools/logresolvemerge.pl *.log |"
-#
-/var/log/apache2
+{APACHE_LOG_DIR}
-
-
@@ -145 +145 @@
-# virtual web server. In this case, this parameter is only used to generate
-# full URL's links when ShowLinksOnUrl option is set to 1.
-s
+z
-# Example: "myintranetserver"
-# Example: "www.domain.com"
@@ -166 +166 @@
-# Example: "www.myserver.com localhost 127.0.0.1 REGEX[mydomain\.(net|org)$]"
-#
-\
+.
-
-
@@ -185 +185 @@
-# 2 - DNS Lookup is made only from static DNS cache file (if it exists)
-# Default: 2
- 
-2
-
-
- 
+
+1
+
+
+
-# files (AWStats database). All those files are written in the directory
-# defined by the "DirData" parameter. Set this value to the directory where
@@ -201 +201 @@
-# Default: "."          (means same directory as awstats.pl)
-#
-/var/cache/awstats
+{AWSTATS_CACHE_DIR}
-
-
@@ -210 +210 @@
-# Default: "/cgi-bin"   (means awstats.pl is in "/yourwwwroot/cgi-bin")
-#
-/cgi-bin/awstats
+{AWSTATS_ENGINE_DIR}
-
-
@@ -223 +223 @@
-
-
-
+s
-# allow to "update" statistics from a web browser. Warning, when "update" is
-a
+u
-# in your web server (user "nobody" by default with Apache, "IUSR_XXX" with
-# IIS), so the "DirData" directory and all already existing history files
@@ -231 +231 @@
-# necessary to "Read/Write" (and "Modify" for Windows NTFS file systems).
-# Warning: Update process can be long so you might experience "time out"
-enough frequently
-a
+frequently enough
+u
-# line interface (or a task scheduler).
-# Possible values: 0 or 1
@@ -240 +240 @@
-
-
-
-
-
-
+
+
+
+
+
-# requiring a large amount of time, memory and CPU. This might be a problem
-# for web hosting providers that offer AWStats for large sites, on shared
@@ -256 +257 @@
-# Default: 2
-#
-2
+3
-
-
@@ -264 +265 @@
-#-----------------------------------------------------------------------------
-
-
+s
-# directory. This lock is to avoid to have 2 update processes running at the
-# same time to prevent unknown conflicts problems and avoid DoS attacks when
@@ -329 +330 @@
-
-
-
+s
-# statistics for this domain/config file. This parameter is used only if
-# AllowAccessFromWebToAuthenticatedUsersOnly is set to 1.
@@ -340 +341 @@
-
-
-
-
+d
+s
-# checked and must match one of the IP address values or ranges.
-# Change : Effective immediatly
@@ -350 +351 @@
-
-
-s
+
-# error. However, you can ask AWStats to create it.
- 
+
-# dynamic value for DirData (for example DirData="/home/__REMOTE_USER__") and
-# don't want to have to create a new directory each time they add a new user.
@@ -373 +374 @@
-
-# If you prefer having the report output pages be built as XML compliant pages
-s
+
-# properly with old browsers).
-# Change : Effective immediatly
@@ -386 +387 @@
-# for both command line user and default web server user (nobody for Unix,
-# IUSR_xxx for IIS/Windows,...).
-'s
- 
+
+
-# files with read and write permissions for everyone.
- default user permissions on updated files. If you 
+s default user permissions on updated files. If you
-# set AllowToUpdateStatsFromBrowser to 1, you can change this parameter to 1.
-# Change : Effective for new updates only
@@ -403 +404 @@
-# With 0, no purge is made, so you must use a scheduled task or a web server
-# that make this purge frequently.
-a
+u
-# This parameter doesn't work with IIS (This web server doesn't let its log
-# file to be purged).
@@ -428 +429 @@
-
-
-
+s
-# for the month (awstatsMMYYYY[.*].txt) with the updated one.
-# When write errors occurs (IO, disk full,...), this historic file can be
@@ -451 +452 @@
-
-# Do not include access from clients that match following criteria.
-
-
+d
+d
-# If DNS lookup is already done in your log file, you must enter here hostname
-# criteria, else enter ip address criteria.
@@ -494 +495 @@
-# Default: ""
-#
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-# Include in stats, only accesses from hosts that match one of following
-# entries. For example, if you want AWStats to filter access to keep only
-s
+
-# this parameter.
-# If DNS lookup is already done in your log file, you must enter here hostname
@@ -544 +560 @@
-# Add here a list of kind of url (file extension) that must be counted as
-# "Hit only" and not as a "Hit" and "Page/Download". You can set here all
-s
+
-# are not viewed pages. URLs with such extensions are not included in the TOP
-# Pages/URL report.
@@ -563 +579 @@
-# default in this list as they are not pages seen by a visitor but are
-# protocol exchange codes to tell the browser to ask another page. Because
- 
+
-# add such codes, you will have 2 pages viewed reported for only one in facts.
-# Change : Effective for new updates only
@@ -582 +598 @@
-
-
-s
+
-# login with same value but different case are the same login. To tell AWStats
-s
-
-
-
- 
+
+
+
+
+
-AuthenticatedUsersNotCaseSensitive=0
-
@@ -598 +614 @@
-# Possible values: 0 or 1
-# Default: 0
- 
+
-URLNotCaseSensitive=0
-
@@ -612 +628 @@
-# In URL links, "?" char is used to add parameter's list in URLs. Syntax is:
-# /mypage.html?param1=value1&param2=value2
-s
+
-# their URLs. You can complete this list with all such characters.
-# Change : Effective for new updates only
@@ -628 +644 @@
-# increased if you have a lot of changing URLs (for example URLs with a random
-# id inside). Such web sites should not set this option to 1 or use seriously
- 
+
-# URLWithQueryWithoutFollowingParameters).
-# Change : Effective for new updates only
@@ -635 +651 @@
-# 1 - Full URL with query string is used     (ie: "/mypage.html?p=x&q=y")
-# Default: 0
- 
+
-URLWithQuery=0
-
@@ -653 +669 @@
-# Example: "param"
-# Default: ""
- 
+
-URLWithQueryWithOnlyFollowingParameters=""
-
@@ -671 +687 @@
-# Example: "PHPSESSID jsessionid"
-# Default: ""
- 
+
-URLWithQueryWithoutFollowingParameters=""
-
@@ -684 +700 @@
-# 1 - Full URL with query string is used      (ie: "/mypage.html?p=x&q=y")
-# Default: 0
- 
+
-URLReferrerWithQuery=0
-
@@ -697 +713 @@
-
-
-
+s
-# want (in most cases for security reasons) to have no error messages, you
-# can set this parameter to your personalized generic message.
-# Change : Effective immediatly
-
+r
-# Default: ""
-#
@@ -717 +733 @@
-
-
-
+s
-# if all the first NbOfLinesForCorruptedLog lines have a format that does not
-# match the LogFormat parameter.
@@ -741 +757 @@
-
-# DecodeUA must be set to 1 if you use Roxen web server. This server converts
-os
+OS
-# and browsers detection fail in some cases. Just change it to 1 if and only
-# if your web server is Roxen.
@@ -751 +767 @@
-
-
-
+e
-# things, that can not be tracked on other way, like:
-# - Javascript disabled
@@ -763 +779 @@
-# - Mediaplayer plugin
-# - Acrobat PDF plugin
-is
+ese
-# into a /js/ directory stored in your web document root and add the following
-# HTML code at the end of your index page (but before </BODY>) :
@@ -787 +803 @@
-#-----------------------------------------------------------------------------
-
-Following values allows you to define accuracy of AWStats entities (robots,
-
+The following values allow you to define accuracy of AWStats entities
+(robots, 
-# It might be a good idea for large web sites or ISP that provides AWStats to
-# high number of customers, to set this parameter to 1 (or 0), instead of 2.
-# Possible values:
-
-
-
-
+
+
+
+
+
+
-# Default: 2 (0 for LevelForWormsDetection)
-#
-LevelForBrowsersDetection=2         # 0 disables Browsers detection.
-                                    # 2 reduces AWStats speed by 2%
+                                    # allphones reduces AWStats speed by 5%
-LevelForOSDetection=2               # 0 disables OS detection.
-                                    # 2 reduces AWStats speed by 3%
@@ -830 +849 @@
-
-
-
+s
-# window than the main page.
-# Possible values:
@@ -842 +861 @@
-
-# You can add, in the HTML report page, a cache lifetime (in seconds) that
-
-
+the 
+s
-# Example: 3600
-# Default: 0
@@ -851 +870 @@
-
-# To avoid too large web pages, you can ask AWStats to limit number of rows of
-
+s
-# Default: 1000
-#
@@ -858 +877 @@
-
-# Set your primary language (ISO-639-1 language codes).
-
+s
-#  Albanian=al, Bosnian=ba, Bulgarian=bg, Catalan=ca,
-#  Chinese (Taiwan)=tw, Chinese (Simpliefied)=cn, Croatian=hr, Czech=cz,
-#  Danish=dk, Dutch=nl, English=en, Estonian=et, Euskara=eu, Finnish=fi,
-#  French=fr, Galician=gl, German=de, Greek=gr, Hebrew=he, Hungarian=hu,
-r
+o
-#  Latvian=lv, Norwegian (Nynorsk)=nn, Norwegian (Bokmal)=nb, Polish=pl,
-#  Portuguese=pt, Portuguese (Brazilian)=br, Romanian=ro, Russian=ru,
@@ -878 +897 @@
-# Default: "./lang" (means lang directory is in same location than awstats.pl)
-#
-.
+{AWSTATS_WEB_DIR}
-
-
@@ -885 +904 @@
-# Default: 1
-#
-                                     
+
-
-
@@ -985 +1004 @@
-# Context: Web, Streaming, Mail, Ftp
-# Default: 1, Possible column codes: None
-           
+
-
-# Show operating systems chart
@@ -1039 +1058 @@
-
-# Some graphical reports are followed by the data array of values.
-report size for example), you can
-
+the report size for example), you
+can 
-# Possible values: 0 or 1
-# Default: 1
@@ -1055 +1074 @@
-
-# In the Origin chart, you have stats on where your hits came from. You can
-s hits on pages that comes
+ hits on pages that come
-# Possible values: 0 or 1
-# Default: 0
@@ -1062 +1081 @@
-
-
-Following parameter can be used to choose maximum number of lines shown for
-the particular following report
+The following parameters can be used to choose the maximum number of lines
+shown for the particular following reports
-#
-# Stats by countries/domains
@@ -1108 +1127 @@
-# Choose if you want the week report to start on sunday or monday
-# Possible values:
-
-
+s
+s