11 +# |
11 +# |
12 +# |
12 +# |
13 # Do NOT simply read the instructions in here without understanding |
13 # Do NOT simply read the instructions in here without understanding |
14 # what they do. They're here only as hints or reminders. If you are unsure |
14 # what they do. They're here only as hints or reminders. If you are unsure |
15 # consult the online docs. You have been warned. |
15 # consult the online docs. You have been warned. |
16 @@ -43,14 +49,17 @@ |
16 @@ -44,14 +50,17 @@ |
17 # Dynamic Shared Object (DSO) Support |
17 # Dynamic Shared Object (DSO) Support |
18 # |
18 # |
19 # To be able to use the functionality of a module which was built as a DSO you |
19 # To be able to use the functionality of a module which was built as a DSO you |
20 -# have to place corresponding `LoadModule' lines at this location so the |
20 -# have to place corresponding `LoadModule' lines at this location so the |
21 -# directives contained in it are actually available _before_ they are used. |
21 -# directives contained in it are actually available _before_ they are used. |
36 +</IfDefine> |
36 +</IfDefine> |
37 + |
37 + |
38 @@LoadModule@@ |
38 @@LoadModule@@ |
39 |
39 |
40 <IfModule !mpm_netware_module> |
40 <IfModule !mpm_netware_module> |
41 @@ -63,8 +72,8 @@ |
41 @@ -64,8 +73,8 @@ |
42 # It is usually good practice to create a dedicated user and group for |
42 # It is usually good practice to create a dedicated user and group for |
43 # running httpd, as with most system services. |
43 # running httpd, as with most system services. |
44 # |
44 # |
45 -User daemon |
45 -User daemon |
46 -Group daemon |
46 -Group daemon |
47 +User webservd |
47 +User webservd |
48 +Group webservd |
48 +Group webservd |
49 |
49 |
50 </IfModule> |
50 </IfModule> |
51 </IfModule> |
51 </IfModule> |
52 @@ -86,7 +95,7 @@ |
52 @@ -87,7 +96,7 @@ |
53 # e-mailed. This address appears on some server-generated pages, such |
53 # e-mailed. This address appears on some server-generated pages, such |
54 # as error documents. e.g. [email protected] |
54 # as error documents. e.g. [email protected] |
55 # |
55 # |
56 -ServerAdmin [email protected] |
56 -ServerAdmin [email protected] |
57 +ServerAdmin [email protected] |
57 +ServerAdmin [email protected] |
58 |
58 |
59 # |
59 # |
60 # ServerName gives the name and port that the server uses to identify itself. |
60 # ServerName gives the name and port that the server uses to identify itself. |
61 @@ -95,7 +104,7 @@ |
61 @@ -96,7 +105,7 @@ |
62 # |
62 # |
63 # If your host doesn't have a registered DNS name, enter its IP address here. |
63 # If your host doesn't have a registered DNS name, enter its IP address here. |
64 # |
64 # |
65 -#ServerName www.example.com:@@Port@@ |
65 -#ServerName www.example.com:@@Port@@ |
66 +ServerName 127.0.0.1 |
66 +ServerName 127.0.0.1 |
67 |
67 |
68 # |
68 # |
69 # DocumentRoot: The directory out of which you will serve your |
69 # DocumentRoot: The directory out of which you will serve your |
70 @@ -329,6 +338,10 @@ |
70 @@ -330,6 +339,10 @@ |
71 # |
71 # |
72 #AddType text/html .shtml |
72 #AddType text/html .shtml |
73 #AddOutputFilter INCLUDES .shtml |
73 #AddOutputFilter INCLUDES .shtml |
74 + |
74 + |
75 + # Add a new mime.type for .p5i file extension so that clicking on |
75 + # Add a new mime.type for .p5i file extension so that clicking on |
76 + # this file type on a web page launches PackageManager in a Webinstall mode. |
76 + # this file type on a web page launches PackageManager in a Webinstall mode. |
77 + AddType application/vnd.pkg5.info .p5i |
77 + AddType application/vnd.pkg5.info .p5i |
78 </IfModule> |
78 </IfModule> |
79 |
79 |
80 # |
80 # |
81 @@ -362,43 +375,22 @@ |
81 @@ -370,43 +383,22 @@ |
82 |
82 |
83 # Supplemental configuration |
83 # Supplemental configuration |
84 # |
84 # |
85 -# The configuration files in the @rel_sysconfdir@/extra/ directory can be |
85 -# The configuration files in the @rel_sysconfdir@/extra/ directory can be |
86 -# included to add extra features or to modify the default configuration of |
86 -# included to add extra features or to modify the default configuration of |