rpms/httpd/devel httpd.spec,1.63,1.64
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Apr 26 08:25:36 UTC 2005
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org-1.9.95.gccXXXXX.noquotesonjavaver.patch, NONE, 1.1 openoffice.org.spec, 1.162, 1.163 openoffice.org-1.9.95.dbXXXXX.configureerror.berkleydb.patch, 1.2, NONE
- Next message (by thread): rpms/crypto-utils/devel Makefile, 1.1, 1.2 certwatch.c, 1.6, 1.7 certwatch.cron, 1.2, 1.3 certwatch.xml, 1.1, 1.2 crypto-utils.spec, 1.12, 1.13 genkey.xml, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jorton
Update of /cvs/dist/rpms/httpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15507
Modified Files:
httpd.spec
Log Message:
* Tue Apr 26 2005 Joe Orton <jorton at redhat.com> 2.0.54-6
- fix key/cert locations in post script
Index: httpd.spec
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- httpd.spec 25 Apr 2005 21:35:08 -0000 1.63
+++ httpd.spec 26 Apr 2005 08:25:34 -0000 1.64
@@ -7,7 +7,7 @@
Summary: Apache HTTP Server
Name: httpd
Version: 2.0.54
-Release: 5
+Release: 6
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
Source1: index.html
@@ -418,14 +418,14 @@
/sbin/chkconfig --del httpd
fi
-%define certdir %{_sysconfdir}/pki/ssl/certs
-%define keydir %{_sysconfdir}/pki/ssl/private
+%define sslcert %{_sysconfdir}/pki/tls/certs/localhost.crt
+%define sslkey %{_sysconfdir}/pki/tls/private/localhost.key
%post -n mod_ssl
umask 077
-if [ ! -f %{keydir}/localhost.key ] ; then
-%{_bindir}/openssl genrsa -rand /proc/apm:/proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/pci:/proc/rtc:/proc/uptime 1024 > %{keydir}/localhost.key 2> /dev/null
+if [ ! -f %{sslkey} ] ; then
+%{_bindir}/openssl genrsa -rand /proc/apm:/proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/pci:/proc/rtc:/proc/uptime 1024 > %{sslkey} 2> /dev/null
fi
FQDN=`hostname`
@@ -433,10 +433,10 @@
FQDN=localhost.localdomain
fi
-if [ ! -f %{certdir}/localhost.crt ] ; then
-cat << EOF | %{_bindir}/openssl req -new -key %{keydir}/localhost.key \
+if [ ! -f %{sslcert} ] ; then
+cat << EOF | %{_bindir}/openssl req -new -key %{sslkey} \
-x509 -days 365 -set_serial $RANDOM \
- -out %{certdir}/localhost.crt 2>/dev/null
+ -out %{sslcert} 2>/dev/null
--
SomeState
SomeCity
@@ -547,6 +547,9 @@
%{_libdir}/httpd/build/libtool
%changelog
+* Tue Apr 26 2005 Joe Orton <jorton at redhat.com> 2.0.54-6
+- fix key/cert locations in post script
+
* Mon Apr 25 2005 Joe Orton <jorton at redhat.com> 2.0.54-5
- create default dummy cert in /etc/pki/tls
- use a pseudo-random serial number on the dummy cert
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org-1.9.95.gccXXXXX.noquotesonjavaver.patch, NONE, 1.1 openoffice.org.spec, 1.162, 1.163 openoffice.org-1.9.95.dbXXXXX.configureerror.berkleydb.patch, 1.2, NONE
- Next message (by thread): rpms/crypto-utils/devel Makefile, 1.1, 1.2 certwatch.c, 1.6, 1.7 certwatch.cron, 1.2, 1.3 certwatch.xml, 1.1, 1.2 crypto-utils.spec, 1.12, 1.13 genkey.xml, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list