From 21f69fdf7c865dd5b8009df3994f4152e54102a4 Mon Sep 17 00:00:00 2001
From: Alexis Campailla <alexis@janeasystems.com>
Date: Mon, 4 May 2015 07:52:26 -0700
Subject: [PATCH] msi: added/renamed configuration files

Added redis.windows.conf
Renamed redis.service.conf to redis.windows-service.conf
---
 msvs/msi/RedisMsi/Components/DocumentationComponents.wxs    | 6 +++++-
 msvs/msi/RedisMsi/Components/WindowsServiceComponents.wxs   | 2 +-
 .../{redis.service.conf => redis.windows-service.conf}      | 0
 3 files changed, 6 insertions(+), 2 deletions(-)
 rename msvs/setups/documentation/{redis.service.conf => redis.windows-service.conf} (100%)

diff --git a/msvs/msi/RedisMsi/Components/DocumentationComponents.wxs b/msvs/msi/RedisMsi/Components/DocumentationComponents.wxs
index 2045e849..17776982 100644
--- a/msvs/msi/RedisMsi/Components/DocumentationComponents.wxs
+++ b/msvs/msi/RedisMsi/Components/DocumentationComponents.wxs
@@ -3,7 +3,11 @@
   <Fragment>
     <!--Documentation files to install-->
     <ComponentGroup Id="DocumentationComponents" Directory="INSTALLFOLDER" Source="!(wix.DocumentationFolder)">
-      
+
+      <Component Id="cmp_Redis_Windows_Conf" Guid="*">
+        <File Name="redis.windows.conf" />
+      </Component>
+
       <Component Id="cmp_Redis_on_Windows_Release_NotesDOCX" Guid="*">
         <File Name="Redis on Windows Release Notes.docx" />
       </Component>
diff --git a/msvs/msi/RedisMsi/Components/WindowsServiceComponents.wxs b/msvs/msi/RedisMsi/Components/WindowsServiceComponents.wxs
index 8e4e840c..55cb5017 100644
--- a/msvs/msi/RedisMsi/Components/WindowsServiceComponents.wxs
+++ b/msvs/msi/RedisMsi/Components/WindowsServiceComponents.wxs
@@ -12,7 +12,7 @@
       -->
       <Component Id="cmp_redis_server" Guid="{959AF3FA-9324-49CB-8915-0563398CDDF6}">
         <File Id="file_redis_serverEXE" Source="$(var.RedisServer.TargetDir)redis-server.exe" KeyPath="yes" />
-        <File Id="file_redis_serviceCONF" Source="!(wix.DocumentationFolder)\redis.service.conf" />
+        <File Id="file_redis_serviceCONF" Source="!(wix.DocumentationFolder)\redis.windows-service.conf" />
 
         <ServiceInstall Id="redisService"
                         Name="Redis"
diff --git a/msvs/setups/documentation/redis.service.conf b/msvs/setups/documentation/redis.windows-service.conf
similarity index 100%
rename from msvs/setups/documentation/redis.service.conf
rename to msvs/setups/documentation/redis.windows-service.conf
-- 
GitLab