YunoHost-Apps/baikal_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/baikal_ynh.git synced 2024-09-03 18:16:11 +02:00
Code Issues Activity Actions

Adding new labels in Baikal sources

Browse source 
Original Baikal sources contains problem with PROJECT_BASEURI and we
need to change it to $path.
Also fixed install script.
This commit is contained in:
aquaxp 2014-03-21 00:06:02 +07:00
parent 751839e78e
commit 9a4476cba3
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/install
View file

@ -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@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@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@PROJECT_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
# Reload Nginx and regenerate SSOwat conf # Reload Nginx and regenerate SSOwat conf
sudo service php5-fpm restart sudo service php5-fpm restart

4
sources/Core/Frameworks/Baikal/Model/Config/System.php
View file

@ -208,10 +208,10 @@ define("BAIKAL_PATH_SABREDAV", PROJECT_PATH_FRAMEWORKS . "SabreDAV/lib/Sabre/");
define("BAIKAL_AUTH_REALM", "BaikalDAV"); define("BAIKAL_AUTH_REALM", "BaikalDAV");
# Should begin and end with a "/" # 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 "/" # 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 path to Baïkal Database SQLite file
define("PROJECT_SQLITE_FILE", PROJECT_PATH_SPECIFIC . "db/db.sqlite"); define("PROJECT_SQLITE_FILE", PROJECT_PATH_SPECIFIC . "db/db.sqlite");