From 8164c4dd61b349a11a7b3d74c119ccb7dad198bc Mon Sep 17 00:00:00 2001
From: new23d <dhruvahuja@gmail.com>
Date: Mon, 12 May 2014 15:02:06 +0100
Subject: [PATCH] Made compatible with MS Windows 2003 R2.

---
 opt/Facter_CEF.xml  | 57 ---------------------------------------------
 opt/facter_cef.rb   |  8 ++++++-
 opt/service.bat     | 16 +++++++------
 wxs/mcollective.wxs | 11 ++++-----
 4 files changed, 21 insertions(+), 71 deletions(-)
 delete mode 100644 opt/Facter_CEF.xml

diff --git a/opt/Facter_CEF.xml b/opt/Facter_CEF.xml
deleted file mode 100644
index 033af64..0000000
--- a/opt/Facter_CEF.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-16"?>
-<Task version="1.2" xmlns="http://schemas.microsoft.com/windows/2004/02/mit/task">
-  <RegistrationInfo>
-    <Date>2014-04-15T00:00:00</Date>
-    <Author>new23d</Author>
-    <Description>Facter Caching of Expensive Facts</Description>
-  </RegistrationInfo>
-  <Triggers>
-    <TimeTrigger>
-      <Repetition>
-        <Interval>PT10M</Interval>
-        <StopAtDurationEnd>false</StopAtDurationEnd>
-      </Repetition>
-      <StartBoundary>2014-01-01T00:00:00</StartBoundary>
-      <ExecutionTimeLimit>PT9M</ExecutionTimeLimit>
-      <Enabled>true</Enabled>
-    </TimeTrigger>
-    <RegistrationTrigger>
-      <ExecutionTimeLimit>PT9M</ExecutionTimeLimit>
-      <Enabled>true</Enabled>
-    </RegistrationTrigger>
-    <BootTrigger>
-      <ExecutionTimeLimit>PT9M</ExecutionTimeLimit>
-      <Enabled>true</Enabled>
-    </BootTrigger>
-  </Triggers>
-  <Principals>
-    <Principal id="Author">
-      <UserId>S-1-5-18</UserId>
-      <RunLevel>HighestAvailable</RunLevel>
-    </Principal>
-  </Principals>
-  <Settings>
-    <MultipleInstancesPolicy>IgnoreNew</MultipleInstancesPolicy>
-    <DisallowStartIfOnBatteries>false</DisallowStartIfOnBatteries>
-    <StopIfGoingOnBatteries>true</StopIfGoingOnBatteries>
-    <AllowHardTerminate>true</AllowHardTerminate>
-    <StartWhenAvailable>true</StartWhenAvailable>
-    <RunOnlyIfNetworkAvailable>false</RunOnlyIfNetworkAvailable>
-    <IdleSettings>
-      <StopOnIdleEnd>true</StopOnIdleEnd>
-      <RestartOnIdle>false</RestartOnIdle>
-    </IdleSettings>
-    <AllowStartOnDemand>true</AllowStartOnDemand>
-    <Enabled>true</Enabled>
-    <Hidden>false</Hidden>
-    <RunOnlyIfIdle>false</RunOnlyIfIdle>
-    <WakeToRun>false</WakeToRun>
-    <ExecutionTimeLimit>PT0S</ExecutionTimeLimit>
-    <Priority>8</Priority>
-  </Settings>
-  <Actions Context="Author">
-    <Exec>
-      <Command>"%ProgramFiles(x86)%\MCollective\opt\facter_cef.bat"</Command>
-    </Exec>
-  </Actions>
-</Task>
\ No newline at end of file
diff --git a/opt/facter_cef.rb b/opt/facter_cef.rb
index 5232800..fb378cb 100644
--- a/opt/facter_cef.rb
+++ b/opt/facter_cef.rb
@@ -1,6 +1,12 @@
 ## basic config start
 
