Merge branch 'master' of ssh://git.onelab.eu/git/myslice

diff --git a/apache/myslice.conf b/apache/myslice.conf
index 581b559..712b8ad 100644 (file)
--- a/apache/myslice.conf
+++ b/apache/myslice.conf
@@ -1,25 +1,14 @@
-## better use
-# https://docs.djangoproject.com/en/1.5/howto/deployment/wsgi/modwsgi/
-# instead
-#
-# XXX this is very rough, was just pasted from the (wrong) web page
-# and never tested, so feel free to rewrite completely if that sounds right
-#
-#Alias /robots.txt /usr/share/myslice/static/robots.txt
-Alias /favicon.ico /usr/share/unfold/static/favicon.ico
-
-#AliasMatch ^/([^/]*\.css) /usr/share/myslice/static/styles/$1
-
-Alias /static/ /usr/share/unfold/static/
-
-<Directory /usr/share/unfold/static/>
-Order deny,allow
-Allow from all
-</Directory>
-
-WSGIScriptAlias / /usr/share/unfold/apache/myslice.wsgi
-
-<Directory /usr/share/unfold/apache>
-Order allow,deny
-Allow from all
-</Directory>
+<VirtualHost *:80>
+        WSGIScriptAlias / /usr/share/unfold/apache/myslice.wsgi
+        <Directory /usr/share/unfold/myslice>
+        <Files wsgi.py>
+        Order deny,allow
+        Allow from all
+        </Files>
+        </Directory>
+        Alias /static/ /usr/share/unfold/static/
+        <Directory /usr/share/unfold/static>
+        Order deny,allow
+        Allow from all
+        </Directory>
+</VirtualHost>

diff --git a/debian/unfold.install b/debian/unfold.install
index 6e546b0..c01b9c6 100644 (file)
--- a/debian/unfold.install
+++ b/debian/unfold.install
@@ -11,3 +11,5 @@ usr/share/unfold/myslice
 usr/share/unfold/sample
 usr/share/unfold/trash
 usr/share/unfold/debug_platform
+usr/share/unfold/manage.py
+/etc/apache2/sites-available/myslice.conf

diff --git a/debian/unfold.postinst b/debian/unfold.postinst
index c762a57..de85dd3 100644 (file)
--- a/debian/unfold.postinst
+++ b/debian/unfold.postinst
@@ -1,6 +1,10 @@
 #!/bin/bash
 # if this requires a service to be running, add something like this
 # update-rc.d unfold defaults
-
-[ -f /etc/apache2/apache2.conf ] && echo "WSGIScriptAlias / /usr/share/unfold/apache/myslice.wsgi"  >> /etc/apache2/apache2.conf
+/usr/share/unfold/manage.py syncdb
+/usr/share/unfold/manage.py migrate
+chmod 777 /usr/share/unfold/myslice.sqlite3
+chmod 777 /usr/share/unfold
+a2dissite default
+a2ensite myslice.conf
 service apache2 restart

diff --git a/manifold/manifoldproxy.py b/manifold/manifoldproxy.py
index 9f01497..a63e4a8 100644 (file)
--- a/manifold/manifoldproxy.py
+++ b/manifold/manifoldproxy.py
@@ -1,4 +1,6 @@
 import json
+import os.path
+
 # this is for django objects only
 #from django.core import serializers
 from django.http import HttpResponse, HttpResponseForbidden
@@ -52,7 +54,7 @@ with the query passed using POST"""
         manifold_query = Query()
         #manifold_query = ManifoldQuery()
         manifold_query.fill_from_POST(request.POST)
-        offline_filename="offline-%s-%s.json"%(manifold_query.action,manifold_query.object)
+        offline_filename="%s/../offline-%s-%s.json"%(os.path.dirname(__file__),manifold_query.action,manifold_query.object)
         # retrieve session for request
 
         # We allow some requests to use the ADMIN user account

diff --git a/manifold/metadata.py b/manifold/metadata.py
index 6f4c5ce..420821c 100644 (file)
--- a/manifold/metadata.py
+++ b/manifold/metadata.py
@@ -1,4 +1,5 @@
 import json 
+import os.path
 
 from manifold.manifoldresult import ManifoldResult
 from manifold.manifoldapi import ManifoldAPI
@@ -17,7 +18,7 @@ class MetaData:
         self.hash_by_object={}
 
     def fetch (self):
-        offline_filename="offline-metadata.json"
+        offline_filename="%s/../offline-metadata.json"%os.path.dirname(__file__)
         if work_offline:
             try:
                 with file(offline_metadata) as f: