This commit is contained in:
Jeff Salas 2018-09-12 13:09:40 -07:00
Родитель 9ce0f29cd5
Коммит 9f7a7da937
9 изменённых файлов: 22 добавлений и 10 удалений

Просмотреть файл

@ -4,6 +4,7 @@
* Added the following STIGs
* Microsoft Outlook 2013 STIG V1R12
* Added the DSC Composite Resource for Windows Outlook2013 STIG
## 2.1.0.0

Просмотреть файл

@ -4,7 +4,7 @@
@{
# Script module or binary module file associated with this manifest.
RootModule = 'WindowsOutlook2013.schema.psm1'
RootModule = 'Outlook2013.schema.psm1'
# Version number of this module. #jjs need to define moduleversion i'll be using
ModuleVersion = '1.0.0.0'
@ -22,10 +22,10 @@
Copyright = '(c) 2018 Microsoft. All rights reserved.'
# Description of the functionality provided by this module
Description = 'Composite DSC Resource for managing the Windows Outlook 2013 DISA STIGs'
Description = 'Composite DSC Resource for managing the Outlook 2013 DISA STIGs'
# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
FunctionsToExport = @('WindowsOutlook2013') #jjs do I need to create a seperate function for WindowsOutlook2013?
FunctionsToExport = @('Outlook2013') #jjs do I need to create a seperate function for Outlook2013?
# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
CmdletsToExport = @()

Просмотреть файл

@ -29,11 +29,16 @@ using module ..\..\PowerStig.psm1
All STIG rule IDs of the specified type are collected in an array and passed to the Skip-Rule
function. Each rule follows the same process as the SkipRule parameter.
#>
Configuration WindowsOutlook2013
Configuration Outlook2013
{
[CmdletBinding()]
param
(
[Parameter(Mandatory = $true)]
[ValidateSet('Outlook2013')]
[string]
$Outlook2013,
[Parameter()]
[ValidateSet('1.12')]
[ValidateNotNullOrEmpty()]

Просмотреть файл

@ -49,10 +49,10 @@ RequiredModules = @(
DscResourcesToExport = @(
'Browser',
'DotNetFramework',
'Outlook2013',
'SqlServer',
'WindowsDnsServer',
'WindowsFirewall',
'WindowsOutlook2013',
'WindowsServer'
)

Просмотреть файл

@ -82,6 +82,7 @@ The list of STIGs that we are currently covering.
| ---- | --- |
|[Browser](https://github.com/Microsoft/PowerStig/wiki/Browser) | Provides a mechanism to manage Browser STIG settings. |
|[DotNetFramework](https://github.com/Microsoft/PowerStig/wiki/DotNetFramework) | Provides a mechanism to manage .Net Framework STIG settings. |
|[Outlook2013](https://github.com/Microsoft/PowerStig/wiki/Outlook2013) | Provides a mechanism to manage Outlook2013 STIG settings. |
|[SqlServer](https://github.com/Microsoft/PowerStig/wiki/SqlServer) | Provides a mechanism to manage SqlServer STIG settings. |
|[WindowsDnsServer](https://github.com/Microsoft/PowerStig/wiki/WindowsDnsServer) | Provides a mechanism to manage Windows DNS Server STIG settings. |
|[WindowsFirewall](https://github.com/Microsoft/PowerStig/wiki/WindowsFirewall) | Provides a mechanism to manage the Windows Firewall STIG settings. |

Просмотреть файл

@ -1,7 +1,11 @@
Configuration WindowsOutlook2013_config
Configuration Outlook2013_config
{
param
(
[Parameter(Mandatory = $true)]
[string]
$Outlook2013,
[Parameter(Mandatory = $true)]
[version]
$StigVersion
@ -11,8 +15,9 @@ Configuration WindowsOutlook2013_config
Node localhost
{
WindowsOutlook2013 BaseLineSettings
Outlook2013 BaseLineSettings
{
Outlook2013 = $Outlook2013
StigVersion = $StigVersion
}
}

Просмотреть файл

@ -19,6 +19,7 @@ try
It 'Should compile the MOF without throwing' {
{
& "$($script:DSCCompositeResourceName)_config" `
-Outlook2013 $stig.TechnologyRole `
-StigVersion $stig.stigVersion `
-OutputPath $TestDrive
} | Should Not throw

Просмотреть файл

@ -80,12 +80,11 @@ Describe 'Common Tests - Configuration Module Requirements' {
$TechnologyRoleFilter = @{
Browser = 'IE'
DotNetFramework = 'DotNet'
Outlook2013 = 'Outlook2013'
SqlServer = 'Database|Instance'
WindowsDnsServer = 'DNS'
WindowsFirewall = 'FW'
WindowsOutlook2013 = 'Outlook2013'
WindowsServer = 'DC|MS'
Outlook2013 = 'Outlook2013'
}
Foreach ($resource in $moduleDscResourceList)
{

Просмотреть файл

@ -3,8 +3,8 @@
Browser = @("*IE11*")
DotNetFramework = @("*DotNet4*")
SqlServer = @("*Instance*", "*Database*")
Outlook2013 = @("*Outlook2013*")
WindowsFirewall = @("*FW*")
WindowsDnsServer = @("*DNS*")
WindowsOutlook2013 = @("*Outlook2013*")
WindowsServer = @("*DC*", "*MS*")
}