6 files changed, 12 insertions, 8 deletions
diff --git a/modules/apache/manifests/mod/deflate.pp b/modules/apache/manifests/mod/deflate.pp
deleted file mode 100644
index 0e2211aa..00000000
--- a/modules/apache/manifests/mod/deflate.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class apache::mod::deflate {
-    include apache::base
-    package { 'apache-mod_deflate': }
-}
diff --git a/modules/apache/manifests/mod/fastcgi.pp b/modules/apache/manifests/mod/fastcgi.pp
index 4f10ccab..2b421291 100644
--- a/modules/apache/manifests/mod/fastcgi.pp
+++ b/modules/apache/manifests/mod/fastcgi.pp
@@ -2,3 +2,4 @@ class apache::mod::fastcgi {
     include apache::base
     package { 'apache-mod_fastcgi': }
 }
+
diff --git a/modules/apache/manifests/mod/fcgid.pp b/modules/apache/manifests/mod/fcgid.pp
index 6c815681..b8186a64 100644
--- a/modules/apache/manifests/mod/fcgid.pp
+++ b/modules/apache/manifests/mod/fcgid.pp
@@ -1,4 +1,11 @@
 class apache::mod::fcgid {
     include apache::base
     package { 'apache-mod_fcgid': }
+
+    file { 'urlescape':
+        path    => '/usr/local/bin/urlescape',
+        mode    => '0755',
+        notify  => Service['apache'],
+        content => template('apache/urlescape'),
+    }
 }
diff --git a/modules/apache/manifests/mod/php.pp b/modules/apache/manifests/mod/php.pp
index c5de893e..2c8d6733 100644
--- a/modules/apache/manifests/mod/php.pp
+++ b/modules/apache/manifests/mod/php.pp
@@ -4,7 +4,7 @@ class apache::mod::php {
 
     package { 'apache-mod_php': }
 
-    apache::config { '/etc/httpd/conf.d/mod_php.conf':
+    apache::config { "${apache::base::conf_d}/mod_php.conf":
         content => template('apache/mod/php.conf'),
     }
 }
diff --git a/modules/apache/manifests/mod/ssl.pp b/modules/apache/manifests/mod/ssl.pp
index 6e9be525..ab3d24e4 100644
--- a/modules/apache/manifests/mod/ssl.pp
+++ b/modules/apache/manifests/mod/ssl.pp
@@ -14,7 +14,7 @@ class apache::mod::ssl {
     apache::config {
         '/etc/httpd/conf/vhosts.d/01_default_ssl_vhost.conf':
             content => template('apache/01_default_ssl_vhost.conf');
-        '/etc/httpd/conf.d/ssl.conf':
-            content => template('apache/mod/ssl.conf');
+        "${apache::base::conf_d}/ssl_vhost.conf":
+            content => template('apache/mod/ssl_vhost.conf');
     }
 }
diff --git a/modules/apache/manifests/mod/wsgi.pp b/modules/apache/manifests/mod/wsgi.pp
index d2ab72d2..7f4fb719 100644
--- a/modules/apache/manifests/mod/wsgi.pp
+++ b/modules/apache/manifests/mod/wsgi.pp
@@ -6,7 +6,7 @@ class apache::mod::wsgi {
         ensure => directory,
     }
 
-    apache::config { '/etc/httpd/conf.d/mod_wsgi.conf':
+    apache::config { "${apache::base::conf_d}/mod_wsgi.conf":
         content => template('apache/mod/wsgi.conf'),
     }
 }