Re: [PATCH] make pathnames in ssl-std.conf configurable

2002-07-17 Thread Peter Poeml 

On Tue, Jul 16, 2002 at 03:54:36PM -0700, Justin Erenkrantz wrote:
 On Mon, Jul 15, 2002 at 06:57:05PM +0200, Peter Poeml wrote:
  Hi, 
  
  I'd like to propose to create ssl-std.conf from ssl-std.conf.in, just as
  it is done with httpd-std.conf.in. Then, the log file paths could be
  substituted in the same flexible way. 
  
  Currently, of patching / hand editing is necessary for adjustments in
  that file.
 
 In the past, we have been relucant to have SSL work for people
 out-of-the-box.

I understand.

 I don't have a problem with adding this, but I would like some
 buy-in from others before committing this.  I think we've
 discussed this before and the consensus was not to subsitute
 values for ssl-std.conf.  -- justin

Hhm, but mod_ssl conveniently patched conf/httpd.conf-dist to
contain the pathnames enclosed in ..., so they would be substituted
together with all other pathnames in httpd.conf-dist.

So now it is harder than before...

Peter

-- 
VFS: Busy inodes after unmount. Self-destruct in 5 seconds.  Have a nice day...

Re: [PATCH] make pathnames in ssl-std.conf configurable

2002-07-16 Thread Justin Erenkrantz 

On Mon, Jul 15, 2002 at 06:57:05PM +0200, Peter Poeml wrote:
 Hi, 
 
 I'd like to propose to create ssl-std.conf from ssl-std.conf.in, just as
 it is done with httpd-std.conf.in. Then, the log file paths could be
 substituted in the same flexible way. 
 
 Currently, of patching / hand editing is necessary for adjustments in
 that file.

In the past, we have been relucant to have SSL work for people
out-of-the-box.

I don't have a problem with adding this, but I would like some
buy-in from others before committing this.  I think we've
discussed this before and the consensus was not to subsitute
values for ssl-std.conf.  -- justin

[PATCH] make pathnames in ssl-std.conf configurable

2002-07-15 Thread Peter Poeml 

Hi, 

I'd like to propose to create ssl-std.conf from ssl-std.conf.in, just as
it is done with httpd-std.conf.in. Then, the log file paths could be
substituted in the same flexible way. 

Currently, of patching / hand editing is necessary for adjustments in
that file.

I've attached a diff between docs/conf/ssl-std.conf and a suggestion for
a docs/conf/ssl-std.conf.in (for readability reasons).

Then, I have attached a real diff to apply against the current head
branch (for your convenience). 

The latter patch, finally, also adds docs/conf/ssl-std.conf to AC_OUTPUT
in configure.in. 

Thanks,
Peter

-- 
VFS: Busy inodes after unmount. Self-destruct in 5 seconds.  Have a nice day...


--- ssl-std.confThu May 16 21:05:24 2002
+++ ssl-std.conf.in Mon Jul 15 18:30:32 2002
@@ -29,8 +29,8 @@
 # Dynamic Shared Object (DSO) Support
 #
 # To be able to use the functionality of a module which was built as a DSO you
-#ErrorLog logs/dummy-host.example.com-error_log
-#CustomLog logs/dummy-host.example.com-access_log common
+#ErrorLog @rel_logfiledir@/dummy-host.example.com-error_log
+#CustomLog @rel_logfiledir@/dummy-host.example.com-access_log common
 
 ##
 ##  SSL Global Context
@@ -55,15 +55,15 @@
 #   Configure the SSL Session Cache: First the mechanism 
 #   to use and second the expiring timeout (in seconds).
 #SSLSessionCachenone
-#SSLSessionCacheshmht:logs/ssl_scache(512000)
-#SSLSessionCacheshmcb:logs/ssl_scache(512000)
-SSLSessionCache dbm:logs/ssl_scache
+#SSLSessionCacheshmht:@localstatedir@/ssl_scache(512000)
+#SSLSessionCacheshmcb:@localstatedir@/ssl_scache(512000)
+SSLSessionCache dbm:@localstatedir@/ssl_scache
 SSLSessionCacheTimeout  300
 
 #   Semaphore:
 #   Configure the path to the mutual exclusion semaphore the
 #   SSL engine uses internally for inter-process synchronization. 
