From d5119c4882f2ad86595bf67dba1f2e1b483e7a2b Mon Sep 17 00:00:00 2001
From: NickMRamirez <nickram44@gmail.com>
Date: Mon, 12 Jan 2015 10:49:55 -0500
Subject: [PATCH] Added firewall exception for Redis service

---
 msvs/RedisWindowsX64/Product.wxs             | 6 ++++--
 msvs/RedisWindowsX64/RedisWindowsX64.wixproj | 6 ++++--
 msvs/RedisWindowsX86/Product.wxs             | 6 ++++--
 msvs/RedisWindowsX86/RedisWindowsX86.wixproj | 6 ++++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/msvs/RedisWindowsX64/Product.wxs b/msvs/RedisWindowsX64/Product.wxs
index 794b4f18..6445150d 100644
--- a/msvs/RedisWindowsX64/Product.wxs
+++ b/msvs/RedisWindowsX64/Product.wxs
@@ -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>
 
       <!--
diff --git a/msvs/RedisWindowsX64/RedisWindowsX64.wixproj b/msvs/RedisWindowsX64/RedisWindowsX64.wixproj
index 8373c65a..1944d469 100644
--- a/msvs/RedisWindowsX64/RedisWindowsX64.wixproj
+++ b/msvs/RedisWindowsX64/RedisWindowsX64.wixproj
@@ -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>
diff --git a/msvs/RedisWindowsX86/Product.wxs b/msvs/RedisWindowsX86/Product.wxs
index 94ae5621..78f3d884 100644
--- a/msvs/RedisWindowsX86/Product.wxs
+++ b/msvs/RedisWindowsX86/Product.wxs
@@ -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>
 
       <!--
diff --git a/msvs/RedisWindowsX86/RedisWindowsX86.wixproj b/msvs/RedisWindowsX86/RedisWindowsX86.wixproj
index 1da6c844..248890d4 100644
--- a/msvs/RedisWindowsX86/RedisWindowsX86.wixproj
+++ b/msvs/RedisWindowsX86/RedisWindowsX86.wixproj
@@ -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>
-- 
GitLab