specinfra 2.66.2 → 2.66.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da11d4c8d78efcde9e37dd56889503a7837b3b3c
-  data.tar.gz: 04b91ce43d6b888d4739089b906a776208a6636a
+  metadata.gz: b4b85d1227851c39e1540056a8a1e7590ea02e65
+  data.tar.gz: 00bb970909c3a2251cf608aedfdf6bb2594b3fa1
 SHA512:
-  metadata.gz: 2fb6a04e6b2327426efef5a5c651a5ea29d803764e28e941261d66c3fa8e32d0e246b276e173629b54aa05166441f73673e0fec04775c0d90bfc9aad9ece1245
-  data.tar.gz: 027d4403172a600b79049cace4bb9a3b9bd0fd53ed51ce049b1b01f2de6e912e42b8701f7f26f4d03655fd11f2902fecf765660550933895548eae60d96c1014
+  metadata.gz: 9ffe659b15d44fa2045dd05916a62d2a4c04bc79c7a27e3fb9f3749317c6e529aa44a1ffd7042efddf3af86a50008e89069cea88cbb7899c6486fe8112dd84f2
+  data.tar.gz: 40db7a4a586ac36f143e8c4eb9e5c4af30a16b3fa37186d0a09a365f4f10a2ccc7f26e89376d5d471dc8b690761e74d498bee2524f1bf2f4d2e9bac60e69667d

data/lib/specinfra/command/linux/base/selinux.rb

@@ -2,11 +2,11 @@ class Specinfra::Command::Linux::Base::Selinux < Specinfra::Command::Base::Selin
   class << self
     def check_has_mode(mode, policy = nil)
       cmd =  ""
-      cmd += "test ! -f /etc/selinux/config || (" if mode == "disabled"
-      cmd += "getenforce | grep -i -- #{escape(mode)}"
+      cmd += "test ! -f /etc/selinux/config || ( " if mode == "disabled"
+      cmd += "(getenforce | grep -i -- #{escape(mode)})"
+      cmd += " || (getenforce | grep -i -- #{escape('permissive')}) )" if mode == "disabled"
       cmd += %Q{ && grep -iE -- '^\\s*SELINUX=#{escape(mode)}\\>' /etc/selinux/config}
       cmd += %Q{ && grep -iE -- '^\\s*SELINUXTYPE=#{escape(policy)}\\>' /etc/selinux/config} if policy != nil
-      cmd += ")" if mode == "disabled"
       cmd
     end
   end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.66.2"
+  VERSION = "2.66.3"
 end

data/spec/command/linux/selinux_spec.rb

@@ -4,24 +4,25 @@ property[:os] = nil
 set :os, :family => 'linux'
 
 describe get_command(:check_selinux_has_mode, 'disabled') do
-  it do 
-    should eq %Q{test ! -f /etc/selinux/config || (} +
-              %Q{getenforce | grep -i -- disabled} +
-              %Q{ && grep -iE -- '^\\s*SELINUX=disabled\\>' /etc/selinux/config)}
-  end 
+  it do
+    should eq %Q{test ! -f /etc/selinux/config || ( (} +
+              %Q{getenforce | grep -i -- disabled) ||} +
+              %Q{ (getenforce | grep -i -- permissive) )} +
+              %Q{ && grep -iE -- '^\\s*SELINUX=disabled\\>' /etc/selinux/config}
+  end
 end
 
 describe get_command(:check_selinux_has_mode, 'permissive', nil) do
-  it do 
-    should eq %Q{getenforce | grep -i -- permissive} +
+  it do
+    should eq %Q{(getenforce | grep -i -- permissive)} +
               %Q{ && grep -iE -- '^\\s*SELINUX=permissive\\>' /etc/selinux/config}
-  end 
+  end
 end
 
 describe get_command(:check_selinux_has_mode, 'enforcing', 'targeted') do
-  it do 
-    should eq %Q{getenforce | grep -i -- enforcing} +
+  it do
+    should eq %Q{(getenforce | grep -i -- enforcing)} +
               %Q{ && grep -iE -- '^\\s*SELINUX=enforcing\\>' /etc/selinux/config} +
               %Q{ && grep -iE -- '^\\s*SELINUXTYPE=targeted\\>' /etc/selinux/config}
-  end 
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.66.2
+  version: 2.66.3
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-05 00:00:00.000000000 Z
+date: 2016-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp