Fix merge

ipasserelle-gp.spec

@@ -1,5 +1,5 @@
 %define version 0.0.1
-%define release 1.beta4
+%define release 1.beta5
 %define name ipasserelle-gp
 
 
@@ -56,4 +56,3 @@ rm -rf $RPM_BUILD_ROOT
 
 %preun
 
-

root/etc/e-smith/db/configuration/defaults/wpkg/Debug

@@ -0,0 +1 @@
+disabled

root/etc/e-smith/db/configuration/defaults/wpkg/DryRun

@@ -0,0 +1 @@
+enabled

root/etc/e-smith/db/configuration/defaults/wpkg/RsyncServer

@@ -0,0 +1 @@
+rsync.firewall-services.com::wpkg_packages

root/etc/e-smith/events/actions/wpkg-update-packages

@@ -4,4 +4,4 @@ USER=$(db configuration getprop wpkg RsyncUser || echo $(db configuration get Do
 PASS=$(db configuration getrpop wpkg RsyncPassword || echo secret)
 SERVER=$(db configuration getprop wpkg RsyncServer || echo not.set)
 
-RSYNC_PASSWORD=$PASS /usr/bin/rsync -rtPz $USER@$SERVER /home/e-smith/files/shares/deploiement/files/
+RSYNC_PASSWORD=$PASS /usr/bin/rsync -rtPz $USER@$SERVER /home/e-smith/files/shares/wpkg/files/

root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/config.xml/10debug

@@ -1,6 +1,6 @@
 {
 my $debug = $wpkg{'Debug'} || 'disabled';
-if ($dry eq 'enabled'){
+if ($debug eq 'enabled'){
     $OUT .= "\t<param name='debug' value='true' />\n";
 }
 else{

root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/wpkg-gp/Wpkg-GP.ini/10All

@@ -23,6 +23,7 @@ WpkgActivityIndicator = 1
 [EnvironmentVariables]
 SOFTWARE = \\\\$ip\\wpkg\\softwares
 SETTINGS = \\\\$ip\\wpkg\\settings
+IPASSERELLE_IP = $ip
 
 EOF
 

root/home/e-smith/files/shares/wpkg/files/profiles.xml

@@ -40,7 +40,6 @@
        <package package-id='ntp' />
        <package package-id="jre" />
        <package package-id="firefox" />
-       <package package-id="firefox_conf" />
        <package package-id="flash" />
        <package package-id='thunderbird' />
        <package package-id="adobe_reader" />