Geändert:

[people/pmueller/ipfire-2.x.git] / config / httpd / httpd.conf

diff --git a/config/httpd/httpd.conf b/config/httpd/httpd.conf
index ad54da9051e2659148126646a37de6ad425e5a38..b5ba5db599c01c69f5afdb4335dc6259c0d58bf9 100644 (file)
--- a/config/httpd/httpd.conf
+++ b/config/httpd/httpd.conf
@@ -18,9 +18,8 @@ MaxSpareServers 2
 StartServers 2
 MaxClients 10
 MaxRequestsPerChild 100
-Port 81
-Listen 81
-Listen 445
+Port 444
+Listen 444
 User nobody
 Group nobody
 ServerAdmin root@localhost
@@ -44,18 +43,22 @@ RewriteRule .* - [F]
 <DirectoryMatch "/home/httpd/html/(graphs|sgraph)">
     AuthName "Restricted"
     AuthType Basic
-    AuthUserFile CONFIG_ROOT/auth/users
+    AuthUserFile /var/ipfire/auth/users
     require user admin
 </DirectoryMatch>
 ScriptAlias /cgi-bin/ /home/httpd/cgi-bin/
 <Directory /home/httpd/cgi-bin>
     AllowOverride None
     Options None
-    AuthName "Restricted"
+    AuthName "IPFire - Restricted"
     AuthType Basic
-    AuthUserFile CONFIG_ROOT/auth/users
+    AuthUserFile /var/ipfire/auth/users
     Require user admin
-    <Files index.cgi>
+    <Files chpasswd.cgi>
+        Satisfy Any
+        Allow from All
+    </Files>
+    <Files webaccess.cgi>
         Satisfy Any
         Allow from All
     </Files>
@@ -110,7 +113,7 @@ SSLRandomSeed connect builtin
 SSLLog      /var/log/httpd/ssl_engine_log
 SSLLogLevel info
 
-<VirtualHost _default_:445>
+<VirtualHost _default_:444>
     RewriteEngine on
     RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK|OPTIONS)
     RewriteRule .* - [F]
@@ -142,7 +145,7 @@ SSLLogLevel info
     AllowOverride None
     AuthName "Restricted"
     AuthType Basic
-    AuthUserFile /var/ipcop/auth/users
+    AuthUserFile /var/ipfire/auth/users
     require user admin
 </Directory>