Chris/FlexitimeTracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added the missing files from the Ninject cyclic dependency fix.

Browse Source 
Added Firewall rule.
Moved URLACL to its own file for ease of reading.
Added auto service start back in now that the service is working correctly.
#7
This commit is contained in:
Chris.Watts90@outlook.com 2017-02-17 10:29:26 +00:00
parent 62b3d07a96
commit c81d5be73a
5 changed files with 88 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DataCenterFirewallConfiguration.wxs Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:fire="http://schemas.microsoft.com/wix/FirewallExtension">
<Fragment>
<Component Id="DataCenterFirewallConfig" Directory="INSTALLFOLDER" KeyPath="yes" Guid="{7B874DAA-E2D6-493C-8EA8-2F6F3175E010}">
<fire:FirewallException Id="FwallEx"
Port="8800"
Description="Flexitime DataCenter API/Website Port"
Name="FlexitimeDataCenterException"
Protocol="tcp"
Scope="any"
Profile="all"/>
</Component>
</Fragment>
</Wix>

6
DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DataCenterHostInstaller.wixproj
View File

@ -22,8 +22,10 @@
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<ItemGroup>
<Compile Include="DataCenterURLACLConfiguration.wxs" />
<Compile Include="CoreComponents.wxs" />
<Compile Include="DalsoftWebApiHelp.wxs" />
<Compile Include="DataCenterFirewallConfiguration.wxs" />
<Compile Include="DataCenterServiceComponents.wxs" />
<Compile Include="DirectoryStructure.wxs" />
<Compile Include="NLog.wxs" />
@ -66,6 +68,10 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<WixExtension Include="WixFirewallExtension">
<HintPath>$(WixExtDir)\WixFirewallExtension.dll</HintPath>
<Name>WixFirewallExtension</Name>
</WixExtension>
<WixExtension Include="WixHttpExtension">
<HintPath>$(WixExtDir)\WixHttpExtension.dll</HintPath>
<Name>WixHttpExtension</Name>

69
DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DataCenterServiceComponents.wxs
View File

