mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2026-02-09 16:46:20 +01:00
New changes
This commit is contained in:
@@ -32,8 +32,17 @@ BROKER_URL = 'amqp://guest:guest@localhost:5672/'
|
||||
|
||||
CELERYBEAT_SCHEDULER = "djcelery.schedulers.DatabaseScheduler"
|
||||
|
||||
# Application definition
|
||||
# EMAIL SETTINGS
|
||||
# By default uses the python smtpd server
|
||||
DOMAIN = 'https://the99eve.com'
|
||||
EMAIL_HOST = 'localhost'
|
||||
EMAIL_PORT = 1025
|
||||
EMAIL_HOST_USER = ''
|
||||
EMAIL_HOST_PASSWORD = ''
|
||||
EMAIL_USE_TLS = False
|
||||
DEFAULT_FROM_EMAIL = 'testing@example.com'
|
||||
|
||||
# Application definition
|
||||
INSTALLED_APPS = (
|
||||
'django.contrib.admin',
|
||||
'django.contrib.auth',
|
||||
@@ -108,7 +117,8 @@ TEMPLATE_CONTEXT_PROCESSORS = (
|
||||
'django.core.context_processors.request',
|
||||
'util.context_processors.alliance_id',
|
||||
'util.context_processors.alliance_name',
|
||||
'util.context_processors.jabber_url'
|
||||
'util.context_processors.jabber_url',
|
||||
'util.context_processors.domain_url'
|
||||
)
|
||||
|
||||
TEMPLATE_DIRS = (
|
||||
@@ -144,12 +154,12 @@ DEFAULT_ALLIANCE_GROUP = 'AllianceMember'
|
||||
|
||||
# ALLIANCE INFO
|
||||
ALLIANCE_ID = '0'
|
||||
ALLIANCE_NAME = 'Some alliance'
|
||||
ALLIANCE_NAME = 'Somealliance'
|
||||
|
||||
# Jabber Prosody Info
|
||||
JABBER_URL = "@someaddress.com"
|
||||
OPENFIRE_ADDRESS = "http://someaddress.com:9090/"
|
||||
OPENFIRE_SECRET_KEY = "somesecret"
|
||||
OPENFIRE_SECRET_KEY = "somekey"
|
||||
|
||||
# Mumble settings
|
||||
MUMBLE_SERVER_ID = 1
|
||||
|
||||
@@ -16,6 +16,13 @@ urlpatterns = patterns('',
|
||||
url(r'^logout_user/', 'authentication.views.logout_user', name='auth_logout_user'),
|
||||
url(r'^register_user/', 'registration.views.register_user_view', name='auth_register_user'),
|
||||
|
||||
url(r'^user/password/$', 'django.contrib.auth.views.password_change', name='password_change'),
|
||||
url(r'^user/password/done/$', 'django.contrib.auth.views.password_change_done', name='password_change_done'),
|
||||
url(r'^user/password/reset/$', 'django.contrib.auth.views.password_reset', name='password_reset'),
|
||||
url(r'^user/password/password/reset/done/$', 'django.contrib.auth.views.password_reset_done', name='password_reset_done'),
|
||||
url(r'^user/password/reset/complete/$', 'django.contrib.auth.views.password_reset_complete', name='password_reset_complete'),
|
||||
url(r'^user/password/reset/confirm/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>.+)/$', 'django.contrib.auth.views.password_reset_confirm', name='password_reset_confirm'),
|
||||
|
||||
# Portal Urls
|
||||
url(r'^dashboard/$', 'portal.views.dashboard_view', name='auth_dashboard'),
|
||||
url(r'^help/$', 'portal.views.help_view', name='auth_help'),
|
||||
|
||||
Reference in New Issue
Block a user