diff options
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | src/apps/changepw/views.py | 2 | ||||
| -rw-r--r-- | src/pwman/urls.py | 8 | ||||
| -rwxr-xr-x | src/tmp | 1 |
5 files changed, 8 insertions, 7 deletions
@@ -2,7 +2,7 @@ FROM python:2-slim ENV PYTHONUNBUFFERED 1 EXPOSE 8000 -RUN useradd -g www-data uwsgi +RUN useradd -g www-data uwsgi -u 434 # uid of atlassian on ndn-crowd RUN mkdir /app && mkdir -p /opt/pwman && chown -R uwsgi /opt/pwman WORKDIR /app @@ -29,7 +29,7 @@ You need to server the static content using either apache or nginx. To export the static files use the same data dir as you did for the database, and run the `collectstatic` command. ``` -docker run --rm --ti ndn-pwman -v $(pwd)/data:/opt/pwman collectstatic +docker run --rm -ti -v $(pwd)/data:/opt/pwman ndn-pwman collectstatic ``` diff --git a/src/apps/changepw/views.py b/src/apps/changepw/views.py index c3fb090..0c620fd 100644 --- a/src/apps/changepw/views.py +++ b/src/apps/changepw/views.py @@ -1,5 +1,6 @@ from django.contrib.auth.decorators import login_required from apps.changepw.models import ChangePasswordForm +from apps.fedlogin.views import fedlogin from django.http import HttpResponse from django.shortcuts import render import random @@ -67,6 +68,7 @@ def index(request): ''' Greets the user and presents the choices available. ''' + fedlogin(request) # XXX Hack to force db update username = _get_username(request) try: full_name = request.user.get_full_name() diff --git a/src/pwman/urls.py b/src/pwman/urls.py index 49a24c7..272fdfe 100644 --- a/src/pwman/urls.py +++ b/src/pwman/urls.py @@ -24,10 +24,10 @@ from apps.fedlogin.views import fedlogout, fedlogin urlpatterns = [ #Fedlogin - url(r'^sso/accounts/login/$', login, {'template_name': 'login.html'}, 'login'), - url(r'^sso/accounts/logout/$', fedlogout, name='logout'), - url(r'^sso/accounts/login-federated/$', fedlogin, name='loginfed'), - url(r'^sso/pwman/', include('apps.changepw.urls')), + url(r'^accounts/login/$', login, {'template_name': 'login.html'}, 'login'), + url(r'^accounts/logout/$', fedlogout, name='logout'), + url(r'^accounts/login-federated/$', fedlogin, name='loginfed'), + url(r'^pwman/', include('apps.changepw.urls')), # Uncomment the admin/doc line below to enable admin documentation: # (r'^admin/doc/', include('django.contrib.admindocs.urls')), diff --git a/src/tmp b/src/tmp deleted file mode 100755 index ccd59ed..0000000 --- a/src/tmp +++ /dev/null @@ -1 +0,0 @@ -Shaimet4ahW2 |