[RackTables/f16] Rebase to v0.19.12, take 5

Colin Coe coec at fedoraproject.org
Sat Apr 21 12:38:19 UTC 2012


commit 89f0424e6d6ad75ddb57149475a3c2672ecdae4e
Author: Colin Coe <colin.coe at gmail.com>
Date:   Sat Apr 21 20:38:13 2012 +0800

    Rebase to v0.19.12, take 5

 RackTables-Fedora-paths.patch |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)
---
diff --git a/RackTables-Fedora-paths.patch b/RackTables-Fedora-paths.patch
new file mode 100644
index 0000000..ab3a68e
--- /dev/null
+++ b/RackTables-Fedora-paths.patch
@@ -0,0 +1,26 @@
+diff -ru RackTables-0.19.12.orig/scripts/syncdomain.php RackTables-0.19.12/scripts/syncdomain.php
+--- RackTables-0.19.12.orig/scripts/syncdomain.php	2012-03-14 20:58:35.000000000 +0800
++++ RackTables-0.19.12/scripts/syncdomain.php	2012-04-15 13:26:21.612466742 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/php
++#!/usr/bin/php
+ <?php
+ 
+ # This file is a part of RackTables, a datacenter and server room management
+diff -ru RackTables-0.19.12.orig/wwwroot/inc/pre-init.php RackTables-0.19.12/wwwroot/inc/pre-init.php
+--- RackTables-0.19.12.orig/wwwroot/inc/pre-init.php	2012-03-14 20:58:35.000000000 +0800
++++ RackTables-0.19.12/wwwroot/inc/pre-init.php	2012-04-15 13:27:46.210465219 +0800
+@@ -24,11 +24,11 @@
+ # code, multiple instances" deploy, in which case the paths could be changed
+ # in the custom entry point wrapper (like own index.php)
+ if (! isset ($racktables_staticdir)) // the directory containing 'pix', 'js', 'css' dirs
+-	$racktables_staticdir = $racktables_rootdir;
++	$racktables_staticdir = '/usr/share/RackTables/static';
+ if (! isset ($racktables_gwdir)) // the directory containing 'deviceconfig', 'sendfile' dirs, etc
+ 	$racktables_gwdir = realpath ($racktables_rootdir . '/../gateways');
+ if (! isset ($racktables_confdir)) // the directory containing local.php and secret.php (default is wwwroot/inc)
+-	$racktables_confdir = dirname (__FILE__);
++	$racktables_confdir = '/etc/RackTables';
+ if (! isset ($path_to_secret_php))
+ 	$path_to_secret_php = $racktables_confdir . '/secret.php';
+ if (! isset ($path_to_local_php))


More information about the scm-commits mailing list