Merge branch 'master' into enhancement-iis_vdir_add_command_ending_slash

sous-chefs · May 16, 2017 · d583ca7 · d583ca7
2 parents 3ab43ea + 516d052
commit d583ca7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/resources/pool.rb b/resources/pool.rb
@@ -411,6 +411,7 @@ def configure
       end
     end
 
+    Chef::Log.warn("username: #{new_resource.username} password: #{new_resource.password} identity_type: #{new_resource.identity_type}")
     # Application Pool Identity Settings
     if new_resource.username && new_resource.username != ''
       cmd = default_app_pool_user
@@ -424,12 +425,10 @@ def configure
         Chef::Log.debug(cmd)
         shell_out!(cmd)
       end
-    elsif (new_resource.username || new_resource.username == '') &&
-          (new_resource.password || new_resource.username == '') &&
-          (new_resource.identity_type != 'SpecificUser')
+    elsif new_resource.identity_type != 'SpecificUser'
       converge_if_changed :identity_type do
         cmd = "#{appcmd(node)} set config /section:applicationPools"
-        cmd << " \"/[name='#{new_resource.name}'].processModel.identityType:#{new_resource.identity}\""
+        cmd << " \"/[name='#{new_resource.name}'].processModel.identityType:#{new_resource.identity_type}\""
         Chef::Log.debug(cmd)
         shell_out!(cmd)
       end

diff --git a/test/cookbooks/test/recipes/pool.rb b/test/cookbooks/test/recipes/pool.rb
@@ -55,3 +55,8 @@
   pipeline_mode :Integrated
   action [:add, :config, :start]
 end
+
+iis_pool 'test_identity_type' do
+  identity_type :NetworkService
+  action [:add, :config, :start]
+end
diff --git a/test/integration/pool/controls/pool_spec.rb b/test/integration/pool/controls/pool_spec.rb
@@ -45,3 +45,9 @@
   its('managed_pipeline_mode') { should eq 'Integrated' }
   it { should have_name('My App Pool') }
 end
+
+describe iis_pool('test_identity_type') do
+  it { should exist }
+  it { should be_running }
+  its('identity_type') { should eq 'NetworkService' }
+end