From 765fcb52ded113d43b308c6f39ea7cea49ede3aa Mon Sep 17 00:00:00 2001 From: Adarnof Date: Mon, 30 Nov 2015 21:53:49 +0000 Subject: [PATCH] Added required settings to example settings.py Added additional fields in authserviceinfos to represent username and uid --- alliance_auth/settings.py.example | 11 +++++++++++ authentication/models.py | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/alliance_auth/settings.py.example b/alliance_auth/settings.py.example index c4c38b17..15ee3829 100755 --- a/alliance_auth/settings.py.example +++ b/alliance_auth/settings.py.example @@ -330,3 +330,14 @@ TEAMSPEAK3_SERVERQUERY_USER = os.environ.get('AA_TEAMSPEAK3_SERVERQUERY_USER', ' TEAMSPEAK3_SERVERQUERY_PASSWORD = os.environ.get('AA_TEAMSPEAK3_SERVERQUERY_PASSWORD', 'passwordhere') TEAMSPEAK3_VIRTUAL_SERVER = int(os.environ.get('AA_TEAMSPEAK3_VIRTUAL_SERVER', '1')) TEAMSPEAK3_PUBLIC_URL = os.environ.get('AA_TEAMSPEAK3_PUBLIC_URL', 'yourdomain.com') + +###################################### +# Discord Configuration +###################################### +# DISCORD_SERVER_ID - ID of the server to manage +# DISCORD_USER_EMAIL - email of the server management user +# DISCORD_USER_PASSWORD - password of the server management user +###################################### +DISCORD_SERVER_ID = os.environ.get('AA_DISCORD_SERVER_ID', '') +DISCORD_USER_EMAIL = os.environ.get('AA_DISCORD_USER_EMAIL', '') +DISCORD_USER_PASSWORD = os.environ.get('AA_DISCORD_USER_PASSWORD', '') diff --git a/authentication/models.py b/authentication/models.py index 2b8cfd2d..a6c983ef 100755 --- a/authentication/models.py +++ b/authentication/models.py @@ -13,9 +13,11 @@ class AuthServicesInfo(models.Model): mumble_password = models.CharField(max_length=254, default="") teamspeak3_uid = models.CharField(max_length=254, default="") teamspeak3_perm_key = models.CharField(max_length=254, default="") + discord_username = models.CharField(max_length=254, default="") + discord_uid = models.CharField(max_length=254, default="") main_char_id = models.CharField(max_length=64, default="") is_blue = models.BooleanField(default=False) user = models.ForeignKey(User) def __str__(self): - return self.user.username + ' - AuthInfo' \ No newline at end of file + return self.user.username + ' - AuthInfo'