From 81af46fbe982691aebcc17894985f7b135b8902f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Behmo?= <regis@behmo.com>
Date: Mon, 29 Jan 2018 17:18:37 +0100
Subject: [PATCH] Create staff user, fix studio nginx static assets

---
 Makefile                              | 11 +++++++----
 README.md                             |  8 ++++++++
 docker-compose.yml                    |  3 ++-
 nginx/Dockerfile                      |  3 ++-
 nginx/config/templates/cms.conf.templ |  2 +-
 nginx/config/templates/lms.conf.templ |  2 +-
 6 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 7c03f95..56ae857 100644
--- a/Makefile
+++ b/Makefile
@@ -11,8 +11,8 @@ build:
 	docker-compose build
 
 migrate:
-	docker-compose run --rm lms bash -c "./wait-for-mysql.sh && ./manage.py lms migrate --settings=production"
-	docker-compose run --rm cms bash -c "./wait-for-mysql.sh && ./manage.py cms migrate --settings=production"
+	docker-compose run --rm lms bash -c "./wait-for-mysql.sh && ./manage.py lms --settings=production migrate"
+	docker-compose run --rm cms bash -c "./wait-for-mysql.sh && ./manage.py cms --settings=production migrate"
 
 assets:
 	docker-compose run --rm lms paver update_assets lms --settings=production
@@ -33,9 +33,12 @@ stop:
 ##################### Additional commands
 
 lms-shell:
-	docker-compose run --rm lms ./manage.py lms shell --settings=production
+	docker-compose run --rm lms ./manage.py lms --settings=production shell
 cms-shell:
-	docker-compose run --rm lms ./manage.py cms shell --settings=production
+	docker-compose run --rm lms ./manage.py cms --settings=production shell
 
 import-demo-course:
 	docker-compose run --rm cms /bin/bash -c "git clone https://github.com/edx/edx-demo-course ../edx-demo-course && git -C ../edx-demo-course checkout open-release/ginkgo.master && python ./manage.py cms --settings=production import ../data ../edx-demo-course"
+
+create-staff-user:
+	docker-compose run --rm lms /bin/bash -c "./manage.py lms --settings=production manage_user --superuser --staff ${USERNAME} ${EMAIL} && ./manage.py lms --settings=production changepassword ${USERNAME}"
diff --git a/README.md b/README.md
index ec0dcb3..61ae5ac 100644
--- a/README.md
+++ b/README.md
@@ -57,6 +57,14 @@ This will launch the various docker containers required for your Open edX platfo
 
 ## Additional commands
 
+### Creating a new user with staff and admin rights
+
+You will most certainly need to create a user to administer the platform. Just run:
+
+    USERNAME=yourusername EMAIL=user@email.com make create-staff-user
+
+You will asked to set the user password interactively.
+
 ### Importing the demo course
 
 On a fresh install, your platform will not have a single course. To import the [Open edX demo course](https://github.com/edx/edx-demo-course ), run:
diff --git a/docker-compose.yml b/docker-compose.yml
index 296328b..d617e72 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -33,7 +33,8 @@ services:
     ports:
       - "80:80"
     volumes:
-      - ./data/lms:/openedx/data:ro
+      - ./data/lms:/openedx/data/lms:ro
+      - ./data/cms:/openedx/data/cms:ro
     depends_on:
       - lms
 
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
index b6e7256..9a15680 100644
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@@ -1,5 +1,6 @@
 FROM nginx:1.13
-VOLUME /openedx/data
+VOLUME /openedx/data/lms
+VOLUME /openedx/data/cms
 
 COPY ./config/lms.conf /etc/nginx/conf.d/lms.conf
 COPY ./config/cms.conf /etc/nginx/conf.d/cms.conf
diff --git a/nginx/config/templates/cms.conf.templ b/nginx/config/templates/cms.conf.templ
index 150c530..b34e5aa 100644
--- a/nginx/config/templates/cms.conf.templ
+++ b/nginx/config/templates/cms.conf.templ
@@ -35,7 +35,7 @@ server {
   }
 
   location ~ ^/static/(?P<file>.*) {
-    root /openedx/data;
+    root /openedx/data/cms;
     try_files /staticfiles/$file /course_static/$file =404;
 
     # return a 403 for static files that shouldn't be
diff --git a/nginx/config/templates/lms.conf.templ b/nginx/config/templates/lms.conf.templ
index 7efe211..67ab90d 100644
--- a/nginx/config/templates/lms.conf.templ
+++ b/nginx/config/templates/lms.conf.templ
@@ -57,7 +57,7 @@ server {
   }
 
   location ~ ^/static/(?P<file>.*) {
-    root /openedx/data;
+    root /openedx/data/lms;
     try_files /staticfiles/$file /course_static/$file =404;
 
     # return a 403 for static files that shouldn't be