Skip to content

Commit

Permalink
Updated help texts and default inputs for IIS Manage task (#3607) (#3616
Browse files Browse the repository at this point in the history 
)

* Updated help texts and default inputs

* Handle casing in case of input labels

* Minor fix

* Updated patch
  • Loading branch information
@asranja
asranja authored Feb 15, 2017
1 parent fe52003 commit ee8cdb7
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 63 deletions.
5 changes: 0 additions & 5 deletions Tasks/IISWebAppManagementOnMachineGroup/IISWebAppManagementOnMachineGroup.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,6 @@ try {
{
Manage-IISApplicationPool
}
""
{
Write-Output (Get-VstsLocString -Key "EmptyIISDeploymentType")
Execute-Main -AppCmdCommands $appCmdCommands
}
default
{
throw (Get-VstsLocString -Key "InvalidIISDeploymentType" -ArgumentList $iisDeploymentType)
Expand Down
45 changes: 23 additions & 22 deletions Tasks/IISWebAppManagementOnMachineGroup/Strings/resources.resjson/en-US/resources.resjson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@
"loc.group.displayName.ApplicationPool": "IIS application pool",
"loc.group.displayName.ApplicationPoolForApplication": "IIS application pool",
"loc.group.displayName.Advanced": "Advanced",
"loc.input.label.IISDeploymentType": "IIS Deployment Type",
"loc.input.help.IISDeploymentType": "Select the type of IIS object that is to be managed.",
"loc.input.label.IISDeploymentType": "Configuration type",
"loc.input.help.IISDeploymentType": "You can create or update sites, applications, virtual directories, and application pools.",
"loc.input.label.ActionIISWebsite": "Action",
"loc.input.help.ActionIISWebsite": "Select the appropriate action that you want to perform on an IIS website. \n\n\"Create Or Update\" will create a website or update an existing website.",
"loc.input.label.ActionIISApplicationPool": "Action",
"loc.input.help.ActionIISApplicationPool": "Select the appropriate action that you want to perform on an IIS Application Pool. \n\n\"Create Or Update\" will create app-pool or update an existing one.",
"loc.input.label.WebsiteName": "Website name",
"loc.input.help.WebsiteName": "Provide the name of the IIS website. It will be created if new, or else the existing website will be updated. <br>For deploying a Web project to the website, use the same name as specified in the Web deploy zip package file. If in the Web App deployment task, a Parameter file and Override Parameter settings are also specified, then the website name that the app will be deployed to be, is the one specified in the Override Parameters setting.<br>",
"loc.input.help.WebsiteName": "Provide the name of the IIS website to create or update.",
"loc.input.label.WebsitePhysicalPath": "Physical path",
"loc.input.help.WebsitePhysicalPath": "Provide the physical path where the website content will be stored. The content can reside on the local Computer, or in a remote directory, or on a network share, like C:\\Fabrikam or \\\\\\\\ContentShare\\Fabrikam.",
"loc.input.label.WebsitePhysicalPathAuth": "Physical path authentication",
"loc.input.help.WebsitePhysicalPathAuth": "Select the authentication mechanism that will be used to access the physical path of the website.",
"loc.input.label.WebsiteAuthUserName": "Username",
"loc.input.help.WebsiteAuthUserName": "Provide the user name that will be used to access the website's physical path.",
"loc.input.label.WebsiteAuthUserPassword": "Password",
"loc.input.help.WebsiteAuthUserPassword": "Provide the user's password that will be used to access the website's physical path. If you are using a gMSA, this is not required.",
"loc.input.help.WebsiteAuthUserPassword": "Provide the user's password that will be used to access the website's physical path.",
"loc.input.label.AddBinding": "Add binding",
"loc.input.help.AddBinding": "Select the option to add port binding for the website.",
"loc.input.label.Protocol": "Protocol",
Expand All @@ -40,23 +40,23 @@
"loc.input.help.HostNameWithHttp": "Enter a host name (or domain name) for the website. <br>If a host name is specified, then the clients must use the host name instead of the IP address to access the website.<br>",
"loc.input.label.HostNameWithSNI": "Host name",
"loc.input.help.HostNameWithSNI": "Enter a host name (or domain name) for the website. <br>If a host name is specified, then the clients must use the host name instead of the IP address to access the website.<br>",
"loc.input.label.SSLCertThumbPrint": "SSL Certificate Thumbprint",
"loc.input.label.SSLCertThumbPrint": "SSL certificate thumbprint",
"loc.input.help.SSLCertThumbPrint": "Provide the thumb-print of the Secure Socket Layer certificate that the website is going to use for the HTTPS communication as a 40 character long hexadecimal string. The SSL certificate should be already installed on the Computer, at Local Computer, Personal store.",
"loc.input.label.CreateOrUpdateAppPoolForWebsite": "Create or Update App pool",
"loc.input.help.CreateOrUpdateAppPoolForWebsite": "Select the option to create or update an application pool. If checked, the website will be created in the specified app pool. Otherwise the DefaultAppPool will be used.",
"loc.input.label.CreateOrUpdateAppPoolForWebsite": "Create or update app pool",
"loc.input.help.CreateOrUpdateAppPoolForWebsite": "Select the option to create or update an application pool. If checked, the website will be created in the specified app pool.",
"loc.input.label.AppPoolNameForWebsite": "Name",
"loc.input.help.AppPoolNameForWebsite": "Provide the name of the IIS application pool. Either a new app pool will be created if it doesn't exist, or the existing app pool will be updated with the settings specified here.",
"loc.input.help.AppPoolNameForWebsite": "Provide the name of the IIS application pool to create or update.",
"loc.input.label.DotNetVersionForWebsite": ".NET version",
"loc.input.help.DotNetVersionForWebsite": "Select the version of the .NET Framework that is loaded by the application pool. <br>If the applications assigned to this application pool do not contain managed code, then select the 'No Managed Code' option from the list.<br>",
"loc.input.label.PipeLineModeForWebsite": "Managed pipeline mode",
"loc.input.help.PipeLineModeForWebsite": "Select the managed pipeline mode that specifies how IIS processes requests for managed content. Use classic mode only when the applications in the application pool cannot run in the Integrated mode.",
"loc.input.label.AppPoolIdentityForWebsite": "Identity",
"loc.input.help.AppPoolIdentityForWebsite": "Configure the account under which an application pool's worker process runs. Select one of the predefined security accounts or configure a custom account.",
"loc.input.label.AppPoolUsernameForWebsite": "Username",
"loc.input.help.AppPoolUsernameForWebsite": "Provide the username of the SpecificUser account that you want to use.",
"loc.input.help.AppPoolUsernameForWebsite": "Provide the username of the custom account that you want to use.",
"loc.input.label.AppPoolPasswordForWebsite": "Password",
"loc.input.help.AppPoolPasswordForWebsite": "If you are using a gMSA, this is not required.",
"loc.input.label.ParentWebsiteNameForVD": "Parent Website Name",
"loc.input.help.AppPoolPasswordForWebsite": "Provide the password for custom account. <br/>The best practice is to create a variable in the Build or Release definition, and mark it as 'Secret' to secure it, and then use it here, like '$(userCredentials)'. ",
"loc.input.label.ParentWebsiteNameForVD": "Parent website name",
"loc.input.help.ParentWebsiteNameForVD": "Provide the name of the parent Website of the virtual directory.",
"loc.input.label.VirtualPathForVD": "Virtual path",
"loc.input.help.VirtualPathForVD": "Provide the virtual path of the virtual directory. \n\nExample: To create a virtual directory Site/Application/VDir enter /Application/Vdir. The parent website and application should be already existing.",
Expand All @@ -67,8 +67,8 @@
"loc.input.label.VDAuthUserName": "Username",
"loc.input.help.VDAuthUserName": "Provide the user name that will be used to access the virtual directory's physical path.",
"loc.input.label.VDAuthUserPassword": "Password",
"loc.input.help.VDAuthUserPassword": "Provide the user's password that will be used to access the virtual directory's physical path. If you are using a gMSA, this is not required.",
"loc.input.label.ParentWebsiteNameForApplication": "Parent Website Name",
"loc.input.help.VDAuthUserPassword": "Provide the user's password that will be used to access the virtual directory's physical path.",
"loc.input.label.ParentWebsiteNameForApplication": "Parent website name",
"loc.input.help.ParentWebsiteNameForApplication": "Provide the name of the parent Website under which the application will be created or updated.",
"loc.input.label.VirtualPathForApplication": "Virtual path",
"loc.input.help.VirtualPathForApplication": "Provide the virtual path of the application. \n\nExample: To create an application Site/Application enter /Application. The parent website should be already existing.",
Expand All @@ -79,35 +79,36 @@
"loc.input.label.ApplicationAuthUserName": "Username",
"loc.input.help.ApplicationAuthUserName": "Provide the user name that will be used to access the application's physical path.",
"loc.input.label.ApplicationAuthUserPassword": "Password",
"loc.input.help.ApplicationAuthUserPassword": "Provide the user's password that will be used to access the application's physical path. If you are using a gMSA, this is not required.",
"loc.input.label.CreateOrUpdateAppPoolForApplication": "Create or Update App pool",
"loc.input.help.CreateOrUpdateAppPoolForApplication": "Select the option to create or update an application pool. If checked, the application will be created in the specified app pool. Otherwise the DefaultAppPool will be used.",
"loc.input.help.ApplicationAuthUserPassword": "Provide the user's password that will be used to access the application's physical path.",
"loc.input.label.CreateOrUpdateAppPoolForApplication": "Create or update app pool",
"loc.input.help.CreateOrUpdateAppPoolForApplication": "Select the option to create or update an application pool. If checked, the application will be created in the specified app pool.",
"loc.input.label.AppPoolNameForApplication": "Name",
"loc.input.help.AppPoolNameForApplication": "Provide the name of the IIS application pool. Either a new app pool will be created if it doesn't exist, or the existing app pool will be updated with the settings specified here.",
"loc.input.help.AppPoolNameForApplication": "Provide the name of the IIS application pool to create or update.",
"loc.input.label.DotNetVersionForApplication": ".NET version",
"loc.input.help.DotNetVersionForApplication": "Select the version of the .NET Framework that is loaded by the application pool. <br>If the applications assigned to this application pool do not contain managed code, then select the 'No Managed Code' option from the list.<br>",
"loc.input.label.PipeLineModeForApplication": "Managed pipeline mode",
"loc.input.help.PipeLineModeForApplication": "Select the managed pipeline mode that specifies how IIS processes requests for managed content. Use classic mode only when the applications in the application pool cannot run in the Integrated mode.",
"loc.input.label.AppPoolIdentityForApplication": "Identity",
"loc.input.help.AppPoolIdentityForApplication": "Configure the account under which an application pool's worker process runs. Select one of the predefined security accounts or configure a custom account.",
"loc.input.label.AppPoolUsernameForApplication": "Username",
"loc.input.help.AppPoolUsernameForApplication": "Provide the username of the custom account that you want to use.",
"loc.input.label.AppPoolPasswordForApplication": "Password",
"loc.input.help.AppPoolPasswordForApplication": "If you are using a gMSA, this is not required.",
"loc.input.help.AppPoolPasswordForApplication": "Provide the password for custom account. <br/>The best practice is to create a variable in the Build or Release definition, and mark it as 'Secret' to secure it, and then use it here, like '$(userCredentials)'.",
"loc.input.label.AppPoolName": "Name",
"loc.input.help.AppPoolName": "Provide the name of the IIS application pool. Either a new app pool will be created if it doesn't exist, or the existing app pool will be updated with the settings specified here.",
"loc.input.help.AppPoolName": "Provide the name of the IIS application pool to create or update.",
"loc.input.label.DotNetVersion": ".NET version",
"loc.input.help.DotNetVersion": "Select the version of the .NET Framework that is loaded by the application pool. <br>If the applications assigned to this application pool do not contain managed code, then select the 'No Managed Code' option from the list.<br>",
"loc.input.label.PipeLineMode": "Managed pipeline mode",
"loc.input.help.PipeLineMode": "Select the managed pipeline mode that specifies how IIS processes requests for managed content. Use classic mode only when the applications in the application pool cannot run in the Integrated mode.",
"loc.input.label.AppPoolIdentity": "Identity",
"loc.input.help.AppPoolIdentity": "Configure the account under which an application pool's worker process runs. Select one of the predefined security accounts or configure a custom account.",
"loc.input.label.AppPoolUsername": "Username",
"loc.input.help.AppPoolUsername": "Provide the username of the custom account that you want to use.",
"loc.input.label.AppPoolPassword": "Password",
"loc.input.help.AppPoolPassword": "If you are using a gMSA, this is not required.",
"loc.input.label.AppCmdCommands": "Additional AppCmd.exe commands",
"loc.input.help.AppPoolPassword": "Provide the password for custom account. <br/>The best practice is to create a variable in the Build or Release definition, and mark it as 'Secret' to secure it, and then use it here, like '$(userCredentials)'.",
"loc.input.label.AppCmdCommands": "Additional appcmd.exe commands",
"loc.input.help.AppCmdCommands": "Enter additional AppCmd.exe commands. For more than one command use a line separator, like <br/> list apppools <br/> list sites<br/> recycle apppool /apppool.name:ExampleAppPoolName",
"loc.messages.InvalidSslThumbprint": "Invalid thumbprint. Length is not 40 characters or contains invalid characters.",
"loc.messages.InvalidVirtualPath": "Virtual path should begin with a /",
"loc.messages.EmptyIISDeploymentType": "IIS Deployment Type input is empty. Executing additional AppCmd.exe commands.",
"loc.messages.InvalidIISDeploymentType": "Invalid IIS Deployment Type : {0}"
}
Loading

0 comments on commit ee8cdb7

Please sign in to comment.