diff --git a/packages/fusioninventory.xml b/packages/fusioninventory.xml index 299555e..45c56c4 100755 --- a/packages/fusioninventory.xml +++ b/packages/fusioninventory.xml @@ -2,7 +2,7 @@ diff --git a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/fusioninventory/fusioninventory_x64.reg/10All b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/fusioninventory/fusioninventory_x64.reg/10All index 667d33a..1dac21a 100644 --- a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/fusioninventory/fusioninventory_x64.reg/10All +++ b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/fusioninventory/fusioninventory_x64.reg/10All @@ -1,5 +1,3 @@ -Windows Registry Editor Version 5.00 - { my $server = ${'fusioninventory-agent'}{'Server'} || 'https://inventory.firewall-services.com/'; @@ -7,6 +5,8 @@ my $user = ${'fusioninventory-agent'}{'User'} || $DomainName; my $pass = ${'fusioninventory-agent'}{'Password'} || 'secret'; my $out .=<<"EOF"; +Windows Registry Editor Version 5.00 + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\FusionInventory-Agent] "server"="$server" "tag"="$DomainName" @@ -32,4 +32,3 @@ $out =~ s/\n/\r\n/g; $OUT = $out; } - diff --git a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/fusioninventory/fusioninventory_x86.reg/10All b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/fusioninventory/fusioninventory_x86.reg/10All index 75412e8..765aacb 100644 --- a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/fusioninventory/fusioninventory_x86.reg/10All +++ b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/fusioninventory/fusioninventory_x86.reg/10All @@ -1,5 +1,3 @@ -Windows Registry Editor Version 5.00 - { my $server = ${'fusioninventory-agent'}{'Server'} || 'https://inventory.firewall-services.com/'; @@ -7,6 +5,8 @@ my $user = ${'fusioninventory-agent'}{'User'} || $DomainName; my $pass = ${'fusioninventory-agent'}{'Password'} || 'secret'; my $out .=<<"EOF"; +Windows Registry Editor Version 5.00 + [HKEY_LOCAL_MACHINE\\SOFTWARE\\FusionInventory-Agent] "server"="$server" "tag"="$DomainName" @@ -32,4 +32,3 @@ $out =~ s/\n/\r\n/g; $OUT = $out; } - diff --git a/wpkg-fusioninventory.spec b/wpkg-fusioninventory.spec index d8d659d..2619f0c 100644 --- a/wpkg-fusioninventory.spec +++ b/wpkg-fusioninventory.spec @@ -1,6 +1,6 @@ %define package fusioninventory %define version 2.2.0 -%define release 1 +%define release 2 Name: wpkg-%{package} Version: %{version} @@ -48,6 +48,9 @@ cp -r packages/* %{buildroot}/home/e-smith/files/shares/wpkg/files/packages/ /bin/rm -rf %{buildroot} %changelog +* Fri Jun 8 2012 Daniel Berteaud 2.2.0-2 +- Fix reg templates + * Wed Jun 6 2012 Daniel Berteaud 2.2.0-1 - change version scheme