From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 6 Nov 2017 22:47:31 +0000 (+0100)
Subject: Use data/media/notebooks by default for notebooks (see settings)
X-Git-Tag: 1.7.0~2^2~7
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5036463387e80fba4090a0b4df9608c767b8bcc0;p=telemeta.git

Use data/media/notebooks by default for notebooks (see settings)
---

diff --git a/app/scripts/app.sh b/app/scripts/app.sh
old mode 100644
new mode 100755
diff --git a/app/scripts/init.sh b/app/scripts/init.sh
old mode 100644
new mode 100755
diff --git a/app/scripts/install_plugins.sh b/app/scripts/install_plugins.sh
old mode 100644
new mode 100755
diff --git a/app/scripts/modelviz.py b/app/scripts/modelviz.py
old mode 100644
new mode 100755
diff --git a/app/scripts/notebook.sh b/app/scripts/notebook.sh
new file mode 100755
index 00000000..562f9dfd
--- /dev/null
+++ b/app/scripts/notebook.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+export PYTHONPATH=$PYTHONPATH:/opt/miniconda/lib/python2.7/site-packages/:/srv/app/
+export DJANGO_SETTINGS_MODULE=settings
+
+python /srv/app/manage.py shell_plus --notebook
diff --git a/app/scripts/setup_plugins.sh b/app/scripts/setup_plugins.sh
old mode 100644
new mode 100755
diff --git a/app/scripts/wait.sh b/app/scripts/wait.sh
old mode 100644
new mode 100755
diff --git a/app/scripts/worker.sh b/app/scripts/worker.sh
old mode 100644
new mode 100755
diff --git a/app/settings.py b/app/settings.py
index d6e37eaa..9eb3af71 100644
--- a/app/settings.py
+++ b/app/settings.py
@@ -367,11 +367,14 @@ BOWER_INSTALLED_APPS = (
     # 'https://github.com/Parisson/ui.git',
 )
 
+NOTEBOOK_DIR = MEDIA_ROOT + 'notebooks'
+if not os.path.exists(NOTEBOOK_DIR):
+    os.makedirs(NOTEBOOK_DIR)
 
 NOTEBOOK_ARGUMENTS = [
     '--ip=0.0.0.0', # reach notebooks from outside
     '--port=8888',  # std port
     '--no-browser', # don't start browser on start
     '--allow-root',
-    '--notebook-dir', '/srv/app'
+    '--notebook-dir', NOTEBOOK_DIR
 ]
diff --git a/env/notebook.yml b/env/notebook.yml
index c11a40d2..1c234ae0 100644
--- a/env/notebook.yml
+++ b/env/notebook.yml
@@ -24,4 +24,4 @@
 app:
   ports:
     - "8888:8888"
-  command: "python manage.py shell_plus --notebook"
+  command: "/srv/app/scripts/notebook.sh"