Merge commit '4969f31e1f' into WebGUI8

This commit is contained in:
Colin Kuskie 2010-06-26 14:37:31 -07:00
commit e5b82bc861
61 changed files with 2199 additions and 521 deletions

View file

@ -71,7 +71,7 @@ sub moveMaintenance {
sub addMaintenancePageToConfig {
my $session = shift;
print "\tAdd maintenance page entry to the config file " unless $quiet;
$session->config->set('maintenancePage', '/data/WebGUI/var/www/maintenance.html');
$session->config->set('maintenancePage', '/data/WebGUI/www/maintenance.html');
print "DONE!\n" unless $quiet;
}
@ -79,9 +79,9 @@ sub moveFileLocations {
my $session = shift;
print "\tMoving preload files " unless $quiet;
unlink '../../sbin/preload.custom.example';
rename '../../sbin/preload.custom', File::Spec->catfile(WebGUI::Paths->etc, 'preload.custom');
rename '../../sbin/preload.custom', File::Spec->catfile(WebGUI::Paths->configBase, 'preload.custom');
unlink '../../sbin/preload.exclude.example';
rename '../../sbin/preload.exclude', File::Spec->catfile(WebGUI::Paths->etc, 'preload.exclude');
rename '../../sbin/preload.exclude', File::Spec->catfile(WebGUI::Paths->configBase, 'preload.exclude');
unlink '../../lib/default.ttf';
print "Done.\n" unless $quiet;
}