From 9a4476cba30f9754ee06e25f6021c5df7456fb05 Mon Sep 17 00:00:00 2001 From: aquaxp Date: Fri, 21 Mar 2014 00:06:02 +0700 Subject: [PATCH] Adding new labels in Baikal sources Original Baikal sources contains problem with PROJECT_BASEURI and we need to change it to $path. Also fixed install script. --- scripts/install | 3 +-- sources/Core/Frameworks/Baikal/Model/Config/System.php | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 66e6b41..6ec52ad 100644 --- a/scripts/install +++ b/scripts/install @@ -30,8 +30,7 @@ sudo chmod 755 $final_path/Specific/db/db.sqlite sudo sed -i "s@PATHTOCHANGE@$path@g" /etc/nginx/conf.d/$domain.d/baikal.conf sudo sed -i "s@ALIASTOCHANGE@$final_path/@g" /etc/nginx/conf.d/$domain.d/baikal.conf -sudo sed -i "s@BAIKAL_CARD_BASEURI@$path@g" $final_path/Core/Frameworks/Baikal/Model/Config/System.php -sudo sed -i "s@BAIKAL_CAL_BASEURI@$path@g" /etc/nginx/conf.d/$domain.d/baikal.conf +sudo sed -i "s@PROJECT_BASEURI_@$path@g" $final_path/Core/Frameworks/Baikal/Model/Config/System.php # Reload Nginx and regenerate SSOwat conf sudo service php5-fpm restart diff --git a/sources/Core/Frameworks/Baikal/Model/Config/System.php b/sources/Core/Frameworks/Baikal/Model/Config/System.php index a17313c..3d493ea 100644 --- a/sources/Core/Frameworks/Baikal/Model/Config/System.php +++ b/sources/Core/Frameworks/Baikal/Model/Config/System.php @@ -208,10 +208,10 @@ define("BAIKAL_PATH_SABREDAV", PROJECT_PATH_FRAMEWORKS . "SabreDAV/lib/Sabre/"); define("BAIKAL_AUTH_REALM", "BaikalDAV"); # Should begin and end with a "/" -define("BAIKAL_CARD_BASEURI", PROJECT_BASEURI . "card.php/"); +define("BAIKAL_CARD_BASEURI", PROJECT_BASEURI_ . "card.php/"); # Should begin and end with a "/" -define("BAIKAL_CAL_BASEURI", PROJECT_BASEURI . "cal.php/"); +define("BAIKAL_CAL_BASEURI", PROJECT_BASEURI_ . "cal.php/"); # Define path to Baïkal Database SQLite file define("PROJECT_SQLITE_FILE", PROJECT_PATH_SPECIFIC . "db/db.sqlite");