-SSLMutex  file:logs/ssl_mutex
+SSLMutex  file:@localstatedir@/ssl_mutex
 
 #   Pseudo Random Number Generator (PRNG):
 #   Configure one or more sources to seed the PRNG of the 
@@ -89,11 +89,11 @@
 VirtualHost _default_:443
 
 #  General setup for the virtual host
-DocumentRoot @@ServerRoot@@/htdocs
+DocumentRoot @exp_htdocsdir@
 ServerName new.host.name:443
 ServerAdmin [EMAIL PROTECTED]
-ErrorLog logs/error_log
-TransferLog logs/access_log
+ErrorLog @rel_logfiledir@/error_log
+TransferLog @rel_logfiledir@/access_log
 
 #   SSL Engine Switch:
 #   Enable/Disable SSL for this virtual host.
@@ -111,16 +111,16 @@
 #   in mind that if you have both an RSA and a DSA certificate you
 #   can configure both in parallel (to also allow the use of DSA
 #   ciphers, etc.)
-SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server.crt
-#SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server-dsa.crt
+SSLCertificateFile @rel_sysconfdir@/ssl.crt/server.crt
+#SSLCertificateFile @rel_sysconfdir@/ssl.crt/server-dsa.crt
 
 #   Server Private Key:
 #   If the key is not combined with the certificate, use this
 #   directive to point at the key file.  Keep in mind that if
 #   you've both a RSA and a DSA private key you can configure
 #   both in parallel (to also allow the use of DSA ciphers, etc.)
-SSLCertificateKeyFile @@ServerRoot@@/conf/ssl.key/server.key
-#SSLCertificateKeyFile @@ServerRoot@@/conf/ssl.key/server-dsa.key
+SSLCertificateKeyFile @rel_sysconfdir@/ssl.key/server.key
+#SSLCertificateKeyFile @rel_sysconfdir@/ssl.key/server-dsa.key
 
 #   Server Certificate Chain:
 #   Point SSLCertificateChainFile at a file containing the
@@ -129,7 +129,7 @@
 #   the referenced file can be the same as SSLCertificateFile
 #   when the CA certificates are directly appended to the server
 #   certificate for convinience.
-#SSLCertificateChainFile @@ServerRoot@@/conf/ssl.crt/ca.crt
+#SSLCertificateChainFile @rel_sysconfdir@/ssl.crt/ca.crt
 
 #   Certificate Authority (CA):
 #   Set the CA certificate verification path where to find CA
@@ -138,8 +138,8 @@
 #   Note: Inside SSLCACertificatePath you need hash symlinks
 # to point to the certificate files. Use the provided
 # Makefile to update the hash symlinks after changes.
-#SSLCACertificatePath @@ServerRoot@@/conf/ssl.crt
-#SSLCACertificateFile @@ServerRoot@@/conf/ssl.crt/ca-bundle.crt
+#SSLCACertificatePath @rel_sysconfdir@/ssl.crt
+#SSLCACertificateFile @rel_sysconfdir@/ssl.crt/ca-bundle.crt
 
 #   Certificate Revocation Lists (CRL):
 #   Set the CA revocation path where to find CA CRLs for client
@@ -148,8 +148,8 @@
 #   Note: Inside SSLCARevocationPath you need hash symlinks
 # to point to the certificate files. Use the provided
 # Makefile to update the hash symlinks after changes.
-#SSLCARevocationPath @@ServerRoot@@/conf/ssl.crl
-#SSLCARevocationFile @@ServerRoot@@/conf/ssl.crl/ca-bundle.crl
+#SSLCARevocationPath @rel_sysconfdir@/ssl.crl
+#SSLCARevocationFile @rel_sysconfdir@/ssl.crl/ca-bundle.crl
 
 #   Client Authentication (Type):
 #   Client certificate verification type