diff --git a/modules/iis_demo/manifests/app.pp b/modules/iis_demo/manifests/app.pp index 0564244..43ab0a6 100644 --- a/modules/iis_demo/manifests/app.pp +++ b/modules/iis_demo/manifests/app.pp @@ -69,6 +69,10 @@ class iis_demo::app ( # Create IIS sites # ############################################################################ + file { $path: + ensure => directory, + } + if !defined(Iis_site[$iis_site_name]) { iis_site { $iis_site_name: ensure => 'started', @@ -111,10 +115,6 @@ class iis_demo::app ( # Create application # ############################################################################ - file { $path: - ensure => directory, - } - file { "${path}\\Website": ensure => directory, } diff --git a/modules/iis_demo/manifests/uninstall_iis.pp b/modules/iis_demo/manifests/uninstall_iis.pp index 311124d..2779f74 100644 --- a/modules/iis_demo/manifests/uninstall_iis.pp +++ b/modules/iis_demo/manifests/uninstall_iis.pp @@ -14,12 +14,7 @@ class iis_demo::uninstall_iis ( dsc_ensure => 'absent', dsc_name => 'Web-Server', #require => Package['powershell'], - notify => Reboot['reboot_uninstall_iis'], - } - - reboot { 'reboot_uninstall_iis': - when => refreshed, - timeout => 15, + notify => Reboot['dsc_reboot'], } file { 'C:\\inetpub': @@ -29,4 +24,9 @@ class iis_demo::uninstall_iis ( force => true, } + reboot { 'dsc_reboot': + when => refreshed, + timeout => 15, + } + }