This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via 05a347c0ddab059ce337756c57634c664d7f6fe8 (commit) via 7e6204874286ae06847aad9f8313791f03991633 (commit) via 03baaf780efa355effe618233e7c67eb347f1567 (commit) from 0bc58278b943bcdb98ca783d155db1c411594caa (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 05a347c0ddab059ce337756c57634c664d7f6fe8 Author: Christian Schmidt christian.schmidt@ipfire.org Date: Mon Jun 21 21:04:17 2010 +0200

Added the missing functions.pl for the 2nd theme to the updated

commit 7e6204874286ae06847aad9f8313791f03991633 Author: Christian Schmidt christian.schmidt@ipfire.org Date: Mon Jun 21 21:03:20 2010 +0200

Added urlrepo for local file redirection to httpd alias.

commit 03baaf780efa355effe618233e7c67eb347f1567 Author: Christian Schmidt christian.schmidt@ipfire.org Date: Mon Jun 21 21:02:43 2010 +0200

Fixed some file does not exists output

-----------------------------------------------------------------------

Summary of changes: config/cfgroot/graphs.pl | 2 +- config/httpd/vhosts.d/ipfire-interface-ssl.conf | 8 ++++++++ config/rootfiles/core/38/filelists/files | 1 + 3 files changed, 10 insertions(+), 1 deletions(-)

Difference in files: diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 3418c68..c300b0a 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -1042,7 +1042,7 @@ sub updatecpufreqgraph { # Generate the Thermal Zone Temp CPU Graph

sub updatethermaltempgraph { - my $thermalcount = `ls -dA $mainsettings{'RRDLOG'}/collectd/localhost/thermal-thermal_zone* | wc -l`; + my $thermalcount = `ls -dA $mainsettings{'RRDLOG'}/collectd/localhost/thermal-thermal_zone* | wc -l 2>/dev/null`; my $period = $_[0]; my @command = ( "-", diff --git a/config/httpd/vhosts.d/ipfire-interface-ssl.conf b/config/httpd/vhosts.d/ipfire-interface-ssl.conf index 08ba2b3..f328f0e 100644 --- a/config/httpd/vhosts.d/ipfire-interface-ssl.conf +++ b/config/httpd/vhosts.d/ipfire-interface-ssl.conf @@ -77,4 +77,12 @@ Order deny,allow Allow from all </Directory> + + Alias /urlrepo/ /var/urlrepo/ + <Directory /var/urlrepo> + Options ExecCGI + AllowOverride None + Order deny,allow + Allow from all + </Directory> </VirtualHost> diff --git a/config/rootfiles/core/38/filelists/files b/config/rootfiles/core/38/filelists/files index 74b1eac..fc9e6c0 100644 --- a/config/rootfiles/core/38/filelists/files +++ b/config/rootfiles/core/38/filelists/files @@ -39,6 +39,7 @@ srv/web/ipfire/cgi-bin/updatexlrator.cgi srv/web/ipfire/cgi-bin/urlfilter.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/html/themes/ipfire/include/functions.pl +srv/web/ipfire/html/themes/maniac/include/functions.pl var/ipfire/langs/de.pl var/ipfire/langs/en.pl var/ipfire/langs/es.pl

hooks/post-receive -- IPFire 2.x development tree