Ticket #1101: patch-100308

File patch-100308, 2.6 kB (added by blocker, 9 months ago)
Line 
1 Index: configs/dists/freebsd/apache/BSDmakefile
2 ===================================================================
3 --- configs/dists/freebsd/apache/BSDmakefile    (revision 1043)
4 +++ configs/dists/freebsd/apache/BSDmakefile    (working copy)
5 @@ -1,7 +1,9 @@
6  .include <../../../../Makefile.fbsd>
7  
8  APACHE_EXT_CONF=$(INST_PREF)/usr/local/etc/apache22/Includes
9 -APACHE_MOD_CONF=$(INST_PREF)/usr/local/etc/apache22/extra/
10 +APACHE_MOD_CONF=$(INST_PREF)/usr/local/etc/apache22/extra
11 +ROOT_APACHE_CONF=$(ROOT_CONF)/apache22
12 +
13  install:
14  
15         $(SYSTEM_MAKE_DIRS) $(SYSTEM_CONF)/apache22
16 Index: docs/FreeBSD/INSTALL
17 ===================================================================
18 --- docs/FreeBSD/INSTALL        (revision 1043)
19 +++ docs/FreeBSD/INSTALL        (working copy)
20 @@ -19,7 +19,7 @@
21  ispCP ω Version:       1.0.0 RC4
22  INSTALL Script:                2.0
23  Maintainer:
24 -Homepage:                      http://www.isp-contol.net
25 +Homepage:              http://www.isp-control.net
26  Linux Distros:         FreeBSD
27  
28  ================================================================================
29 @@ -35,7 +35,7 @@
30  All FreeBSD required packages are listed in
31  ./docs/FreeBSD/freebsd-packages
32  
33 -The configuration is costumize for using with apache 2.2.x version using suexec
34 +The configuration is costumize for use with apache 2.2.x version using suexec
35  module enable.
36  ================================================================================
37  3) Introduction
38 @@ -147,7 +147,7 @@
39  ------
40  
41  Q.- How can I prevent websites using more than their bandwidth limit to stop working?
42 -A.- Please install and configure apache2 mod_cband package/port
43 +A.- Please install and configure apache 2.2.x mod_cband package/port
44  
45  Please check http://www.isp-control.net for any questions not answered in this file.
46  
47 Index: Makefile.fbsd
48 ===================================================================
49 --- Makefile.fbsd       (revision 1043)
50 +++ Makefile.fbsd       (working copy)
51 @@ -5,13 +5,13 @@
52  HOST_OS=freebsd
53  
54  ROOT_CONF=$(INST_PREF)/usr/local/etc
55 -SYSTEM_ROOT=$(INST_PREF)/usr/local/www/apache22/ispcp
56 +SYSTEM_ROOT=$(INST_PREF)/usr/local/www/ispcp
57  SYSTEM_CONF=$(INST_PREF)/usr/local/etc/ispcp
58  SYSTEM_LOG=$(INST_PREF)/var/log/ispcp
59 -SYSTEM_APACHE_BACK_LOG=$(INST_PREF)/usr/local/www/apache22/logs/backup
60 -SYSTEM_VIRTUAL=$(INST_PREF)/usr/local/www/apache22/data
61 +SYSTEM_APACHE_BACK_LOG=$(INST_PREF)/usr/local/www/logs/backup
62 +SYSTEM_VIRTUAL=$(INST_PREF)/usr/local/www/data
63  SYSTEM_AWSTATS=$(INST_PREF)/usr/local/www/awstats
64 -SYSTEM_FCGI=$(INST_PREF)/usr/local/www/apache22/fcgi
65 +SYSTEM_FCGI=$(INST_PREF)/usr/local/www/fcgi
66  SYSTEM_MAIL_VIRTUAL=$(INST_PREF)/var/mail/virtual
67  SYSTEM_MAKE_DIRS=/bin/mkdir -p
68