rpms/apcupsd/FC-5 apcupsd-httpd.conf,1.1,1.2 apcupsd.spec,1.9,1.10

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/extras/rpms/apcupsd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14420/FC-5

Modified Files:
	apcupsd-httpd.conf apcupsd.spec 
Log Message:
- Fix /etc/httpd/conf.d/apcupsd.conf so DirectoryIndex works (bug #209952).
  Patch from Clive Messer (clive at vacuumtube.org.uk)



Index: apcupsd-httpd.conf
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/FC-5/apcupsd-httpd.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apcupsd-httpd.conf	4 Nov 2005 23:42:56 -0000	1.1
+++ apcupsd-httpd.conf	9 Oct 2006 16:47:42 -0000	1.2
@@ -10,10 +10,10 @@
 # Change the ".example.com" to match your domain or modify
 # access rights to your needs to enable remote access also.
 #
-<Directory "/var/www/apcupsd/">
+<Directory "/var/www/apcupsd">
     DirectoryIndex upsstats.cgi
     AllowOverride None
-    Options ExecCGI
+    Options ExecCGI Indexes
     Order deny,allow
     Deny from all
     Allow from 127.0.0.1


Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/FC-5/apcupsd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- apcupsd.spec	21 Aug 2006 16:43:00 -0000	1.9
+++ apcupsd.spec	9 Oct 2006 16:47:42 -0000	1.10
@@ -1,6 +1,6 @@
 Name:         apcupsd
 Version:      3.12.4
-Release:      1%{?dist}
+Release:      2%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -143,6 +143,10 @@
 
 
 %changelog
+* Mon Oct  9 2006 - Orion Poplawski <orion at cora.nwra.com> - 3.12.4-2
+- Fix /etc/httpd/conf.d/apcupsd.conf so DirectoryIndex works (bug #209952).
+  Patch from Clive Messer (clive at vacuumtube.org.uk)  
+
 * Mon Aug 21 2006 - Orion Poplawski <orion at cora.nwra.com> - 3.12.4-1
 - Update to 3.12.4