diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index af3050f..3ae4ace 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -179,24 +179,20 @@ class puppet::server inherits puppet::client {
         before      => File["/etc/puppet/puppet.conf"],
     }
 
-    case $operatingsystem {
-        debian,ubuntu: {
-            include apache::server
-            apache::a2enmod { "headers": }
-            apache::a2enmod { "proxy": }
-            apache::a2enmod { "proxy_balancer": }
-            apache::a2enmod { "proxy_http": }
-            apache::a2enmod { "ssl": }
-        }
-        default: {
-            include apache::sslserver
-        }
-    }
+    include apache::sslserver
     apache::configfile { "puppet.conf":
         content => template("puppet/puppet-httpd.conf.erb"),
         http    => false,
         require => Service["puppetmaster"],
     }
+    case $operatingsystem {
+        debian,ubuntu: {
+            apache::debian::a2enmod { "headers": }
+            apache::debian::a2enmod { "proxy": }
+            apache::debian::a2enmod { "proxy_http": }
+            apache::debian::a2enmod { "proxy_balancer": }
+        }
+    }
 
     include mongrel
     include ldap::client::ruby
diff --git a/puppet/templates/puppet-httpd.conf.erb b/puppet/templates/puppet-httpd.conf.erb
index 57530b0..21b1c66 100644
--- a/puppet/templates/puppet-httpd.conf.erb
+++ b/puppet/templates/puppet-httpd.conf.erb
@@ -24,6 +24,12 @@ Listen 8140
 
 <VirtualHost _default_:8140>
 
+# Use separate log files for the SSL virtual host; note that LogLevel
+# is not inherited from httpd.conf.
+ErrorLog /srv/www/log/https/<%= fqdn %>/error_log
+CustomLog /srv/www/log/https/<%= fqdn %>/access_log combined
+LogLevel warn
+
 #   SSL Engine Switch:
 #   Enable/Disable SSL for this virtual host.
 SSLEngine on