mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2026-02-12 18:16:24 +01:00
Added blue support to the auth
This commit is contained in:
@@ -13,11 +13,9 @@ import os
|
||||
|
||||
import djcelery
|
||||
|
||||
|
||||
djcelery.setup_loader()
|
||||
BASE_DIR = os.path.dirname(os.path.dirname(__file__))
|
||||
|
||||
|
||||
# Quick-start development settings - unsuitable for production
|
||||
# See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/
|
||||
|
||||
@@ -103,8 +101,8 @@ DATABASES = {
|
||||
'mumble': {
|
||||
'ENGINE': 'django.db.backends.mysql',
|
||||
'NAME': 'alliance_mumble',
|
||||
'USER': 'allianceauth',
|
||||
'PASSWORD': 'allianceauth',
|
||||
'USER': 'alliancemumble',
|
||||
'PASSWORD': 'alliancemumble',
|
||||
'HOST': '127.0.0.1',
|
||||
'PORT': '3306',
|
||||
}
|
||||
@@ -148,18 +146,22 @@ USE_L10N = True
|
||||
|
||||
USE_TZ = True
|
||||
|
||||
|
||||
# Static files (CSS, JavaScript, Images)
|
||||
# https://docs.djangoproject.com/en/1.6/howto/static-files/
|
||||
|
||||
STATIC_URL = '/static/'
|
||||
|
||||
DEFAULT_ALLIANCE_GROUP = 'AllianceMember'
|
||||
DEFAULT_BLUE_GROUP = 'BlueMember'
|
||||
|
||||
# ALLIANCE INFO
|
||||
ALLIANCE_ID = '99001336'
|
||||
ALLIANCE_NAME = 'Somealliance'
|
||||
|
||||
# Needed to update standings
|
||||
ALLIANCE_EXEC_CORP_ID = ''
|
||||
ALLIANCE_EXEC_CORP_VCODE = ''
|
||||
ALLIANCE_BLUE_STANDING = 5.0
|
||||
|
||||
# Forum URL
|
||||
FORUM_URL = "http://someaddress.com"
|
||||
|
||||
|
||||
@@ -92,8 +92,12 @@ urlpatterns = patterns('',
|
||||
name='auth_reset_jabber_password'),
|
||||
|
||||
# Mumble service contraol
|
||||
url(r'^activate_blue_mumble/$', 'services.views.activate_blue_mumble',
|
||||
name='auth_activate_blue_mumble'),
|
||||
url(r'^activate_mumble/$', 'services.views.activate_mumble', name='auth_activate_mumble'),
|
||||
url(r'^deactivate_mumble/$', 'services.views.deactivate_mumble', name='auth_deactivate_mumble'),
|
||||
url(r'^deactivate_blue_mumble/$', 'services.views.deactivate_blue_mumble',
|
||||
name='auth_deactivate_blue_mumble'),
|
||||
url(r'^reset_mumble_password/$', 'services.views.reset_mumble_password',
|
||||
name='auth_reset_mumble_password'),
|
||||
|
||||
|
||||
Reference in New Issue
Block a user