diff --git a/flexisip-account-manager.spec b/flexisip-account-manager.spec index 83c0891..3160dc9 100644 --- a/flexisip-account-manager.spec +++ b/flexisip-account-manager.spec @@ -8,7 +8,7 @@ #%define _datadir %{_datarootdir} #%define _docdir %{_datadir}/doc -%define build_number 21 +%define build_number 22 %define var_dir /var/opt/belledonne-communications %define opt_dir /opt/belledonne-communications/share/flexisip-account-manager %define env_file "$RPM_BUILD_ROOT/etc/flexisip-account-manager/flexiapi.env" diff --git a/httpd/flexisip-account-manager.conf b/httpd/flexisip-account-manager.conf index ba32c65..aa8c72f 100644 --- a/httpd/flexisip-account-manager.conf +++ b/httpd/flexisip-account-manager.conf @@ -5,6 +5,7 @@ Alias /flexisip-account-manager /opt/belledonne-communications/share/flexisip-ac Options FollowSymLinks MultiViews AllowOverride None Require all denied + SetEnv FLEXISIP_ACCOUNT_MANAGER_PATH_TO_CONFIG /etc/flexisip-account-manager diff --git a/src/config/config.php b/src/config/config.php index c6fba9d..59d244f 100644 --- a/src/config/config.php +++ b/src/config/config.php @@ -18,20 +18,21 @@ along with this program. If not, see . */ -define("PATH_TO_CONFIG", "/etc/flexisip-account-manager"); +$path = isset($_SERVER['FLEXISIP_ACCOUNT_MANAGER_PATH_TO_CONFIG']) ? $_SERVER['FLEXISIP_ACCOUNT_MANAGER_PATH_TO_CONFIG'] : "/etc/flexisip-account-manager"; +define("FLEXISIP_ACCOUNT_MANAGER_PATH_TO_CONFIG", $path); -include_once PATH_TO_CONFIG . '/accounts.conf'; -include_once PATH_TO_CONFIG . '/auth.conf'; -include_once PATH_TO_CONFIG . '/db.conf'; -include_once PATH_TO_CONFIG . '/emails.conf'; -include_once PATH_TO_CONFIG . '/inapp.conf'; -include_once PATH_TO_CONFIG . '/logs.conf'; -include_once PATH_TO_CONFIG . '/provisioning.conf'; -include_once PATH_TO_CONFIG . '/sms.conf'; -include_once PATH_TO_CONFIG . '/tests.conf'; +include_once FLEXISIP_ACCOUNT_MANAGER_PATH_TO_CONFIG . '/accounts.conf'; +include_once FLEXISIP_ACCOUNT_MANAGER_PATH_TO_CONFIG . '/auth.conf'; +include_once FLEXISIP_ACCOUNT_MANAGER_PATH_TO_CONFIG . '/db.conf'; +include_once FLEXISIP_ACCOUNT_MANAGER_PATH_TO_CONFIG . '/emails.conf'; +include_once FLEXISIP_ACCOUNT_MANAGER_PATH_TO_CONFIG . '/inapp.conf'; +include_once FLEXISIP_ACCOUNT_MANAGER_PATH_TO_CONFIG . '/logs.conf'; +include_once FLEXISIP_ACCOUNT_MANAGER_PATH_TO_CONFIG . '/provisioning.conf'; +include_once FLEXISIP_ACCOUNT_MANAGER_PATH_TO_CONFIG . '/sms.conf'; +include_once FLEXISIP_ACCOUNT_MANAGER_PATH_TO_CONFIG . '/tests.conf'; // these two might include some of the scripts from the installation, so keep them last -include_once PATH_TO_CONFIG . '/hooks.conf'; -include_once PATH_TO_CONFIG . '/overloads.conf'; +include_once FLEXISIP_ACCOUNT_MANAGER_PATH_TO_CONFIG . '/hooks.conf'; +include_once FLEXISIP_ACCOUNT_MANAGER_PATH_TO_CONFIG . '/overloads.conf'; ?>