diff options
| author | jorton <jorton@fedoraproject.org> | 2005-04-26 08:25:34 +0000 |
|---|---|---|
| committer | jorton <jorton@fedoraproject.org> | 2005-04-26 08:25:34 +0000 |
| commit | 670541ea80a438b82ce48ceb2b78a78c68bc9205 (patch) | |
| tree | d6475ec5b60ad00f6cd1c48f950faf0b44134b84 | |
| parent | 06872c83d1fba3932d001e91b81c47eaea5a31f5 (diff) | |
| download | httpd-670541ea80a438b82ce48ceb2b78a78c68bc9205.tar.gz httpd-670541ea80a438b82ce48ceb2b78a78c68bc9205.tar.xz httpd-670541ea80a438b82ce48ceb2b78a78c68bc9205.zip | |
- fix key/cert locations in post scripthttpd-2_0_54-6
| -rw-r--r-- | httpd.spec | 19 |
1 files changed, 11 insertions, 8 deletions
@@ -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 @@ if [ $1 = 0 ]; then /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 @@ if [ "x${FQDN}" = "x" ]; then 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 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/httpd/build/libtool %changelog +* Tue Apr 26 2005 Joe Orton <jorton@redhat.com> 2.0.54-6 +- fix key/cert locations in post script + * Mon Apr 25 2005 Joe Orton <jorton@redhat.com> 2.0.54-5 - create default dummy cert in /etc/pki/tls - use a pseudo-random serial number on the dummy cert |