diff --git a/conf/emails.conf b/conf/emails.conf
index 55b2347..f5acab6 100644
--- a/conf/emails.conf
+++ b/conf/emails.conf
@@ -19,11 +19,11 @@ define("EMAIL_SITE", "https://linphone.org");
/*
* The link to open when click on activation
- * It can have a %link%, %username%, %domain%, and %algo% parameter
+ * It must have a %key% and %username% parameters and eventually a %domain% and/or %algo%
*
- * Default value: www.linphone.org
+ * Default value: www.linphone.org/flexisip-account-manager/activation.php?username=%username%&confirmation_key=%key%&domain=%domain%&algorithm=%algo%
*/
-define("EMAIL_ACTIVATION_LINK", "www.linphone.org");
+define("EMAIL_ACTIVATION_LINK", "www.linphone.org/flexisip-account-manager/activation.php?username=%username%&confirmation_key=%key%&domain=%domain%&algorithm=%algo%");
/*
* The FROM address to set in the email header.
@@ -46,11 +46,13 @@ define("EMAIL_ACTIVATION_SUBJECT", "Start your sip.linphone.org service");
/*
* The body (as text) of the activation account email.
+ * It must have a %link% parameter somewhere with the link to click to activate the account
*/
define("EMAIL_ACTIVATION_BODY", "Hello,\nActivation pending for using your Linphone account.\nPlease use the link bellow to activate your account :\n\n%link%\n\nRegards,\nThe Linphone team.\n");
/*
* The body (as html) of the activation account email.
+ * It must have a %link% parameter somewhere with the link to click to activate the account
*/
define("EMAIL_ACTIVATION_BODY_HTML", 'Start your sip.linphone.org serviceHello,
Activation pending for using your Linphone account.
Please use the link bellow to activate your account :
%link%
Regards,
The Linphone team.
');
@@ -61,11 +63,13 @@ define("EMAIL_RECOVERY_SUBJECT", "Recover your sip.linphone.org account");
/*
* The body (as text) of the account recovery email.
+ * It must have a %key% parameter that will be replaced with the recovery code
*/
define("EMAIL_RECOVERY_BODY", "Hello,\nHere is your recovery code: %key%\n\nRegards,\nThe Linphone team.\n");
/*
* The body (as html) of the account recovery email.
+ * It must have a %key% parameter that will be replaced with the recovery code
*/
define("EMAIL_RECOVERY_BODY_HTML", 'Recover your sip.linphone.org accountHello,
Here is your recovery code: %key%
Regards,
The Linphone team.
');
diff --git a/flexisip-account-manager.spec b/flexisip-account-manager.spec
index 6577717..9bd93ff 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 23
+%define build_number 24
%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 aa8c72f..da07f36 100644
--- a/httpd/flexisip-account-manager.conf
+++ b/httpd/flexisip-account-manager.conf
@@ -7,6 +7,13 @@ Alias /flexisip-account-manager /opt/belledonne-communications/share/flexisip-ac
Require all denied
SetEnv FLEXISIP_ACCOUNT_MANAGER_PATH_TO_CONFIG /etc/flexisip-account-manager
+
+
+ Require all granted
+ Require not env blockAccess
+
+
+
Require all granted