OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Christoph Schug
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   15-Mar-2007 07:33:57
  Branch: HEAD                             Handle: 2007031506335600

  Modified files:
    openpkg-src/apache-php4 apache-php4.spec apache.conf

  Log:
    keep in sync with apache package: provide reasonable virtual host
    entry for out-of-the-box SSL support

  Summary:
    Revision    Changes     Path
    1.11        +1  -1      openpkg-src/apache-php4/apache-php4.spec
    1.2         +35 -0      openpkg-src/apache-php4/apache.conf
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache-php4/apache-php4.spec
  ============================================================================
  $ cvs diff -u -r1.10 -r1.11 apache-php4.spec
  --- openpkg-src/apache-php4/apache-php4.spec  13 Mar 2007 16:42:48 -0000      
1.10
  +++ openpkg-src/apache-php4/apache-php4.spec  15 Mar 2007 06:33:56 -0000      
1.11
  @@ -68,7 +68,7 @@
   Group:        Web
   License:      ASF
   Version:      %{V_apache}
  -Release:      20070313
  +Release:      20070315
   
   #   package options (suexec related)
   %option       with_suexec               yes
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/apache-php4/apache.conf
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 apache.conf
  --- openpkg-src/apache-php4/apache.conf       7 Feb 2007 22:18:00 -0000       
1.1
  +++ openpkg-src/apache-php4/apache.conf       15 Mar 2007 06:33:56 -0000      
1.2
  @@ -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>
  +
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to