summaryrefslogtreecommitdiff
path: root/www/apache22/files/patch-docs:conf:httpd-std.conf
blob: eb63c30ac79a3c04477c7900536cc8dd72bb1904 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
--- docs/conf/httpd-std.conf.orig	Fri Nov  9 07:31:28 2001
+++ docs/conf/httpd-std.conf	Sat Nov 17 01:49:29 2001
@@ -64,7 +64,7 @@
 #
 <IfModule !mpm_winnt.c>
 <IfModule !perchild.c>
-ScoreBoardFile logs/apache_runtime_status
+ScoreBoardFile /var/run/apache_runtime_status
 </IfModule>
 </IfModule>
 
@@ -73,7 +73,7 @@
 # PidFile: The file in which the server should record its process
 # identification number when it starts.
 #
-PidFile logs/httpd.pid
+PidFile /var/run/httpd.pid
 
 #
 # Timeout: The number of seconds before receives and sends time out.
@@ -229,8 +229,8 @@
 #  when the value of (unsigned)Group is above 60000; 
 #  don't use Group #-1 on these systems!
 #
-User nobody
-Group #-1
+User www
+Group www
 </IfModule>
 
 #
@@ -259,7 +259,7 @@
 # documents. By default, all requests are taken from this directory, but
 # symbolic links and aliases may be used to point to other locations.
 #
-DocumentRoot "@@ServerRoot@@/htdocs"
+DocumentRoot "@@ServerRoot@@/www/data"
 
 #
 # Each directory to which Apache has access, can be configured with respect
@@ -284,7 +284,7 @@
 #
 # This should be changed to whatever you set DocumentRoot to.
 #
-<Directory "@@ServerRoot@@/htdocs">
+<Directory "@@ServerRoot@@/www/data">
 
 #
 # This may also be "None", "All", or any combination of "Indexes",
@@ -377,7 +377,7 @@
 # TypesConfig describes where the mime.types file (or equivalent) is
 # to be found.
 #
-TypesConfig conf/mime.types
+TypesConfig etc/apache/mime.types
 
 #
 # DefaultType is the default MIME type the server will use for a document
@@ -396,7 +396,7 @@
 # directive tells the module where the hint definitions are located.
 #
 <IfModule mod_mime_magic.c>
-    MIMEMagicFile conf/magic
+    MIMEMagicFile etc/apache/magic
 </IfModule>
 
 #
@@ -416,7 +416,7 @@
 # logged here.  If you *do* define an error logfile for a <VirtualHost>
 # container, that host's errors will be logged there and not here.
 #
-ErrorLog logs/error_log
+ErrorLog /var/log/httpd-error.log
 
 #
 # LogLevel: Control the number of messages logged to the error_log.
@@ -441,7 +441,7 @@
 # define per-<VirtualHost> access logfiles, transactions will be
 # logged therein and *not* in this file.
 #
-CustomLog logs/access_log common
+#CustomLog logs/access_log common
 
 #
 # If you would like to have agent and referer logfiles, uncomment the
@@ -454,7 +454,7 @@
 # If you prefer a single logfile with access, agent, and referer information
 # (Combined Logfile Format) you can use the following directive.
 #
-#CustomLog logs/access_log combined
+CustomLog /var/log/httpd-access.log combined
 
 #
 # Optionally add a line containing the server version and virtual host
@@ -478,9 +478,9 @@
 # We include the /icons/ alias for FancyIndexed directory listings.  If you
 # do not use FancyIndexing, you may comment this out.
 #
-Alias /icons/ "@@ServerRoot@@/icons/"
+Alias /icons/ "@@ServerRoot@@/www/icons/"
 
-<Directory "@@ServerRoot@@/icons">
+<Directory "@@ServerRoot@@/www/icons">
     Options Indexes MultiViews
     AllowOverride None
     Order allow,deny
@@ -492,9 +492,9 @@
 # the manual, even if you choose to move your DocumentRoot.  You may comment
 # this out if you do not care for the documentation.
 #
-Alias /manual "@@ServerRoot@@/manual"
+Alias /manual "@@ServerRoot@@/share/doc/apache"
 
-<Directory "@@ServerRoot@@/manual">
+<Directory "@@ServerRoot@@/share/doc/apache">
     Options Indexes FollowSymLinks MultiViews
     AllowOverride None
     Order allow,deny
@@ -509,21 +509,21 @@
 # The same rules about trailing "/" apply to ScriptAlias directives as to
 # Alias.
 #
-ScriptAlias /cgi-bin/ "@@ServerRoot@@/cgi-bin/"
+ScriptAlias /cgi-bin/ "@@ServerRoot@@/www/cgi-bin/"
 
 <IfModule mod_cgid.c>
 #
 # Additional to mod_cgid.c settings, mod_cgid has Scriptsock <path>
 # for setting UNIX socket for communicating with cgid.
 #
-#Scriptsock            logs/cgisock
+Scriptsock            /var/run/cgisock
 </IfModule>
 
 #
 # "@@ServerRoot@@/cgi-bin" should be changed to whatever your ScriptAliased
 # CGI directory exists, if you have that configured.
 #
-<Directory "@@ServerRoot@@/cgi-bin">
+<Directory "@@ServerRoot@@/www/cgi-bin">
     AllowOverride None
     Options None
     Order allow,deny
@@ -851,9 +851,9 @@
 #
 
 <IfModule mod_include.c>
-    Alias /error/ "@@ServerRoot@@/error/"
+    Alias /error/ "@@ServerRoot@@/www/error/"
 
-    <Directory "@@ServerRoot@@/error">
+    <Directory "@@ServerRoot@@/www/error">
         AllowOverride None
         Options IncludesNoExec
         AddOutputFilter Includes html
@@ -964,7 +964,7 @@
 # Bring in additional module-specific configurations
 #
 <IfModule mod_ssl.c>
-    Include conf/ssl.conf
+    Include etc/apache/ssl.conf
 </IfModule>