make webconverger fetch configurable and move it to sub-directory

diff --git a/lib/PXElator/config.pm b/lib/PXElator/config.pm
index 68eb243..90e8b61 100644 (file)
--- a/lib/PXElator/config.pm
+++ b/lib/PXElator/config.pm
@@ -53,15 +53,19 @@ sub webconverger {
 
        $mounted->{"webconverger/$ip"} ||= upstream::iso( 'http://download.webconverger.com/webc-5.5.iso' );
 
-       my $homepage = client::conf( $ip => 'homepage', default => "http://${server::ip}:7777/client" );
        my $hostname = client::conf( $ip => 'hostname' ) || 'webconverger';
 
+       my $homepage = client::conf( $ip => 'webconverger/homepage'
+               , default => "http://${server::ip}:7777/client" );
+       my $fetch    = client::conf( $ip => 'webconverger/fetch'
+               , default => "http://${server::ip}:7777/webconverger/iso/live/filesystem.squashfs" );
+
        pxelinux::config_for_ip( $ip, qq{
 
 default webconverger
 label webconverger
        kernel iso/live/vmlinuz-2.6.30-backports.1-486
-       append initrd=iso/live/initrd.img-2.6.30-backports.1-486 fetch=http://${server::ip}:7777/webconverger/iso/live/filesystem.squashfs boot=live quiet nosudo splash video=vesa:ywrap,mtrr vga=788 nopersistent username=webc hostname=$hostname union=aufs homepage=$homepage locale=hr
+       append initrd=iso/live/initrd.img-2.6.30-backports.1-486 fetch=$fetch boot=live quiet nosudo splash video=vesa:ywrap,mtrr vga=788 nopersistent username=webc hostname=$hostname union=aufs homepage=$homepage locale=hr
 
        });