-var_cached_facts_file = ENV['ProgramData'] + '/PuppetLabs/facter/facts.d/facter_cef.yaml'
+if ENV.key('ProgramData')
+  var_platform_program_data = ENV['ProgramData']
+else
+  var_platform_program_data = ENV['ALLUSERSPROFILE'] + '\Application Data'
+end
+
+var_cached_facts_file = var_platform_program_data + '/PuppetLabs/facter/facts.d/facter_cef.yaml'
 
 var_expensive_facts_regex = [
   'network_.*',
diff --git a/opt/service.bat b/opt/service.bat
index cc5005b..bb562cf 100644
--- a/opt/service.bat
+++ b/opt/service.bat
@@ -6,12 +6,14 @@ set var_puppet_value_name="RememberedInstallDir"
 
 for /f "usebackq skip=1 tokens=1,2*" %%a in (`reg query %var_puppet_key_name% /v %var_puppet_value_name%`) do (set var_puppet_base_dir=%%c)
 
+if defined ProgramData (set var_platform_program_data=%ProgramData%) else (set var_platform_program_data=%ALLUSERSPROFILE%\Application Data)
+
 set var_mcollective_base_dir=%ProgramFiles(x86)%\MCollective\
-set var_mcollective_etc_dir=%ProgramData%\MCollective\etc\
+set var_mcollective_etc_dir=%var_platform_program_data%\MCollective\etc\
 
 set var_programfilesx86_dir=%ProgramFiles(x86)%
 
-if not exist %ProgramData%\MCollective\etc\server.cfg (
+if not exist "%var_mcollective_etc_dir%server.cfg" (
 echo ^
 main_collective = mcollective^
 
@@ -19,7 +21,7 @@ main_collective = mcollective^
 
 libdir = !var_programfilesx86_dir!\MCollective\plugins^
 
-logfile = %ProgramData%\MCollective\var\log\server.log^
+logfile = %var_platform_program_data%\MCollective\var\log\server.log^
 
 loglevel = debug^
 
@@ -57,7 +59,7 @@ plugin.rabbitmq.pool.size = 1^
 
 factsource = facter^
 
-plugin.facter.facterlib = %ProgramData%\PuppetLabs\puppet\var\lib\facter^
+plugin.facter.facterlib = %var_platform_program_data%\PuppetLabs\puppet\var\lib\facter^
 
 ^
 
@@ -77,13 +79,13 @@ rpcaudit = 1^
 
 rpcauditprovider = logfile^
 
-plugin.rpcaudit.logfile = %ProgramData%\MCollective\var\log\audit.log^
+plugin.rpcaudit.logfile = %var_platform_program_data%\MCollective\var\log\audit.log^
 
 ^
 
-classesfile = %ProgramData%\PuppetLabs\puppet\var\state\classes.txt^
+classesfile = %var_platform_program_data%\PuppetLabs\puppet\var\state\classes.txt^
 
-> %ProgramData%\MCollective\etc\server.cfg
+> "%var_mcollective_etc_dir%server.cfg"
 )
 
 call "%var_puppet_base_dir%bin\environment.bat"
diff --git a/wxs/mcollective.wxs b/wxs/mcollective.wxs
index 72f1c8e..e328879 100644
--- a/wxs/mcollective.wxs
+++ b/wxs/mcollective.wxs
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-	<Product Name='MCollective' Version='2.5.0002' Id='*' UpgradeCode='D1B7E318-BED6-430C-9194-9427BEA29797' Language='1033' Codepage='1252' Manufacturer='new23d'>
-		<Package Id='*' Compressed='yes' InstallerVersion='400' />
+	<Product Name='MCollective' Version='2.5.0003' Id='*' UpgradeCode='D1B7E318-BED6-430C-9194-9427BEA29797' Language='1033' Codepage='1252' Manufacturer='new23d'>
+		<Package Id='*' Compressed='yes' InstallerVersion='300' />
 		<Media Id='1' Cabinet='mcollective' EmbedCab='yes' />
 
 		<MajorUpgrade DowngradeErrorMessage='A later version of MCollective is already installed. Setup will now exit.' />
 
 		<Property Id='PUPPETLABSINSTALLED'>
-			<RegistrySearch Id='PuppetLabsRememberedInstallDir' Type='raw' Root='HKLM' Key='SOFTWARE\Wow6432Node\Puppet Labs\Puppet' Name='RememberedInstallDir' />
+			<RegistrySearch Id='PuppetLabsRememberedInstallDir' Type='raw' Root='HKLM' Key='SOFTWARE\Puppet Labs\Puppet' Name='RememberedInstallDir' Win64='no' />
 		</Property>
 
 		<Condition Message='Puppet from Puppet Labs is a requirement.'>
@@ -25,7 +25,6 @@
 						</Component>
 						<Component Id='FacterCEF' Guid='816A2919-0BFD-41C1-A231-89D53690981C'>
 							<File Source='..\opt\facter_cef.rb' />
-							<File Source='..\opt\Facter_CEF.xml' />
 							<File Source='..\opt\facter_cef.bat' />
 						</Component>
 					</Directory>
@@ -59,7 +58,7 @@
 			</Directory>
 		</Directory>
 
-		<CustomAction Id='FacterCEFScheduledTaskCreate' Directory='Opt' ExeCommand='schtasks /create /f /xml ..\opt\Facter_CEF.xml /tn Facter_CEF' Execute='deferred' Impersonate='no' />
+		<CustomAction Id='FacterCEFScheduledTaskCreate' Directory='Opt' ExeCommand='schtasks /create /ru system /sc daily /tn Facter_CEF /tr "%ProgramFiles(x86)%\MCollective\opt\facter_cef.bat" /ri 10 /f' Execute='deferred' Impersonate='no' />
 		<CustomAction Id='FacterCEFScheduledTaskDelete' Directory='Log' ExeCommand='schtasks /delete /f /tn Facter_CEF' Execute='commit' Impersonate='no' />
 
 		<InstallExecuteSequence>
@@ -77,4 +76,4 @@
 			<ComponentRef Id='FacterCEFYamlFile' />
 		</Feature>
 	</Product>
-</Wix>
+</Wix>
\ No newline at end of file