Redis/redis-For-Windows
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Added firewall exception for Redis service

Browse Source
This commit is contained in:
NickMRamirez
2015-05-04 08:23:13 -07:00
committed by Alexis Campailla
parent 733dd88d70
commit d5119c4882
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
msvs/RedisWindowsX64/Product.wxs
+4 -2
View File
@@ -1,6 +1,7 @@
<?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:util="http://schemas.microsoft.com/wix/UtilExtension"
xmlns:fw="http://schemas.microsoft.com/wix/FirewallExtension">
<!--
32-bit installer
@@ -60,9 +61,10 @@
The following component installs Redis as a Windows service.
-->
<Component Id="cmp_redis_server" Guid="*">
<File Source="$(var.RedisServer.TargetDir)redis-server.exe" />
<File Id="file_redis_server" Source="$(var.RedisServer.TargetDir)redis-server.exe" />
<ServiceInstall Id="redisService" Name="Redis" DisplayName="Redis" Description="This service runs the Redis server" Start="auto" ErrorControl="normal" Type="ownProcess" Arguments="--service-run [CONFIG] --loglevel [LOGLEVEL]" Account="[WIX_ACCOUNT_NETWORKSERVICE]" />
<ServiceControl Id="redisServiceControl" Name="Redis" Start="install" Stop="both" Remove="uninstall" Wait="yes" />
<fw:FirewallException Id="fw_redis_server" Program="[#file_redis_server]" Description="Exception for Redis server" Name="Redis" Scope="any" />
</Component>
<!--
msvs/RedisWindowsX64/RedisWindowsX64.wixproj
+4 -2
View File
@@ -8,11 +8,9 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName>Redis-Windows-x64</OutputName>
<OutputType>Package</OutputType>
<WixToolPath>$(MSBuildProjectDirectory)\lib\wix39-binaries\</WixToolPath>
<WixTargetsPath>$(WixToolPath)wix.targets</WixTargetsPath>
<WixTasksPath>$(WixToolPath)WixTasks.dll</WixTasksPath>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
</PropertyGroup>
@@ -73,6 +71,10 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<WixExtension Include="WixFirewallExtension">
<HintPath>..\..\..\..\..\..\Program Files (x86)\WiX Toolset v3.9\bin\WixFirewallExtension.dll</HintPath>
<Name>WixFirewallExtension</Name>
</WixExtension>
<WixExtension Include="WixUtilExtension">
<HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
<Name>WixUtilExtension</Name>
msvs/RedisWindowsX86/Product.wxs
+4 -2
View File
@@ -1,6 +1,7 @@
<?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:util="http://schemas.microsoft.com/wix/UtilExtension"
xmlns:fw="http://schemas.microsoft.com/wix/FirewallExtension">
<!--
32-bit installer
@@ -60,9 +61,10 @@
The following component installs Redis as a Windows service.
-->
<Component Id="cmp_redis_server" Guid="*">
<File Source="$(var.RedisServer.TargetDir)redis-server.exe" />
<File Id="file_redis_server" Source="$(var.RedisServer.TargetDir)redis-server.exe" />
<ServiceInstall Id="redisService" Name="Redis" DisplayName="Redis" Description="This service runs the Redis server" Start="auto" ErrorControl="normal" Type="ownProcess" Arguments="--service-run [CONFIG] --loglevel [LOGLEVEL]" Account="[WIX_ACCOUNT_NETWORKSERVICE]" />
<ServiceControl Id="redisServiceControl" Name="Redis" Start="install" Stop="both" Remove="uninstall" Wait="yes" />
<fw:FirewallException Id="fw_redis_server" Program="[#file_redis_server]" Description="Exception for Redis server" Name="Redis" Scope="any" />
</Component>
<!--
msvs/RedisWindowsX86/RedisWindowsX86.wixproj
+4 -2
View File
@@ -8,11 +8,9 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName>Redis-Windows-x86</OutputName>
<OutputType>Package</OutputType>
<WixToolPath>$(MSBuildProjectDirectory)\lib\wix39-binaries\</WixToolPath>
<WixTargetsPath>$(WixToolPath)wix.targets</WixTargetsPath>
<WixTasksPath>$(WixToolPath)WixTasks.dll</WixTasksPath>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
</PropertyGroup>
@@ -71,6 +69,10 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<WixExtension Include="WixFirewallExtension">
<HintPath>..\..\..\..\..\..\Program Files (x86)\WiX Toolset v3.9\bin\WixFirewallExtension.dll</HintPath>
<Name>WixFirewallExtension</Name>
</WixExtension>
<WixExtension Include="WixUtilExtension">
<HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
<Name>WixUtilExtension</Name>