OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 14-Mar-2007 20:26:08
Branch: HEAD Handle: 2007031419260800
Modified files:
openpkg-src/apache apache.conf apache.spec
Log:
Merge From Enterprise (MFE): provide reasonable virtual host entry for
out-of-the-box SSL support
Summary:
Revision Changes Path
1.6 +35 -0 openpkg-src/apache/apache.conf
1.387 +1 -1 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.conf
============================================================================
$ cvs diff -u -r1.5 -r1.6 apache.conf
--- openpkg-src/apache/apache.conf 14 May 2005 20:41:42 -0000 1.5
+++ openpkg-src/apache/apache.conf 14 Mar 2007 19:26:08 -0000 1.6
@@ -8,6 +8,10 @@
Listen 127.0.0.1:80
NameVirtualHost 127.0.0.1:80
+<IfModule mod_ssl.c>
+Listen 127.0.0.1:443
+</IfModule>
+
<VirtualHost 127.0.0.1:80>
ServerName @[EMAIL PROTECTED]@l_domainname@
ServerAlias [EMAIL PROTECTED]@
@@ -31,3 +35,34 @@
</Directory>
</VirtualHost>
+<IfModule mod_ssl.c>
+<VirtualHost 127.0.0.1:443>
+ ServerName @[EMAIL PROTECTED]@l_domainname@
+ ServerAlias [EMAIL PROTECTED]@
+ ServerAdmin [EMAIL PROTECTED]@l_domainname@
+ ServerSignature on
+
+ DocumentRoot @l_prefix@/share/apache/htdocs
+ <Directory @l_prefix@/share/apache/htdocs>
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride none
+ Order allow,deny
+ Allow from all
+ </Directory>
+
+ ScriptAlias /cgi-bin @l_prefix@/cgi
+ <Directory @l_prefix@/cgi>
+ Options Indexes FollowSymLinks MultiViews ExecCGI
+ AllowOverride None
+ Order allow,deny
+ Allow from all
+ </Directory>
+
+ SSLEngine on
+ SSLCertificateFile @l_prefix@/etc/apache/ssl.crt/snakeoil-rsa.crt
+ SSLCertificateKeyFile @l_prefix@/etc/apache/ssl.key/snakeoil-rsa.key
+ SSLCertificateFile @l_prefix@/etc/apache/ssl.crt/snakeoil-dsa.crt
+ SSLCertificateKeyFile @l_prefix@/etc/apache/ssl.key/snakeoil-dsa.key
+</VirtualHost>
+</IfModule>
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.386 -r1.387 apache.spec
--- openpkg-src/apache/apache.spec 13 Mar 2007 16:42:48 -0000 1.386
+++ openpkg-src/apache/apache.spec 14 Mar 2007 19:26:08 -0000 1.387
@@ -68,7 +68,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20070313
+Release: 20070314
# package options (suexec related)
%option with_suexec yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
