mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2026-02-11 01:26:22 +01:00
Update to rule all updates. group support and clean up
This commit is contained in:
@@ -10,6 +10,8 @@ https://docs.djangoproject.com/en/1.6/ref/settings/
|
||||
|
||||
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
|
||||
import os
|
||||
import djcelery
|
||||
djcelery.setup_loader()
|
||||
BASE_DIR = os.path.dirname(os.path.dirname(__file__))
|
||||
|
||||
|
||||
@@ -26,12 +28,13 @@ TEMPLATE_DEBUG = True
|
||||
|
||||
ALLOWED_HOSTS = []
|
||||
|
||||
BROKER_URL = 'amqp://guest:guest@localhost:5672/'
|
||||
|
||||
CELERYBEAT_SCHEDULER = "djcelery.schedulers.DatabaseScheduler"
|
||||
|
||||
# Application definition
|
||||
|
||||
INSTALLED_APPS = (
|
||||
'django_admin_bootstrapped.bootstrap3',
|
||||
'django_admin_bootstrapped',
|
||||
'django.contrib.admin',
|
||||
'django.contrib.auth',
|
||||
'django.contrib.contenttypes',
|
||||
@@ -39,6 +42,8 @@ INSTALLED_APPS = (
|
||||
'django.contrib.messages',
|
||||
'django.contrib.staticfiles',
|
||||
'django_evolution',
|
||||
'djcelery',
|
||||
'celerytask',
|
||||
'bootstrapform',
|
||||
'authentication',
|
||||
'portal',
|
||||
@@ -141,9 +146,9 @@ ALLIANCE_ID = ''
|
||||
ALLIANCE_NAME = ''
|
||||
|
||||
# Jabber Prosody Info
|
||||
JABBER_URL = "@someaddress.com"
|
||||
OPENFIRE_ADDRESS = "http://someaddress.com:9090/"
|
||||
OPENFIRE_SECRET_KEY = "somekey"
|
||||
JABBER_URL = ""
|
||||
OPENFIRE_ADDRESS = ""
|
||||
OPENFIRE_SECRET_KEY = ""
|
||||
|
||||
# Mumble settings
|
||||
MUMBLE_SERVER_ID = 1
|
||||
MUMBLE_SERVER_ID = ''
|
||||
|
||||
@@ -146,4 +146,4 @@ OPENFIRE_ADDRESS = "http://the99eve.com:9090/"
|
||||
OPENFIRE_SECRET_KEY = "SrJ35I36"
|
||||
|
||||
# Mumble settings
|
||||
MUMBLE_SERVER_ID = 1
|
||||
MUMBLE_SERVER_ID = 1
|
||||
|
||||
@@ -18,8 +18,10 @@ urlpatterns = patterns('',
|
||||
|
||||
# Portal Urls
|
||||
url(r'^dashboard/$', 'portal.views.dashboard_view', name='auth_dashboard'),
|
||||
url(r'^help/$', 'portal.views.help_view', name='auth_help'),
|
||||
|
||||
# Eveonline Urls
|
||||
url(r'^add_api_key/', 'eveonline.views.add_api_key', name='auth_add_api_key'),
|
||||
url(r'^api_key_management/', 'eveonline.views.api_key_management_view', name='auth_api_key_management'),
|
||||
url(r'^delete_api_pair/(\w+)/$', 'eveonline.views.api_key_removal', name='auth_api_key_removal'),
|
||||
url(r'^characters/', 'eveonline.views.characters_view', name='auth_characters'),
|
||||
@@ -27,6 +29,7 @@ urlpatterns = patterns('',
|
||||
|
||||
# Service Urls
|
||||
url(r'^services/', 'services.views.services_view', name='auth_services'),
|
||||
|
||||
# Forum Service Control
|
||||
url(r'^activate_forum/$', 'services.views.activate_forum', name='auth_activate_forum'),
|
||||
url(r'^deactivate_forum/$', 'services.views.deactivate_forum', name='auth_deactivate_forum'),
|
||||
|
||||
Reference in New Issue
Block a user