From 2557bdde15964e43234d18e116ecd298e478c2e1 Mon Sep 17 00:00:00 2001
From: Jesper Brix Rosenkilde <jbr@nordu.net>
Date: Wed, 20 Sep 2017 12:28:20 +0200
Subject: Fix order in example

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5b6177e..d75a6bc 100644
--- a/README.md
+++ b/README.md
@@ -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
 ```
 
 
-- 
cgit v1.1


From 5e35c5abc42320287cdc10069bcf589d04e53894 Mon Sep 17 00:00:00 2001
From: Jesper Brix Rosenkilde <jbr@nordu.net>
Date: Wed, 20 Sep 2017 12:30:03 +0200
Subject: Use host uid

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index bc19257..9d7c7c9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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
 
-- 
cgit v1.1


From 9fe16350b6e639006ec0512f5f3f4a3f574bc21d Mon Sep 17 00:00:00 2001
From: Jesper Brix Rosenkilde <jbr@nordu.net>
Date: Wed, 20 Sep 2017 15:03:38 +0200
Subject: Remove old ldap pasword

---
 src/tmp | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100755 src/tmp

diff --git a/src/tmp b/src/tmp
deleted file mode 100755
index ccd59ed..0000000
--- a/src/tmp
+++ /dev/null
@@ -1 +0,0 @@
-Shaimet4ahW2
-- 
cgit v1.1


From 4b92ca5cd750e892791a275e96ab71f3f5396966 Mon Sep 17 00:00:00 2001
From: Jesper Brix Rosenkilde <jbr@nordu.net>
Date: Wed, 20 Sep 2017 15:58:12 +0200
Subject: Remove sso from beginning of url

---
 src/pwman/urls.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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')),
 
-- 
cgit v1.1


From 4886fb934c3630b1f4ad1043214bcaa4a982d4b3 Mon Sep 17 00:00:00 2001
From: Jesper Brix Rosenkilde <jbr@nordu.net>
Date: Thu, 21 Sep 2017 12:32:50 +0200
Subject: Force db update

---
 src/apps/changepw/views.py | 2 ++
 1 file changed, 2 insertions(+)

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()
-- 
cgit v1.1