diff options
| author |   Priit Laes <plaes@plaes.org> | 2010-08-10 17:01:19 +0300 |
|---|---|---|
| committer | Priit Laes <plaes@plaes.org> | 2010-08-10 17:01:19 +0300 |
| commit | e2475a9b1d8b678656c00f0b8067b4a87f935971 (patch) | |
| tree | 310b08b17ad3555c54145b1144708ccf1ed4910d | |
| parent | Added grumpy.wsgi file (diff) | |
| download | gsoc2010-grumpy-e2475a9b1d8b678656c00f0b8067b4a87f935971.tar.gz gsoc2010-grumpy-e2475a9b1d8b678656c00f0b8067b4a87f935971.tar.bz2 gsoc2010-grumpy-e2475a9b1d8b678656c00f0b8067b4a87f935971.zip | |
Use GRUMPY_SERVER_ADDR conf variable and fix emails
| -rw-r--r-- | conf/grumpy.cfg | 4 | ||||
| -rw-r--r-- | grumpy/templates/email/registration.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/conf/grumpy.cfg b/conf/grumpy.cfg index 292800b..da07dfa 100644 --- a/conf/grumpy.cfg +++ b/conf/grumpy.cfg @@ -13,8 +13,8 @@ SQLALCHEMY_ECHO=False SQLALCHEMY_DATABASE_URI='postgresql://grumpy:grumpy@localhost/grumpy' ## Grumpy configuration -# URL of website -GRUMPY_WEBSITE_URL='http://localhost:5000' +# Server address without the /path +GRUMPY_SERVER_ADDR='http://localhost:5000' # Default portage directory GRUMPY_PORTAGE_DIR='/usr/portage' diff --git a/grumpy/templates/email/registration.txt b/grumpy/templates/email/registration.txt index f4e05bb..121da19 100644 --- a/grumpy/templates/email/registration.txt +++ b/grumpy/templates/email/registration.txt @@ -1,6 +1,6 @@ Hey! -You have signed up on Gentoo's Grumpy ( {{ config['GRUMPY_WEBSITE_URL']}} ), +You have signed up on Gentoo's Grumpy ( {{ config['GRUMPY_SERVER_ADDR']}}{{url_for('index')}} ), but your account is not yet activated. In order to activate your account, please visit the following address: -{{ config['GRUMPY_WEBSITE_URL']}}{{ url_for('confirm_account', email=user.email) }}?token={{ user.regtoken }} +{{ config['GRUMPY_SERVER_ADDR']}}{{ url_for('confirm_account', email=user.email) }}?token={{ user.regtoken }} |