diff --git a/sso/services/miningbuddy/__init__.py b/sso/services/miningbuddy/__init__.py index 3abe649..a7241a3 100644 --- a/sso/services/miningbuddy/__init__.py +++ b/sso/services/miningbuddy/__init__.py @@ -13,7 +13,9 @@ class MiningBuddyService(BaseService): settings = { 'require_user': False, 'require_password': False, - 'provide_login': False } + 'provide_login': False, + 'database_name': 'dreddit_miningbuddy', + 'password_salt': 'asdqwdqweqweqweqweqw' } SQL_ADD_USER = r"INSERT INTO users (username, password, email, emailvalid, confirmed, rank) VALUES (%s, %s, %s, 1, 1, 2)" @@ -29,7 +31,7 @@ class MiningBuddyService(BaseService): backend = load_backend(settings.DATABASE_ENGINE) self._db = backend.DatabaseWrapper({ 'DATABASE_HOST': settings.DATABASE_HOST, - 'DATABASE_NAME': settings.MINING_DATABASE, + 'DATABASE_NAME': self.settings['database_name'], 'DATABASE_OPTIONS': {}, 'DATABASE_PASSWORD': settings.DATABASE_PASSWORD, 'DATABASE_PORT': settings.DATABASE_PORT, @@ -43,7 +45,7 @@ class MiningBuddyService(BaseService): self._db = None def _gen_salt(self): - return settings.MINING_SALT + return self.settings['password_salt'] def _gen_mb_hash(self, password, salt=None): if not salt: diff --git a/sso/services/mumble/__init__.py b/sso/services/mumble/__init__.py index 7afe277..9c6a26c 100644 --- a/sso/services/mumble/__init__.py +++ b/sso/services/mumble/__init__.py @@ -1,17 +1,16 @@ from mumble.models import Mumble, MumbleUser from sso.services import BaseService -import settings - class MumbleService(BaseService): settings = { 'require_user': True, 'require_password': True, 'provide_login': False, - 'use_corptag': True } + 'use_corptag': True, + 'mumble_server_id': 1 } def _get_server(self): - return Mumble.objects.get(id=settings.MUMBLE_SERVER_ID) + return Mumble.objects.get(id=self.settings['mumble_server_id']) def add_user(self, username, password, **kwargs): """ Add a user, returns a UID for that user """ diff --git a/sso/services/qms/__init__.py b/sso/services/qms/__init__.py index 9cf1ce3..e9b2ecf 100644 --- a/sso/services/qms/__init__.py +++ b/sso/services/qms/__init__.py @@ -12,7 +12,8 @@ class QMSService(BaseService): settings = { 'require_user': False, 'require_password': False, - 'provide_login': False } + 'provide_login': False, + 'database_name': 'dreddit_qms' } SQL_ADD_USER = r"INSERT INTO users (ssoid, Name, passhash, salt, Email, certificate) VALUES (%s, %s, %s, %s, %s, %s)" SQL_DIS_USER = r"UPDATE users SET passhash = '' WHERE ssoid = %s" @@ -25,7 +26,7 @@ class QMSService(BaseService): backend = load_backend(settings.DATABASE_ENGINE) self._db = backend.DatabaseWrapper({ 'DATABASE_HOST': settings.DATABASE_HOST, - 'DATABASE_NAME': settings.QMS_DATABASE, + 'DATABASE_NAME': self.settings['database_name'], 'DATABASE_OPTIONS': {}, 'DATABASE_PASSWORD': settings.DATABASE_PASSWORD, 'DATABASE_PORT': settings.DATABASE_PORT, diff --git a/sso/services/wiki/__init__.py b/sso/services/wiki/__init__.py index 149a096..91760b8 100644 --- a/sso/services/wiki/__init__.py +++ b/sso/services/wiki/__init__.py @@ -12,7 +12,8 @@ class MediawikiService(BaseService): settings = { 'require_user': False, 'require_password': False, - 'provide_login': False } + 'provide_login': False, + 'database_name': 'dreddit_wiki' } SQL_ADD_USER = r"INSERT INTO user (user_name, user_password, user_newpassword, user_email, user_options) VALUES (%s, %s, '', %s, '')" SQL_DIS_USER = r"UPDATE user SET user_password = '', user_email = '', user_token = %s WHERE user_name = %s" @@ -30,7 +31,7 @@ class MediawikiService(BaseService): backend = load_backend(settings.DATABASE_ENGINE) self._db = backend.DatabaseWrapper({ 'DATABASE_HOST': settings.DATABASE_HOST, - 'DATABASE_NAME': settings.WIKI_DATABASE, + 'DATABASE_NAME': self.settings['database_name'], 'DATABASE_OPTIONS': {}, 'DATABASE_PASSWORD': settings.DATABASE_PASSWORD, 'DATABASE_PORT': settings.DATABASE_PORT,