Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Ticket #1178: patch-08040802

File patch-08040802, 2.8 kB (added by Blocker, 8 months ago)
Line 
1 Index: freebsd/apache/BSDmakefile
2 ===================================================================
3 --- freebsd/apache/BSDmakefile  (revision 1106)
4 +++ freebsd/apache/BSDmakefile  (working copy)
5 @@ -38,24 +38,24 @@
6  
7  install:
8  
9 -       $(SYSTEM_MAKE_DIRS) $(SYSTEM_CONF)/apache22
10 +       $(SYSTEM_MAKE_DIRS) $(SYSTEM_CONF)/apache
11         $(SYSTEM_MAKE_DIRS) $(APACHE_EXT_CONF)
12         $(SYSTEM_MAKE_DIRS) $(APACHE_MOD_CONF)
13         $(SYSTEM_MAKE_DIRS) $(ROOT_APACHE_CONF)/ispcp
14  
15         cp ./httpd.conf ./working/ispcp.conf
16 -       #cp ./fastcgi.conf ./working/fastcgi_ispcp.conf
17 -       cp ./00_master.conf $(SYSTEM_CONF)/apache22
18 -       cp ./01_awstats.conf $(SYSTEM_CONF)/apache22
19 -       cp ./httpd.conf $(SYSTEM_CONF)/apache22
20 -       cp -R ./backup $(SYSTEM_CONF)/apache22
21 -       cp -R ./parts $(SYSTEM_CONF)/apache22
22 -       cp -R ./working $(SYSTEM_CONF)/apache22
23 +       cp ./fastcgi.conf ./working/fastcgi_ispcp.conf
24 +       cp ./00_master.conf $(SYSTEM_CONF)/apache
25 +       cp ./01_awstats.conf $(SYSTEM_CONF)/apache
26 +       cp ./httpd.conf $(SYSTEM_CONF)/apache
27 +       cp -R ./backup $(SYSTEM_CONF)/apache
28 +       cp -R ./parts $(SYSTEM_CONF)/apache
29 +       cp -R ./working $(SYSTEM_CONF)/apache
30         cp -R ./httpd.conf $(APACHE_EXT_CONF)/ispcp.conf
31         cp -R ./fastcgi.conf $(APACHE_MOD_CONF)/fastcgi_ispcp.conf
32  
33  uninstall:
34  
35 -       rm -rf $(SYSTEM_CONF)/apache22
36 +       rm -rf $(SYSTEM_CONF)/apache
37         rm -rf $(ROOT_APACHE_CONF)/ispcp.conf
38         rm -rf $(APACHE_MOD_CONF)/fastcgi_ispcp.conf
39 Index: freebsd/ispcp.conf
40 ===================================================================
41 --- freebsd/ispcp.conf  (revision 1106)
42 +++ freebsd/ispcp.conf  (working copy)
43 @@ -127,9 +127,9 @@
44  
45  GUI_ROOT_DIR = /usr/local/www/ispcp/gui
46  
47 -APACHE_WWW_DIR = /usr/local/www/data
48 +APACHE_WWW_DIR = /usr/local/www/data/virtual
49  
50 -SCOREBOARDS_DIR = /usr/local/www/scoreboards
51 +SCOREBOARDS_DIR = /usr/local/www/data/scoreboards
52  
53  # Select Zipping Algorithm for Backups
54  # Supported: gzip, bzip2
55 @@ -319,7 +319,7 @@
56  # Virtual traffic manager
57  #
58  
59 -CMD_PFLOGSUM = /usr/sbin/maillogconvert.pl
60 +CMD_PFLOGSUM = /usr/local/www/awstats/tools/maillogconvert.pl
61  
62  TRAFF_LOG_DIR = /var/log
63  
64 Index: freebsd/init.d/ispcp_network
65 ===================================================================
66 --- freebsd/init.d/ispcp_network        (revision 1106)
67 +++ freebsd/init.d/ispcp_network        (working copy)
68 @@ -1,6 +1,6 @@
69  #!/usr/local/bin/bash
70  
71 -echo "currently not ported to BSD"
72 +echo "Starting ispcp_network: currently not ported to BSD"
73  exit 0
74  
75  # ispCP ω (OMEGA) a Virtual Hosting Control System
76 Index: freebsd/awstats/BSDmakefile
77 ===================================================================
78 --- freebsd/awstats/BSDmakefile (revision 1106)
79 +++ freebsd/awstats/BSDmakefile (working copy)
80 @@ -34,8 +34,9 @@
81  
82  install:
83  
84 +       $(SYSTEM_MAKE_DIRS) $(ROOT_CONF)/awstats
85         $(SYSTEM_MAKE_DIRS) $(SYSTEM_CONF)/awstats
86 -       cp -R ./ $(SYSTEM_CONF)/awstats/awstats.ispcp_tpl.conf
87 +       cp -p awstats.ispcp_tpl.conf $(SYSTEM_CONF)/awstats/awstats.ispcp_tpl.conf
88  
89  uninstall:
90