Moved updbooster cache files to a larger partition

Added changes to the first core update to avoid full root partitions

git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1113 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/httpd/vhosts.d/ipfire-interface.conf b/config/httpd/vhosts.d/ipfire-interface.conf
index 604802f996ff31e33d23e2765ada4b024da25c85..bf55b2b37ce9a006599606dfd6cd10b3000c935c 100644 (file)
--- a/config/httpd/vhosts.d/ipfire-interface.conf
+++ b/config/httpd/vhosts.d/ipfire-interface.conf
@@ -50,5 +50,12 @@
         AuthUserFile /var/ipfire/auth/users
         Require user dial admin
     </Directory>
+    Alias /updatecache/ /var/updatecache/
+<Directory /var/updatecache>
+     Options ExecCGI
+     AllowOverride None
+     Order deny,allow
+     Allow from all
+</Directory>
 
-</VirtualHost>
\ No newline at end of file
+</VirtualHost>

diff --git a/config/rootfiles/core/1/files b/config/rootfiles/core/1/files
index 74e20ec9c2fc7d4842cde2254b3d096048544c54..9f15b21f92ba727efaa2b7db879954a461665cd8 100644 (file)
--- a/config/rootfiles/core/1/files
+++ b/config/rootfiles/core/1/files
@@ -2,3 +2,6 @@ var/ipfire/langs
 srv/web/ipfire/cgi-bin/qos.cgi
 srv/web/ipfire/cgi-bin/pakfire.cgi
 opt/pakfire/lib/functions.sh
+srv/web/ipfire/cgi-bin/updatexlrator.cgi
+usr/sbin/updxlrator
+var/ipfire/updatexlrator/bin/download

diff --git a/config/rootfiles/core/1/update.sh b/config/rootfiles/core/1/update.sh
index 988c9e2c098c4dfed55b851836ca48ce2bc18b88..e5442e410bce8f8244653894a18ad546a78580b4 100644 (file)
--- a/config/rootfiles/core/1/update.sh
+++ b/config/rootfiles/core/1/update.sh
@@ -2,5 +2,7 @@
 . /opt/pakfire/lib/functions.sh
 
 extract_files
+mv /srv/web/ipfire/html/updatecache /var/
+/etc/init.d/squid restart
 
 reload_all

diff --git a/config/updxlrator/download b/config/updxlrator/download
index f2af9f8e0b543ce507ccd2c02b9565b455d00ba2..87bae3fc44204ed2156a0df25c164fca0d780767 100644 (file)
--- a/config/updxlrator/download
+++ b/config/updxlrator/download
@@ -10,8 +10,8 @@
 use strict;
 
 my $logfile="/var/log/updatexlrator/download.log";
-my $debug = 0;
-my $updcachedir="/srv/web/ipfire/html/updatecache";
+my $debug = 1;
+my $updcachedir="/var/updatecache";
 my $updfile='';
 my @metadata=();
 

diff --git a/config/updxlrator/updxlrator b/config/updxlrator/updxlrator
index 33f8d89eff68ab37ecf15fb8851e9c8fe0678859..60aa5462cdf72eaa6b8ee80363005ad81502e650 100644 (file)
--- a/config/updxlrator/updxlrator
+++ b/config/updxlrator/updxlrator
@@ -14,7 +14,7 @@ use IO::Socket;
 $|=1;
 
 my $swroot="/var/ipfire";
-my $updcachedir="/srv/web/ipfire/html/updatecache";
+my $updcachedir="/var/updatecache";
 my %netsettings=();
 my %xlratorsettings=();
 my $http_port="81";

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 85fd7dd6cac26b5c60aaf7303afb67d697901cbc..01a2cd16b1c8acaed8d7043b8888878c04f3da1c 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -145,7 +145,7 @@
 * libwww-perl-5.803
 * libxml2-2.6.26
 * libxslt-1.1.17
-* linux-2.6.16.56
+* linux-2.6.16.57
 * linux-atm-2.4.1
 * linux-libc-headers-2.6.12.0
 * linuxigd-0.95
@@ -183,7 +183,7 @@
 * nfs-utils-1.1.1
 * nmap-4.03
 * noip_updater_v1.6
-* ntfs-3g-1.1030
+* ntfs-3g-1.1104
 * ntp-4.2.2
 * ocaml-3.09.2
 * oinkmaster-2.0
@@ -213,7 +213,7 @@
 * rrdtool-1.2.15
 * rsync-2.6.9
 * rtorrent-0.7.6
-* samba-3.0.26a
+* samba-3.0.27a
 * screen-4.0.3
 * sdparm-1.01
 * sed-4.1.5

diff --git a/html/cgi-bin/updatexlrator.cgi b/html/cgi-bin/updatexlrator.cgi
index ad0c4796d8a1d9f29cc21279773eb6d371fc52db..5c282f3bd287495b895838cb6160d1ccabb23e6b 100644 (file)
--- a/html/cgi-bin/updatexlrator.cgi
+++ b/html/cgi-bin/updatexlrator.cgi
@@ -48,7 +48,7 @@ my $filedate='';
 my $lastaccess='';
 my $lastcheck='';
 
-my $repository = "/srv/web/ipfire/html/updatecache";
+my $repository = "/var/updatecache";
 my $hintcolour = '#FFFFCC';
 
 my $sfNoSource='0';
@@ -77,7 +77,7 @@ $xlratorsettings{'ACTION'} = '';
 $xlratorsettings{'ENABLE_LOG'} = 'off';
 $xlratorsettings{'CHILDREN'} = '5';
 $xlratorsettings{'PASSIVE_MODE'} = 'off';
-$xlratorsettings{'MAX_DISK_USAGE'} = '75';
+$xlratorsettings{'MAX_DISK_USAGE'} = '95';
 $xlratorsettings{'LOW_DOWNLOAD_PRIORITY'} = 'off';
 $xlratorsettings{'ENABLE_AUTOCHECK'} = 'off';
 $xlratorsettings{'FULL_AUTOSYNC'} = 'off';