get mitCAclient.pem from debathena-ssl-certificates

svn path=/trunk/packages/invirt-web/; revision=2048

diff --git a/debian/changelog b/debian/changelog
index 2318003..7fbf7de 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ invirt-web (0.0.18) unstable; urgency=low
 
   * depend on apache2, remctl-client, libapache2-mod-auth-sslcert,
     python-dnspython
+  * get mitCAclient.pem from debathena-ssl-certificates
 
- -- Greg Price <price@mit.edu>  Sat, 31 Jan 2009 02:55:42 -0500
+ -- Greg Price <price@mit.edu>  Sat, 31 Jan 2009 02:58:08 -0500
 
 invirt-web (0.0.17) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index ca962e5..6ea4765 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Depends: ${misc:Depends}, apache2, libapache2-mod-fcgid, python-flup,
  invirt-vnc-client, invirt-dns, remctl-client, kstart, debathena-afs-config,
  invirt-base, invirt-web-iptables, libapache2-svn, libapache2-mod-auth-sslcert,
  libapache2-mod-auth-kerb, mail-transport-agent, subversion, zephyr-clients,
- openafs-modules-xen, cron
+ openafs-modules-xen, cron, debathena-ssl-certificates
 Provides: ${diverted-files}
 Conflicts: ${diverted-files}
 Description: the Invirt web interface

diff --git a/files/etc/apache2/sites-available/ssl.mako b/files/etc/apache2/sites-available/ssl.mako
index ec47ec3..3ce7e5f 100644 (file)
--- a/files/etc/apache2/sites-available/ssl.mako
+++ b/files/etc/apache2/sites-available/ssl.mako
@@ -46,7 +46,7 @@ ${caller.body()}
        SSLCertificateFile ssl/server.crt
        SSLCertificateKeyFile ssl/server.key
        
-       SSLCACertificateFile ssl/mitCAclient.pem
+       SSLCACertificateFile /etc/ssl/certs/mitCAclient.pem
        SSLVerifyDepth 10
 
        SSLOptions +StdEnvVars