You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2011/05/09 19:02:30 UTC
svn commit: r1101112 - /httpd/httpd/branches/2.2.x/build/rpm/httpd.spec.in
Author: minfrin
Date: Mon May 9 17:02:29 2011
New Revision: 1101112
URL: http://svn.apache.org/viewvc?rev=1101112&view=rev
Log:
rpm spec file: Remove reference to ssl.key and ssl.crt directories in line
with httpd-trunk.
Modified:
httpd/httpd/branches/2.2.x/build/rpm/httpd.spec.in
Modified: httpd/httpd/branches/2.2.x/build/rpm/httpd.spec.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/build/rpm/httpd.spec.in?rev=1101112&r1=1101111&r2=1101112&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/build/rpm/httpd.spec.in (original)
+++ httpd/httpd/branches/2.2.x/build/rpm/httpd.spec.in Mon May 9 17:02:29 2011
@@ -215,8 +215,8 @@ fi
%post -n mod_ssl
umask 077
-if [ ! -f %{_sysconfdir}/httpd/conf/ssl.key/server.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 > %{_sysconfdir}/httpd/conf/ssl.key/server.key 2> /dev/null
+if [ ! -f %{_sysconfdir}/httpd/conf/server.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 > %{_sysconfdir}/httpd/conf/server.key 2> /dev/null
fi
FQDN=`hostname`
@@ -224,8 +224,8 @@ if [ "x${FQDN}" = "x" ]; then
FQDN=localhost.localdomain
fi
-if [ ! -f %{_sysconfdir}/httpd/conf/ssl.crt/server.crt ] ; then
-cat << EOF | %{_bindir}/openssl req -new -key %{_sysconfdir}/httpd/conf/ssl.key/server.key -x509 -days 365 -out %{_sysconfdir}/httpd/conf/ssl.crt/server.crt 2>/dev/null
+if [ ! -f %{_sysconfdir}/httpd/conf/server.crt ] ; then
+cat << EOF | %{_bindir}/openssl req -new -key %{_sysconfdir}/httpd/conf/server.key -x509 -days 365 -out %{_sysconfdir}/httpd/conf/server.crt 2>/dev/null
--
SomeState
SomeCity