Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
regedit32 authored and Gregory Storme committed Feb 14, 2020
1 parent 8e7570e commit bbd96cb
Show file tree
Hide file tree
Showing 4 changed files with 98 additions and 52 deletions.
14 changes: 14 additions & 0 deletions DSCResources/MSFT_xIisLogging/MSFT_xIisLogging.schema.mof
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<<<<<<< HEAD
<<<<<<< HEAD
[ClassVersion("1.0.0")]
class MSFT_xLogCustomField
{
Expand Down Expand Up @@ -29,6 +30,8 @@ class MSFT_xLogCustomField
[Required, Description("Specify the source type"), ValueMap{"RequestHeader","ResponseHeader","ServerVariable"},Values{"RequestHeader","ResponseHeader","ServerVariable"}] String SourceType;
};

=======
>>>>>>> fixes #423 (#424)
[ClassVersion("1.0.0"), FriendlyName("xIisLogging")]
class MSFT_xIisLogging : OMI_BaseResource
{
Expand All @@ -41,4 +44,15 @@ class MSFT_xIisLogging : OMI_BaseResource
[Write, Description ("Specifies whether IIS will use Event Tracing or file logging"), ValueMap{"File","ETW","File,ETW"}, Values{"File","ETW","File,ETW"}] String LogTargetW3C;
[Write, EmbeddedInstance("MSFT_xLogCustomField"), Description("Custom logging field information in the form of an array of embedded instances of MSFT_xLogCustomField CIM class")] String LogCustomFields[];
};
<<<<<<< HEAD
>>>>>>> Adding parameter to LogTargetW3C MSFT_xIisLogging.psm1 (#416)
=======

[ClassVersion("1.0.0")]
class MSFT_xLogCustomField
{
[Required, Description("Name for the custom field")] String LogFieldName;
[Required, Description("Name for the source type")] String SourceName;
[Required, Description("Specify the source type"), ValueMap{"RequestHeader","ResponseHeader","ServerVariable"},Values{"RequestHeader","ResponseHeader","ServerVariable"}] String SourceType;
};
>>>>>>> fixes #423 (#424)
78 changes: 53 additions & 25 deletions DSCResources/MSFT_xWebApplication/MSFT_xWebApplication.schema.mof
Original file line number Diff line number Diff line change
@@ -1,25 +1,53 @@
[ClassVersion("1.0.0")]
class MSFT_xWebApplicationAuthenticationInformation
{
[Write] Boolean Anonymous;
[Write] Boolean Basic;
[Write] Boolean Digest;
[Write] Boolean Windows;
};

[ClassVersion("1.0.0.0"), FriendlyName("xWebApplication")]
class MSFT_xWebApplication : OMI_BaseResource
{
[Key, Description("Name of website with which web application is associated")] String Website;
[Key, Description("Name of web application")] String Name;
[Required, Description("Web application pool for the web application")] String WebAppPool;
[Required, Description("Physical path for the web application directory")] String PhysicalPath;
[Write, Description("Whether web application should be present or absent"), ValueMap{"Present","Absent"}, Values{"Present","Absent"}] String Ensure;
[Write, Description("SSLFlags for the application"), ValueMap{"","Ssl","SslNegotiateCert","SslRequireCert","Ssl128"},Values{"","Ssl","SslNegotiateCert","SslRequireCert","Ssl128"}] String SslFlags[];
[write, EmbeddedInstance("MSFT_xWebApplicationAuthenticationInformation"), Description("Hashtable containing authentication information (Anonymous, Basic, Digest, Windows)")] String AuthenticationInfo;
[Write, Description ("Allows a Application to automatically start without a request")] Boolean PreloadEnabled;
[Write, Description ("Enables Autostart on an Application.")] Boolean ServiceAutoStartEnabled;
[Write, Description ("Adds a AutostartProvider")] String ServiceAutoStartProvider;
[Write, Description ("Adds a AutostartProvider ApplicationType")] String ApplicationType;
[Write, Description ("Adds EnabledProtocols on an Application"), ValueMap{"http","https","net.tcp","net.msmq","net.pipe"},Values{"http","https","net.tcp","net.msmq","net.pipe"}] String EnabledProtocols[];
};
<<<<<<< HEAD
[ClassVersion("1.0.0")]
class MSFT_xWebApplicationAuthenticationInformation
{
[Write] Boolean Anonymous;
[Write] Boolean Basic;
[Write] Boolean Digest;
[Write] Boolean Windows;
};

[ClassVersion("1.0.0.0"), FriendlyName("xWebApplication")]
class MSFT_xWebApplication : OMI_BaseResource
{
[Key, Description("Name of website with which web application is associated")] String Website;
[Key, Description("Name of web application")] String Name;
[Required, Description("Web application pool for the web application")] String WebAppPool;
[Required, Description("Physical path for the web application directory")] String PhysicalPath;
[Write, Description("Whether web application should be present or absent"), ValueMap{"Present","Absent"}, Values{"Present","Absent"}] String Ensure;
[Write, Description("SSLFlags for the application"), ValueMap{"","Ssl","SslNegotiateCert","SslRequireCert","Ssl128"},Values{"","Ssl","SslNegotiateCert","SslRequireCert","Ssl128"}] String SslFlags[];
[write, EmbeddedInstance("MSFT_xWebApplicationAuthenticationInformation"), Description("Hashtable containing authentication information (Anonymous, Basic, Digest, Windows)")] String AuthenticationInfo;
[Write, Description ("Allows a Application to automatically start without a request")] Boolean PreloadEnabled;
[Write, Description ("Enables Autostart on an Application.")] Boolean ServiceAutoStartEnabled;
[Write, Description ("Adds a AutostartProvider")] String ServiceAutoStartProvider;
[Write, Description ("Adds a AutostartProvider ApplicationType")] String ApplicationType;
[Write, Description ("Adds EnabledProtocols on an Application"), ValueMap{"http","https","net.tcp","net.msmq","net.pipe"},Values{"http","https","net.tcp","net.msmq","net.pipe"}] String EnabledProtocols[];
};
=======
[ClassVersion("1.0.0.0"), FriendlyName("xWebApplication")]
class MSFT_xWebApplication : OMI_BaseResource
{
[Key, Description("Name of website with which web application is associated")] String Website;
[Key, Description("Name of web application")] String Name;
[Required, Description("Web application pool for the web application")] String WebAppPool;
[Required, Description("Physical path for the web application directory")] String PhysicalPath;
[Write, Description("Whether web application should be present or absent"), ValueMap{"Present","Absent"}, Values{"Present","Absent"}] String Ensure;
[Write, Description("SSLFlags for the application"), ValueMap{"","Ssl","SslNegotiateCert","SslRequireCert","Ssl128"},Values{"","Ssl","SslNegotiateCert","SslRequireCert","Ssl128"}] String SslFlags[];
[write, EmbeddedInstance("MSFT_xWebApplicationAuthenticationInformation"), Description("Hashtable containing authentication information (Anonymous, Basic, Digest, Windows)")] String AuthenticationInfo;
[Write, Description ("Allows a Application to automatically start without a request")] Boolean PreloadEnabled;
[Write, Description ("Enables Autostart on an Application.")] Boolean ServiceAutoStartEnabled;
[Write, Description ("Adds a AutostartProvider")] String ServiceAutoStartProvider;
[Write, Description ("Adds a AutostartProvider ApplicationType")] String ApplicationType;
[Write, Description ("Adds EnabledProtocols on an Application"), ValueMap{"http","https","net.tcp","net.msmq","net.pipe"},Values{"http","https","net.tcp","net.msmq","net.pipe"}] String EnabledProtocols[];
};

[ClassVersion("1.0.0")]
class MSFT_xWebApplicationAuthenticationInformation
{
[Write] Boolean Anonymous;
[Write] Boolean Basic;
[Write] Boolean Digest;
[Write] Boolean Windows;
};
>>>>>>> fixes #423 (#424)
54 changes: 27 additions & 27 deletions DSCResources/MSFT_xWebsite/MSFT_xWebsite.schema.mof
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
[ClassVersion("2.0.0"), FriendlyName("xWebsite")]
class MSFT_xWebsite : OMI_BaseResource
{
[Write,ValueMap{"Present", "Absent"},Values{"Present", "Absent"}] String Ensure;
[Key] String Name;
[Write] UInt32 SiteId;
[Write] String PhysicalPath;
[Write,ValueMap{"Started","Stopped"},Values{"Started", "Stopped"}] String State;
[Write] String ApplicationPool;
[Write, EmbeddedInstance("MSFT_xWebBindingInformation"), Description("Website's binding information in the form of an array of embedded instances of the MSFT_xWebBindingInformation CIM class.")] String BindingInfo[];
[Write] String DefaultPage[];
[Write] String EnabledProtocols;
[write, EmbeddedInstance("MSFT_xWebAuthenticationInformation"), Description("Hashtable containing authentication information (Anonymous, Basic, Digest, Windows)")] String AuthenticationInfo;
[Write, Description ("Allows the Website to automatically start without a request")] Boolean PreloadEnabled;
[Write, Description ("Enables Autostart on a Website.")] Boolean ServiceAutoStartEnabled;
[Write, Description ("Adds a AutostartProvider")] String ServiceAutoStartProvider;
[Write, Description ("Adds a AutostartProvider ApplicationType")] String ApplicationType;
[Write, Description ("The directory to be used for logfiles")] String LogPath;
[Write, Description ("The W3C logging fields"), ValueMap{"Date","Time","ClientIP","UserName","SiteName","ComputerName","ServerIP","Method","UriStem","UriQuery","HttpStatus","Win32Status","BytesSent","BytesRecv","TimeTaken","ServerPort","UserAgent","Cookie","Referer","ProtocolVersion","Host","HttpSubStatus"},Values{"Date","Time","ClientIP","UserName","SiteName","ComputerName","ServerIP","Method","UriStem","UriQuery","HttpStatus","Win32Status","BytesSent","BytesRecv","TimeTaken","ServerPort","UserAgent","Cookie","Referer","ProtocolVersion","Host","HttpSubStatus"}] String LogFlags[];
[Write, Description ("How often the log file should rollover"), ValueMap{"Hourly","Daily","Weekly","Monthly","MaxSize"},Values{"Hourly","Daily","Weekly","Monthly","MaxSize"}] String LogPeriod;
[Write, Description ("How large the file should be before it is truncated")] String LogTruncateSize;
[Write, Description ("Use the localtime for file naming and rollover")] Boolean LoglocalTimeRollover;
[Write, Description ("Format of the Logfiles. Only W3C supports LogFlags"), ValueMap{"IIS","W3C","NCSA"}, Values{"IIS","W3C","NCSA"}] String LogFormat;
[Write, Description ("Specifies whether IIS will use Event Tracing or file logging"), ValueMap{"File","ETW","File,ETW"}, Values{"File","ETW","File,ETW"}] String LogTargetW3C;
[Write, EmbeddedInstance("MSFT_xLogCustomFieldInformation"), Description("Custom logging field information in the form of an array of embedded instances of MSFT_xLogCustomFieldInformation CIM class")] String LogCustomFields[];
};

[ClassVersion("1.0.0")]
class MSFT_xWebBindingInformation
{
Expand Down Expand Up @@ -28,30 +55,3 @@ class MSFT_xLogCustomFieldInformation
[Write] String SourceName;
[Write, ValueMap{"RequestHeader","ResponseHeader","ServerVariable"},Values{"RequestHeader","ResponseHeader","ServerVariable"}] String SourceType;
};

[ClassVersion("2.0.0"), FriendlyName("xWebsite")]
class MSFT_xWebsite : OMI_BaseResource
{
[Write,ValueMap{"Present", "Absent"},Values{"Present", "Absent"}] String Ensure;
[Key] String Name;
[Write] UInt32 SiteId;
[Write] String PhysicalPath;
[Write,ValueMap{"Started","Stopped"},Values{"Started", "Stopped"}] String State;
[Write] String ApplicationPool;
[Write, EmbeddedInstance("MSFT_xWebBindingInformation"), Description("Website's binding information in the form of an array of embedded instances of the MSFT_xWebBindingInformation CIM class.")] String BindingInfo[];
[Write] String DefaultPage[];
[Write] String EnabledProtocols;
[write, EmbeddedInstance("MSFT_xWebAuthenticationInformation"), Description("Hashtable containing authentication information (Anonymous, Basic, Digest, Windows)")] String AuthenticationInfo;
[Write, Description ("Allows the Website to automatically start without a request")] Boolean PreloadEnabled;
[Write, Description ("Enables Autostart on a Website.")] Boolean ServiceAutoStartEnabled;
[Write, Description ("Adds a AutostartProvider")] String ServiceAutoStartProvider;
[Write, Description ("Adds a AutostartProvider ApplicationType")] String ApplicationType;
[Write, Description ("The directory to be used for logfiles")] String LogPath;
[Write, Description ("The W3C logging fields"), ValueMap{"Date","Time","ClientIP","UserName","SiteName","ComputerName","ServerIP","Method","UriStem","UriQuery","HttpStatus","Win32Status","BytesSent","BytesRecv","TimeTaken","ServerPort","UserAgent","Cookie","Referer","ProtocolVersion","Host","HttpSubStatus"},Values{"Date","Time","ClientIP","UserName","SiteName","ComputerName","ServerIP","Method","UriStem","UriQuery","HttpStatus","Win32Status","BytesSent","BytesRecv","TimeTaken","ServerPort","UserAgent","Cookie","Referer","ProtocolVersion","Host","HttpSubStatus"}] String LogFlags[];
[Write, Description ("How often the log file should rollover"), ValueMap{"Hourly","Daily","Weekly","Monthly","MaxSize"},Values{"Hourly","Daily","Weekly","Monthly","MaxSize"}] String LogPeriod;
[Write, Description ("How large the file should be before it is truncated")] String LogTruncateSize;
[Write, Description ("Use the localtime for file naming and rollover")] Boolean LoglocalTimeRollover;
[Write, Description ("Format of the Logfiles. Only W3C supports LogFlags"), ValueMap{"IIS","W3C","NCSA"}, Values{"IIS","W3C","NCSA"}] String LogFormat;
[Write, Description ("Specifies whether IIS will use Event Tracing or file logging"), ValueMap{"File","ETW","File,ETW"}, Values{"File","ETW","File,ETW"}] String LogTargetW3C;
[Write, EmbeddedInstance("MSFT_xLogCustomFieldInformation"), Description("Custom logging field information in the form of an array of embedded instances of MSFT_xLogCustomFieldInformation CIM class")] String LogCustomFields[];
};
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,11 @@ This resource manages the IIS configuration section locking (overrideMode) to co
=======

### 2.6.0.0
<<<<<<< HEAD
>>>>>>> Releasing version 2.6.0.0
=======
* Changed order of classes in schema.mof files to workaround [#423](https://github.com/PowerShell/xWebAdministration/issues/423)
>>>>>>> fixes #423 (#424)
* Fix subject comparison multiple entries for helper function `Find-Certificate` that could not find the test
helper function `Install-NewSelfSignedCertificateExScript`.
* Updated unit test for helper function `Find-Certificate` to check for multiple
Expand Down

0 comments on commit bbd96cb

Please sign in to comment.