diff --git a/pagure/default_config.py b/pagure/default_config.py index 1936b5e..d55d53f 100644 --- a/pagure/default_config.py +++ b/pagure/default_config.py @@ -119,10 +119,6 @@ SESSION_COOKIE_NAME = 'pagure' # Default: ``pagure``. #SESSION_COOKIE_PATH = 'pagure' -# If not specified the application will rely on the root_url when sending -# emails, otherwise it will use this URL -# Default: ``None``. -APPLICATION_URL = None # Boolean specifying wether to check the user's IP address when retrieving # its session. This make things more secure (thus is on by default) but diff --git a/pagure/lib/notify.py b/pagure/lib/notify.py index bd359b8..82d7af7 100644 --- a/pagure/lib/notify.py +++ b/pagure/lib/notify.py @@ -430,7 +430,7 @@ def notify_new_email(email, user): ''' Ask the user to confirm to the email belong to them. ''' - root_url = pagure.APP.config.get('APPLICATION_URL', flask.request.url_root) + root_url = pagure.APP.config.get('APP_URL', flask.request.url_root) url = urlparse.urljoin( root_url or flask.request.url_root, diff --git a/pagure/ui/login.py b/pagure/ui/login.py index 4c1aaa1..9ab6461 100644 --- a/pagure/ui/login.py +++ b/pagure/ui/login.py @@ -402,7 +402,7 @@ def send_confirmation_email(user): if not user.emails: return - url = APP.config.get('APPLICATION_URL', flask.request.url_root) + url = APP.config.get('APP_URL', flask.request.url_root) url = urlparse.urljoin( url or flask.request.url_root, @@ -441,7 +441,7 @@ def send_lostpassword_email(user): if not user.emails: return - url = APP.config.get('APPLICATION_URL', flask.request.url_root) + url = APP.config.get('APP_URL', flask.request.url_root) url = urlparse.urljoin( url or flask.request.url_root,