Merge branch 'cyberious-master'

ninja-2 · Aug 8, 2014 · 70f5b28 · 70f5b28
2 parents 1404b80 + 9467612
commit 70f5b28
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/manifests/manage_binding.pp b/manifests/manage_binding.pp
@@ -25,7 +25,7 @@
 
     if ($protocol == 'https') {
       validate_re($certificate_thumbprint, ['^(.)+$'], 'certificate_thumbprint required for https bindings')
-      if ($ip_address == '*' or $ip_address == '0.0.0.0') {
+      if ($ip_address == '0.0.0.0') {
         fail('https bindings require a valid ip_address')
       }
 

diff --git a/spec/defines/manage_binding_spec.rb b/spec/defines/manage_binding_spec.rb
@@ -95,7 +95,7 @@
         :ip_address             => '*',
     } }
 
-    it { expect { should contain_exec('Attach-Certificate-myWebSite-port-443')}.to raise_error(Puppet::Error, /https bindings require a valid ip_address/) }
+    it { should contain_exec('Attach-Certificate-myWebSite-port-443')}
   end
 
   describe 'when protocol is https and ip address 0.0.0.0' do