@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
xmlns:http="http://schemas.microsoft.com/wix/HttpExtension">
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<Fragment>
<Component Id="URLReservation" Guid="{35F39190-88CA-4D1D-B066-9F9CAB328F4D}" Directory="INSTALLFOLDER" KeyPath="yes">
<http:UrlReservation Id="EndpointUrlAcl" Url="http://*:8800/" HandleExisting="ignore">
<http:UrlAce SecurityPrincipal="Everyone" Rights="all"/>
</http:UrlReservation>
</Component>
<ComponentGroup Id="DataCenterGroup" Directory="INSTALLFOLDER">
<ComponentGroup Id="DataCenterComponents">
<ComponentRef Id="URLReservation"/>
<ComponentRef Id="DataCenterFirewallConfig"/>
<ComponentGroupRef Id="DataCenterFileGroup"/>
</ComponentGroup>
<ComponentGroup Id="DataCenterFileGroup" Directory="INSTALLFOLDER">
<Component Id="MicrosoftOwin" Guid="{45563976-8620-4447-9DFE-216DEF263D5A}">
<File Id="Microsoft.Owin.dll"
Source="$(var.WindowsDataCenter.TargetDir)\Microsoft.Owin.dll"
@ -40,6 +39,12 @@
KeyPath="yes"
Checksum="yes"/>
</Component>
<Component Id="MicrosoftWebInsfrastructure" Guid="{BCBEE2B7-3E75-4744-8B95-5928E69A8807}">
<File Id="Microsoft.Web.Infrastructure.dll"
Source="$(var.WindowsDataCenter.TargetDir)Microsoft.Web.Infrastructure.dll"
KeyPath="yes"
Checksum="yes"/>
</Component>
<Component Id="NewtonsoftJson" Guid="{972634F3-DEC1-41D9-B48E-3836D6C1FD1D}">
<File Id="Newtonsoft.Json.dll"
Source="$(var.WindowsDataCenter.TargetDir)Newtonsoft.Json.dll"
@ -52,9 +57,15 @@
KeyPath="yes"
Checksum="yes"/>
</Component>
<Component Id="NinjectConfig" Guid="{85F6271F-7251-4E88-B44D-8EBDA4CBD29D}">
<File Id="NinjectConfig.xml"
Source="$(var.WindowsDataCenter.TargetDir)NinjectConfig.xml"
<Component Id="NinjectExtensionsContextPreservationDll" Guid="{580EAE73-1DBF-4F79-9153-8D5055C3A31F}">
<File Id="Ninject.Extensions.ContextPreservation.dll"
Source="$(var.WindowsDataCenter.TargetDir)Ninject.Extensions.ContextPreservation.dll"
KeyPath="yes"
Checksum="yes"/>
</Component>
<Component Id="NinjectExtensionsNamedScopeDll" Guid="{76602BE7-8A83-4BC2-AAA3-2A06F82353F0}">
<File Id="Ninject.Extensions.NamedScope.dll"
Source="$(var.WindowsDataCenter.TargetDir)Ninject.Extensions.NamedScope.dll"
KeyPath="yes"
Checksum="yes"/>
</Component>
@ -70,12 +81,30 @@
KeyPath="yes"
Checksum="yes"/>
</Component>
<Component Id="NinjectWebCommonOwinHost" Guid="{156FF6D0-00DA-46BC-80C9-816F2CA8975E}">
<File Id="Ninject.Web.Common.OwinHost.dll"
Source="$(var.WindowsDataCenter.TargetDir)Ninject.Web.Common.OwinHost.dll"
KeyPath="yes"
Checksum="yes"/>
</Component>
<Component Id="NinjectWebWebApi" Guid="{20D06854-C822-4780-8EDC-D1601A835626}">
<File Id="Ninject.Web.WebApi.dll"
Source="$(var.WindowsDataCenter.TargetDir)Ninject.Web.WebApi.dll"
KeyPath="yes"
Checksum="yes"/>
</Component>
<Component Id="NinjectWebWebApiOwinHost" Guid="{024E48A9-CFAA-4AE1-9B55-399AC27E93B0}">
<File Id="Ninject.Web.WebApi.OwinHost.dll"
Source="$(var.WindowsDataCenter.TargetDir)Ninject.Web.WebApi.OwinHost.dll"
KeyPath="yes"
Checksum="yes"/>
</Component>
<Component Id="NinjectConfig" Guid="{85F6271F-7251-4E88-B44D-8EBDA4CBD29D}">
<File Id="NinjectConfig.xml"
Source="$(var.WindowsDataCenter.TargetDir)NinjectConfig.xml"
KeyPath="yes"
Checksum="yes"/>
</Component>
<Component Id="Owin" Guid="{B4A90231-65AB-40F1-BEEC-EE02B9DBD4EC}">
<File Id="Owin.dll"
Source="$(var.WindowsDataCenter.TargetDir)Owin.dll"
@ -100,12 +129,24 @@
KeyPath="yes"
Checksum="yes"/>
</Component>
<Component Id="SystemWebHttpOwin.dll" Guid="{99FF5381-765A-4B03-8668-1083ED498CAB}">
<Component Id="SystemWebHttpOwin" Guid="{99FF5381-765A-4B03-8668-1083ED498CAB}">
<File Id="System.Web.Http.Owin.dll"
Source="$(var.WindowsDataCenter.TargetDir)System.Web.Http.Owin.dll"
KeyPath="yes"
Checksum="yes"/>
</Component>
<Component Id="SystemWebHttpWebHost" Guid="{29E7462F-32C3-46E2-8295-FBF561D37E40}">
<File Id="System.Web.Http.WebHost.dll"
Source="$(var.WindowsDataCenter.TargetDir)System.Web.Http.WebHost.dll"
KeyPath="yes"
Checksum="yes"/>
</Component>
<Component Id="WebActivatorEx" Guid="{7AD6A619-5946-4E94-AAD3-1AEEB88272C0}">
<File Id="WebActivatorEx.dll"
Source="$(var.WindowsDataCenter.TargetDir)WebActivatorEx.dll"
KeyPath="yes"
Checksum="yes"/>
</Component>
<Component Id="WindowsDataCenter" Guid="{CD36814E-8C1B-4AC1-BDC7-D1595D2A4728}">
<File Id="WindowsDataCenter.exe"
Source="$(var.WindowsDataCenter.TargetDir)WindowsDataCenter.exe"
@ -134,12 +175,12 @@
ResetPeriodInDays="1"
RestartServiceDelayInSeconds="10" />
</ServiceInstall>
<!--<ServiceControl Id="FlexitimeDataCenterStarter"
<ServiceControl Id="FlexitimeDataCenterStarter"
Start="install"
Stop="uninstall"
Remove="uninstall"
Name="FlexitimeDataCenterService"
Wait="yes" />-->
Wait="yes" />
</Component>
<Component Id="WindowsDataCenterExeConfig" Guid="{CBFA53EB-0663-4A79-9990-451FC1105A12}">
<File Id="WindowsDataCenter.exe.config"

11
DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DataCenterURLACLConfiguration.wxs Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:http="http://schemas.microsoft.com/wix/HttpExtension">
<Fragment>
<Component Id="URLReservation" Guid="{35F39190-88CA-4D1D-B066-9F9CAB328F4D}" Directory="INSTALLFOLDER" KeyPath="yes">
<http:UrlReservation Id="EndpointUrlAcl" Url="http://*:8800/" HandleExisting="ignore">
<http:UrlAce SecurityPrincipal="Everyone" Rights="all"/>
</http:UrlReservation>
</Component>
</Fragment>
</Wix>

2
DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/Product.wxs
View File

@ -27,7 +27,7 @@
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
<ComponentGroupRef Id="CoreComponents"/>
<ComponentGroupRef Id="DalSoftWebApiHelpComponents" />
<ComponentGroupRef Id="DataCenterGroup"/>
<ComponentGroupRef Id="DataCenterComponents"/>
<ComponentGroupRef Id="NLogComponents" />
<ComponentGroupRef Id="SQLiteRepositoryComponents" />
<ComponentGroupRef Id="WebSiteComponents" />