From 9bc9fb67c3988b724f5d3b25083d4b768b1050e7 Mon Sep 17 00:00:00 2001 From: scith Date: Wed, 7 Oct 2015 22:02:12 +0200 Subject: [PATCH] Fix --- conf/sso.php | 6 +++--- scripts/install | 3 ++- scripts/upgrade | 2 ++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/conf/sso.php b/conf/sso.php index 8640e19..94e613c 100644 --- a/conf/sso.php +++ b/conf/sso.php @@ -2,7 +2,7 @@ // Enable RainLoop Api and include index file $_ENV['RAINLOOP_INCLUDE_AS_API'] = true; -include '/var/www/rainloop/index.php'; +include '/var/wwwPATHTOCHANGE/index.php'; // Retrieve email and password if (isset($_SERVER['HTTP_EMAIL']) && isset($_SERVER['PHP_AUTH_PW'])) { @@ -11,8 +11,8 @@ if (isset($_SERVER['HTTP_EMAIL']) && isset($_SERVER['PHP_AUTH_PW'])) { $ssoHash = \RainLoop\Api::GetUserSsoHash($email, $password); // redirect to webmail sso url - \header('Location: https://domain.tld/rainloop/index.php?sso&hash='.$ssoHash); + \header('Location: https://domain.tldPATHTOCHANGE/index.php?sso&hash='.$ssoHash); } else { - \header('Location: https://domain.tld/rainloop/index.php'); + \header('Location: https://domain.tldPATHTOCHANGE/index.php'); } diff --git a/scripts/install b/scripts/install index b59015c..5d1cd8c 100644 --- a/scripts/install +++ b/scripts/install @@ -71,7 +71,8 @@ sudo cp ../conf/data/domains/domain.tld.ini $final_path/data/_data_/_default_/do sudo cp ../conf/data/domains/disabled $final_path/data/_data_/_default_/domains/disabled # SSO -sed -i "s@domain.tld/rainloop@$domain$path@g" ../conf/sso.php +sed -i "s@domain.tld@$domain@g" ../conf/sso.php +sed -i "s@PATHTOCHANGE@$path@g" ../conf/sso.php sudo cp ../conf/sso.php $final_path/sso.php # Temporary workaround until someone finds a way to setup NGINX properly... diff --git a/scripts/upgrade b/scripts/upgrade index a677c78..7439145 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -38,6 +38,8 @@ sudo chown root: $finalphpconf sudo chmod 644 $finalphpconf # SSO +sed -i "s@domain.tld@$domain@g" ../conf/sso.php +sed -i "s@PATHTOCHANGE@$path@g" ../conf/sso.php sudo cp ../conf/sso.php $final_path/sso.php # Temporary workaround until someone finds a way to setup NGINX properly...