Merge pull request #852 from richm/bug/modules-1332

(#MODULES-1332) set osfamily default for wsgi_socket_prefix
xbezdick · Sep 26, 2014 · 3782afd · 3782afd
2 parents 452a012 + 8d09ecd
commit 3782afd
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/manifests/mod/wsgi.pp b/manifests/mod/wsgi.pp
@@ -1,5 +1,5 @@
 class apache::mod::wsgi (
-  $wsgi_socket_prefix = undef,
+  $wsgi_socket_prefix = $::apache::params::wsgi_socket_prefix,
   $wsgi_python_path   = undef,
   $wsgi_python_home   = undef,
 ){

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -93,6 +93,11 @@
     $fastcgi_lib_path     = undef
     $mime_support_package = 'mailcap'
     $mime_types_config    = '/etc/mime.types'
+    if $::osfamily == "RedHat" {
+      $wsgi_socket_prefix = '/var/run/wsgi'
+    } else {
+      $wsgi_socket_prefix = undef
+    }
   } elsif $::osfamily == 'Debian' {
     $user                = 'www-data'
     $group               = 'www-data'
@@ -194,6 +199,7 @@
         }
       }
     }
+    $wsgi_socket_prefix = undef
   } elsif $::osfamily == 'FreeBSD' {
     $user             = 'www'
     $group            = 'www'
@@ -255,6 +261,7 @@
     $fastcgi_lib_path     = undef # TODO: revisit
     $mime_support_package = 'misc/mime-support'
     $mime_types_config    = '/usr/local/etc/mime.types'
+    $wsgi_socket_prefix   = undef
   } else {
     fail("Class['apache::params']: Unsupported osfamily: ${::osfamily}")
   }

diff --git a/spec/classes/mod/wsgi_spec.rb b/spec/classes/mod/wsgi_spec.rb
@@ -18,7 +18,10 @@
       }
     end
     it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('wsgi') }
+    it { is_expected.to contain_class('apache::mod::wsgi').with(
+        'wsgi_socket_prefix' => nil
+      )
+    }
     it { is_expected.to contain_package("libapache2-mod-wsgi") }
   end
   context "on a RedHat OS" do
@@ -34,7 +37,10 @@
       }
     end
     it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('wsgi') }
+    it { is_expected.to contain_class('apache::mod::wsgi').with(
+        'wsgi_socket_prefix' => '/var/run/wsgi'
+      )
+    }
     it { is_expected.to contain_package("mod_wsgi") }
 
     describe "with custom WSGISocketPrefix" do
@@ -63,7 +69,10 @@
       }
     end
     it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('wsgi') }
+    it { is_expected.to contain_class('apache::mod::wsgi').with(
+        'wsgi_socket_prefix' => nil
+      )
+    }
     it { is_expected.to contain_package("www/mod_wsgi") }
   end
 end