diff --git a/modules/iis_demo/manifests/app.pp b/modules/demo/manifests/iis.pp similarity index 94% rename from modules/iis_demo/manifests/app.pp rename to modules/demo/manifests/iis.pp index fb33023..0799753 100644 --- a/modules/iis_demo/manifests/app.pp +++ b/modules/demo/manifests/iis.pp @@ -6,10 +6,10 @@ # Date: April 2018 ### -class iis_demo::app ( +class demo::iis ( String $app_pool_name = 'TestAppPool', - String $service_account_password = lookup('iis_demo::app::service_account_password'), - String $service_account_username = lookup('iis_demo::app::service_account_username'), + String $service_account_password = lookup('demo::app::service_account_password'), + String $service_account_username = lookup('demo::app::service_account_username'), String $iis_site_name = 'TestIisSite', String $iis_webapp_name = 'TestWebSite', String $path = 'C:\\inetpub\\wwwroot\\Test', @@ -17,7 +17,7 @@ class iis_demo::app ( String $message = '23/05/2019', ) { - require iis_demo::iis + require demo::iis_prereqs ############################################################################ # Create application pool and applicationpool # @@ -63,7 +63,7 @@ class iis_demo::app ( startup_time_limit => '00:01:30', state => 'started', user_name => $service_account_username, - require => Class['iis_demo::iis'], + require => Class['demo::iis_prereqs'], } ############################################################################ # Create IIS sites # @@ -122,7 +122,7 @@ class iis_demo::app ( file { "${path}\\${iis_webapp_name}\\index.html": ensure => file, - content => template('iis_demo/index.html.erb'), + content => template('demo/index.html.erb'), } iis_application { "${iis_site_name}\\${iis_webapp_name}": diff --git a/modules/iis_demo/manifests/iis.pp b/modules/demo/manifests/iis_prereqs.pp similarity index 99% rename from modules/iis_demo/manifests/iis.pp rename to modules/demo/manifests/iis_prereqs.pp index 9c22c07..8e84ce5 100644 --- a/modules/iis_demo/manifests/iis.pp +++ b/modules/demo/manifests/iis_prereqs.pp @@ -6,7 +6,7 @@ # Date: April 2018 ### -class iis_demo::iis ( +class demo::iis_prereqs ( ) { diff --git a/modules/demo/manifests/toolbasewin.pp b/modules/demo/manifests/toolbasewin.pp new file mode 100644 index 0000000..38e54c0 --- /dev/null +++ b/modules/demo/manifests/toolbasewin.pp @@ -0,0 +1,22 @@ +class demo::wintools ( + String $notepadplusplus = false, + String $baretail = false, + ) { + + include chocolatey + + if $notepadplusplus { + package { 'baretail': + ensure => installed, + provider => chocolatey, + } + } + + if $baretail { + package { 'notepadplusplus': + ensure => installed, + provider => chocolatey, + } + } + +} diff --git a/modules/iis_demo/manifests/uninstall_iis.pp b/modules/demo/manifests/uninstall_iis.pp similarity index 96% rename from modules/iis_demo/manifests/uninstall_iis.pp rename to modules/demo/manifests/uninstall_iis.pp index 70d31ea..f8a9727 100644 --- a/modules/iis_demo/manifests/uninstall_iis.pp +++ b/modules/demo/manifests/uninstall_iis.pp @@ -6,7 +6,7 @@ # Date: April 2018 ### -class iis_demo::uninstall_iis ( +class demo::uninstall_iis ( String $app_pool_name = 'TestAppPool', String $iis_site_name = 'TestIisSite', String $iis_webapp_name = 'TestWebSite', diff --git a/modules/iis_demo/templates/index.html.erb b/modules/demo/templates/index.html.erb similarity index 100% rename from modules/iis_demo/templates/index.html.erb rename to modules/demo/templates/index.html.erb diff --git a/modules/iis_demo/manifests/iis_prereqs.pp b/modules/iis_demo/manifests/iis_prereqs.pp deleted file mode 100644 index 5931301..0000000 --- a/modules/iis_demo/manifests/iis_prereqs.pp +++ /dev/null @@ -1,134 +0,0 @@ -#### -# Class: intapp iis iis_prereqs -# Description: Installing IIS Windows Feature and all other necessary features -# Customer: Freshfields Bruckhaus Deringer -# Author: WM Promus -# Date: April 2018 -### - -class iis_demo::iis_prereqs ( -) { - - include chocolatey - include iis_demo::iis - - dsc_windowsfeature { '.NET Framework 4.5': - dsc_ensure => 'present', - dsc_name => 'AS-NET-Framework', - #require => Package['powershell'], - notify => Reboot['reboot_iis'], - } - - dsc_windowsfeature { 'Web Server (IIS) Support': - dsc_ensure => 'present', - dsc_name => 'AS-Web-Support', - #require => Package['powershell'], - notify => Reboot['reboot_iis'], - } - - dsc_windowsfeature { 'HTTP Activation': - dsc_ensure => 'present', - dsc_name => 'AS-HTTP-Activation', - require => Dsc_windowsfeature['Web Server (IIS) Support'], - notify => Reboot['reboot_iis'], - } - - dsc_windowsfeature { 'Storage Services': - dsc_ensure => 'present', - dsc_name => 'Storage-Services', - require => Dsc_windowsfeature['Web Server (IIS) Support'], - notify => Reboot['reboot_iis'], - } - - dsc_windowsfeature { '.NET Framework 4.5 Core': - dsc_ensure => 'present', - dsc_name => 'NET-Framework-45-Core', - require => Dsc_windowsfeature['Web Server (IIS) Support'], - notify => Reboot['reboot_iis'], - } - - dsc_windowsfeature { 'ASP .NET 4.5': - dsc_ensure => 'present', - dsc_name => 'NET-Framework-45-ASPNET', - require => Dsc_windowsfeature['Web Server (IIS) Support'], - notify => Reboot['reboot_iis'], - } - - #dsc_windowsfeature { 'NET WCF HTTP Activation': - # dsc_ensure => 'present', - # dsc_name => 'NET-WCF-HTTP-Activation', - # require => Dsc_windowsfeature['Web Server (IIS) Support'], - # notify => Reboot['reboot_iis'], - #} - - #dsc_windowsfeature { 'TCP Port Sharing': - # dsc_ensure => 'present', - # dsc_name => 'NET-WCF-TCP-PortSharing', - # require => Dsc_windowsfeature['Web Server (IIS) Support'], - # notify => Reboot['reboot_iis'], - #} - - dsc_windowsfeature { 'Ink and Handwriting Services': - dsc_ensure => 'present', - dsc_name => 'InkAndHandwritingServices', - require => Dsc_windowsfeature['Web Server (IIS) Support'], - notify => Reboot['reboot_iis'], - } - - dsc_windowsfeature { 'Media Foundation': - dsc_ensure => 'present', - dsc_name => 'Server-Media-Foundation', - require => Dsc_windowsfeature['Web Server (IIS) Support'], - notify => Reboot['reboot_iis'], - } - - dsc_windowsfeature { 'SMB 1.0/CIFS File Sharing Support': - dsc_ensure => 'present', - dsc_name => 'FS-SMB1', - require => Dsc_windowsfeature['Web Server (IIS) Support'], - notify => Reboot['reboot_iis'], - } - - dsc_windowsfeature { 'Telnet Client': - dsc_ensure => 'present', - dsc_name => 'Telnet-Client', - require => Dsc_windowsfeature['Web Server (IIS) Support'], - notify => Reboot['reboot_iis'], - } - - dsc_windowsfeature { 'User Interfaces and Infrastructure': - dsc_ensure => 'present', - dsc_name => 'User-Interfaces-Infra', - require => Dsc_windowsfeature['Web Server (IIS) Support'], - notify => Reboot['reboot_iis'], - } - - dsc_windowsfeature { 'Windows Powershell ISE': - dsc_ensure => 'present', - dsc_name => 'PowerShell-ISE', - require => Dsc_windowsfeature['Web Server (IIS) Support'], - notify => Reboot['reboot_iis'], - } - - dsc_windowsfeature { 'Process Model': - dsc_ensure => 'present', - dsc_name => 'WAS-Process-Model', - require => Dsc_windowsfeature['Web Server (IIS) Support'], - notify => Reboot['reboot_iis'], - } - - dsc_windowsfeature { 'Configuration APIs': - dsc_ensure => 'present', - dsc_name => 'WAS-Config-APIs', - require => Dsc_windowsfeature['Web Server (IIS) Support'], - notify => Reboot['reboot_iis'], - } - - dsc_windowsfeature { 'WoW64 Support': - dsc_ensure => 'present', - dsc_name => 'WoW64-Support', - require => Dsc_windowsfeature['Web Server (IIS) Support'], - notify => Reboot['reboot_iis'], - } - -}