Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@gbiellem
gbiellem committed Aug 25, 2014
2 parents 9a44bb5 + 1da4318 commit aaead68
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 15 deletions.
18 changes: 12 additions & 6 deletions installer/ServicePulse.aip
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,26 @@
<ROW Component="AI_DisableModify" ComponentId="{DF00D24A-7668-4F3D-9629-2A1537091C3F}" Directory_="APPDIR" Attributes="4" KeyPath="NoModify" Options="1"/>
<ROW Component="AI_ExePath" ComponentId="{CD4BC5FC-47B0-4899-856E-C252440A24FB}" Directory_="APPDIR" Attributes="4" KeyPath="AI_ExePath"/>
<ROW Component="APPDIR" ComponentId="{C52555BD-B541-4AA9-BB71-4EA74F875CA3}" Directory_="APPDIR" Attributes="0"/>
<ROW Component="Nancy.Hosting.Self.dll" ComponentId="{9E2DCF47-935B-4DCA-B7C6-DA369FD7956D}" Directory_="APPDIR" Attributes="0" KeyPath="Nancy.Hosting.Self.dll"/>
<ROW Component="Nancy.Hosting.Self.xml" ComponentId="{D650E9EE-6B50-48B1-A322-61F24BC6B7AC}" Directory_="APPDIR" Attributes="0" KeyPath="Nancy.Hosting.Self.xml" Type="0"/>
<ROW Component="Nancy.dll" ComponentId="{327CB436-9E38-48DF-9F7C-F8957A83B222}" Directory_="APPDIR" Attributes="0" KeyPath="Nancy.dll"/>
<ROW Component="ParticularSoftware" ComponentId="{3D19C20F-940E-4A60-ACEF-ACDDF010F2D9}" Directory_="APPDIR" Attributes="4" KeyPath="ParticularSoftware"/>
<ROW Component="ProductInformation" ComponentId="{E871FDAC-CF7D-45FA-A1C9-73006CE87216}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>
<ROW Component="SHORTCUTDIR" ComponentId="{7C9E09BA-EAB2-4EF3-B35C-E7497EE433DE}" Directory_="SHORTCUTDIR" Attributes="0"/>
<ROW Component="ServicePulse" ComponentId="{02519674-CE1F-48C0-8F22-78B2827C507D}" Directory_="APPDIR" Attributes="4" KeyPath="ServicePulse"/>
<ROW Component="ServicePulse.Host.exe" ComponentId="{AE9BCD73-377B-49A1-812D-AEBB7013AA5F}" Directory_="APPDIR" Attributes="0" KeyPath="ServicePulse.Host.exe"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
<ROW Feature="ServicePulse" Title="NServiceBus ServicePulse" Description="Management Pack provides auditing and analysis features for NServiceBus." Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_CustomARPName AI_DisableModify AI_ExePath APPDIR ParticularSoftware ProductInformation SHORTCUTDIR ServicePulse ServicePulse.Host.exe"/>
<ROW Feature="ServicePulse" Title="NServiceBus ServicePulse" Description="Management Pack provides auditing and analysis features for NServiceBus." Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_CustomARPName AI_DisableModify AI_ExePath APPDIR Nancy.Hosting.Self.dll Nancy.Hosting.Self.xml Nancy.dll ParticularSoftware ProductInformation SHORTCUTDIR ServicePulse ServicePulse.Host.exe"/>
<ATTRIBUTE name="CurrentFeature" value="ServicePulse"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
<ROW File="ServicePulse.Host.exe" Component_="ServicePulse.Host.exe" FileName="Servic~1.exe|ServicePulse.Host.exe" Attributes="0" SourcePath="binaries\ServicePulse.Host.exe" SelfReg="false" DigSign="true"/>
<ROW File="Nancy.Hosting.Self.dll" Component_="Nancy.Hosting.Self.dll" FileName="NancyH~1.dll|Nancy.Hosting.Self.dll" Attributes="0" SourcePath="binaries\Nancy.Hosting.Self.dll" SelfReg="false" NextFile="Nancy.Hosting.Self.xml"/>
<ROW File="Nancy.Hosting.Self.xml" Component_="Nancy.Hosting.Self.xml" FileName="NancyH~1.xml|Nancy.Hosting.Self.xml" Attributes="0" SourcePath="binaries\Nancy.Hosting.Self.xml" SelfReg="false" NextFile="Nancy.xml"/>
<ROW File="Nancy.dll" Component_="Nancy.dll" FileName="Nancy.dll" Attributes="0" SourcePath="binaries\Nancy.dll" SelfReg="false" NextFile="Nancy.Hosting.Self.dll"/>
<ROW File="Nancy.xml" Component_="Nancy.Hosting.Self.xml" FileName="Nancy.xml" Attributes="0" SourcePath="binaries\Nancy.xml" SelfReg="false" NextFile="ServicePulse.Host.pdb"/>
<ROW File="ServicePulse.Host.exe" Component_="ServicePulse.Host.exe" FileName="Servic~1.exe|ServicePulse.Host.exe" Attributes="0" SourcePath="binaries\ServicePulse.Host.exe" SelfReg="false" NextFile="Nancy.dll" DigSign="true"/>
<ROW File="ServicePulse.Host.pdb" Component_="ServicePulse.Host.exe" FileName="Servic~1.pdb|ServicePulse.Host.pdb" Attributes="0" SourcePath="binaries\ServicePulse.Host.pdb" SelfReg="false"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.AiRemoveFileComponent">
<ROW RemoveFile="_" Options="3"/>
Expand Down Expand Up @@ -393,10 +401,8 @@
<ROW Condition="VersionNT" Description="[ProductName] cannot be installed on [WindowsType9XDisplay]" DescriptionLocId="AI.LaunchCondition.No9X" IsPredefined="true" Builds="DefaultBuild"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiLockPermComponent">
<ROW LockObject="APPDIR" Table="CreateFolder" User="Users" Permission="1610809791"/>
<ROW LockObject="ServicePulse" Table="Registry" User="Users" Permission="1880096767"/>
<ROW LockObject="ServicePulse" Table="Registry" User="SYSTEM" Permission="1880096767"/>
<ROW LockObject="ServicePulse" Table="Registry" User="Administrators" Permission="1880096767"/>
<ROW LockObject="APPDIR" Table="CreateFolder" User="Everyone" Permission="1880096767"/>
<ROW LockObject="ServicePulse" Table="Registry" User="Everyone" Permission="1880096767"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiRegLocatorComponent">
<ROW Signature_="AI_DotNet40SearchSgn" Root="2" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" Name="Install" Type="2"/>
Expand Down
13 changes: 4 additions & 9 deletions src/ServicePulse.Install.CustomActions/CustomAction.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@ public static ActionResult SetUrlAcl(Session session)
var aclUrl = string.Format("http://+:{0}/", port);

RunNetsh(string.Format("http del urlacl url={0}", aclUrl));
var addUrlAclCommand = string.Format("http add urlacl url={0} user={1}", aclUrl, LocalizedNameForEveryOne());

// sddl=D:(A;;GX;;;WD) maps to the same as setting user=Everyone
// user=everyone fails if the OS langauge is not English, localised look of NTAccout fails as MSI is set to English US
var addUrlAclCommand = string.Format("http add urlacl url={0} sddl=D:(A;;GX;;;WD)", aclUrl);
var exitCode = RunNetsh(addUrlAclCommand);
if (exitCode != 0)
{
Expand Down Expand Up @@ -112,14 +115,6 @@ public static ActionResult CheckPulsePort(Session session)
}
}

//The Everyone group name changes based on locale
static string LocalizedNameForEveryOne()
{
var everyoneSecurityIdentifier = new SecurityIdentifier(WellKnownSidType.WorldSid, null);
var account = (NTAccount) everyoneSecurityIdentifier.Translate(typeof(NTAccount));
return account.Value;
}

static int RunNetsh(string command)
{
var pi = new ProcessStartInfo
Expand Down

0 comments on commit aaead68

Please sign in to comment.