Commit 201ee3ae authored by Sofia Papagiannaki's avatar Sofia Papagiannaki
Browse files

Merge branch 'master', remote-tracking branch 'origin' into aquarium

parents 903d075f 704d6ee6
......@@ -40,11 +40,27 @@ Settings
Configure in ``settings.py`` or a ``.conf`` file in ``/etc/synnefo`` if using snf-webproject.
=============================== ================================================ ============================================================
Name Default value Description
=============================== ================================================ ============================================================
...
=============================== ================================================ ============================================================
=============================== ================================================ ============================================================
Name Default value Description
=============================== ================================================ ============================================================
ASTAKOS_AUTH_TOKEN_DURATION one month Expiration time of newly created auth tokens
ASTAKOS_TWITTER_KEY '' Twitter ``oauth_token``
ASTAKOS_TWITTER_SECRET '' Twitter ``oauth_token_secret``
ASTAKOS_DEFAULT_USER_LEVEL 4 Default (not-invited) user level
ASTAKOS_INVITATIONS_PER_LEVEL {0:100, 1:2, 2:0, 3:0, 4:0} Number of user invitations per user level
ASTAKOS_DEFAULT_FROM_EMAIL GRNET Cloud <no-reply@grnet.gr> ``from`` parameter passed in ``django.core.mail.send_mail``
ASTAKOS_DEFAULT_CONTACT_EMAIL support@cloud.grnet.gr Contact email
ASTAKOS_IM_MODULES ['local', 'twitter', 'shibboleth']) Signup modules
ASTAKOS_FORCE_PROFILE_UPDATE True Force user profile verification
ASTAKOS_INVITATIONS_ENABLED True Enable invitations
ASTAKOS_COOKIE_NAME '_pithos2_a' ``Key`` parameter passed in ``django.http.HttpResponse.set_cookie``
ASTAKOS_COOKIE_DOMAIN None ``Domain`` parameter passed in ``django.http.HttpResponse.set_cookie``
ASTAKOS_COOKIE_SECURE True ``Secure`` parameter passed in ``django.http.HttpResponse.set_cookie``
ASTAKOS_IM_STATIC_URL '/static/im/' URL to use when referring to static files
ASTAKOS_MODERATION_ENABLED True If False and invitations are not enabled newly created user will be automatically accepted
ASTAKOS_BASEURL 'http://pithos.dev.grnet.gr' Astakos baseurl
ASTAKOS_SITENAME 'GRNET Cloud' Service name that appears in emails
=============================== ================================================ ============================================================
Administrator functions
-----------------------
......
......@@ -32,6 +32,7 @@
# or implied, of GRNET S.A.
from django.core.management.base import BaseCommand, CommandError
from django.db import transaction
from astakos.im.functions import activate
......@@ -42,6 +43,7 @@ class Command(BaseCommand):
args = "<user id or email> [user id or email] ..."
help = "Activates one or more users"
@transaction.commit_manually
def handle(self, *args, **options):
if not args:
raise CommandError("No user was given")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment