diff --git a/ipasserelle-gp.spec b/ipasserelle-gp.spec index c62d374..c484065 100644 --- a/ipasserelle-gp.spec +++ b/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 - diff --git a/root/etc/e-smith/db/configuration/defaults/wpkg/Debug b/root/etc/e-smith/db/configuration/defaults/wpkg/Debug new file mode 100644 index 0000000..7a68b11 --- /dev/null +++ b/root/etc/e-smith/db/configuration/defaults/wpkg/Debug @@ -0,0 +1 @@ +disabled diff --git a/root/etc/e-smith/db/configuration/defaults/wpkg/DryRun b/root/etc/e-smith/db/configuration/defaults/wpkg/DryRun new file mode 100644 index 0000000..86981e6 --- /dev/null +++ b/root/etc/e-smith/db/configuration/defaults/wpkg/DryRun @@ -0,0 +1 @@ +enabled diff --git a/root/etc/e-smith/db/configuration/defaults/wpkg/RsyncServer b/root/etc/e-smith/db/configuration/defaults/wpkg/RsyncServer new file mode 100644 index 0000000..e6105fe --- /dev/null +++ b/root/etc/e-smith/db/configuration/defaults/wpkg/RsyncServer @@ -0,0 +1 @@ +rsync.firewall-services.com::wpkg_packages diff --git a/root/etc/e-smith/events/actions/wpkg-update-packages b/root/etc/e-smith/events/actions/wpkg-update-packages index 108fe30..798cc37 100644 --- a/root/etc/e-smith/events/actions/wpkg-update-packages +++ b/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/ diff --git a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/config.xml/10debug b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/config.xml/10debug index b6906ab..27a9dc9 100644 --- a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/config.xml/10debug +++ b/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\n"; } else{ diff --git a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/config.xml/120dry b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/config.xml/20dry similarity index 100% rename from root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/config.xml/120dry rename to root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/config.xml/20dry diff --git a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/wpkg-gp/Wpkg-GP.ini/10All b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/wpkg-gp/Wpkg-GP.ini/10All index 72b3d7c..6e99128 100644 --- a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/wpkg-gp/Wpkg-GP.ini/10All +++ b/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 diff --git a/root/home/e-smith/files/shares/wpkg/files/profiles.xml b/root/home/e-smith/files/shares/wpkg/files/profiles.xml index b0d0c7b..31c3189 100644 --- a/root/home/e-smith/files/shares/wpkg/files/profiles.xml +++ b/root/home/e-smith/files/shares/wpkg/files/profiles.xml @@ -40,7 +40,6 @@ -