From 7b11343d9adae66e2c6729c04c44304184832940 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 31 May 2018 18:05:27 +0200 Subject: [PATCH] Add rdf_io and skosxl, update modules --- app/bin/app.sh | 6 ++---- app/settings.py | 2 ++ app/urls.py | 6 ++++++ docker-compose.yml | 2 ++ lib/mezzanine-organization | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/bin/app.sh b/app/bin/app.sh index bdda2bc9..724a2720 100755 --- a/app/bin/app.sh +++ b/app/bin/app.sh @@ -18,10 +18,8 @@ uid='www-data' gid='www-data' # patterns='*.js;*.css;*.jpg;*.jpeg;*.gif;*.png;*.svg;*.ttf;*.eot;*.woff;*.woff2' -# Staging -# cd /srv/lib/mezzanine-organization -# pip install -U -r requirements.txt -# cd /srv/app +# Install (staging) libs +/srv/bin/build/local/setup_lib.sh # waiting for other services sh $app/bin/wait.sh diff --git a/app/settings.py b/app/settings.py index 66ead2b8..0e0eae79 100644 --- a/app/settings.py +++ b/app/settings.py @@ -284,6 +284,8 @@ INSTALLED_APPS = [ 'compat', 'guardian', 'extra_views', + 'rdf_io', + 'skosxl', ] CUSTOM_MODULES = False diff --git a/app/urls.py b/app/urls.py index 29d3121f..d07f5b0f 100644 --- a/app/urls.py +++ b/app/urls.py @@ -227,3 +227,9 @@ if "mezzanine.pages" in settings.INSTALLED_APPS: handler404 = "mezzanine.core.views.page_not_found" handler500 = "mezzanine.core.views.server_error" handler403 = "organization.core.views.permission_denied" + +# rdi_io patterns. +if "rdf_io" in settings.INSTALLED_APPS: + urlpatterns += [ + url(r"^rdf_io/", include('rdf_io.urls')) + ] diff --git a/docker-compose.yml b/docker-compose.yml index ce072e9d..f7c0de17 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,6 +18,8 @@ # Authors: # Guillaume Pellerin +# version 1 + var: image: debian:jessie volumes: diff --git a/lib/mezzanine-organization b/lib/mezzanine-organization index c53579a5..969b8d08 160000 --- a/lib/mezzanine-organization +++ b/lib/mezzanine-organization @@ -1 +1 @@ -Subproject commit c53579a554d31b1f3ce308b43cd5da9388f0cdcd +Subproject commit 969b8d08c2ea0c64c81391204a16092e22a5069e -- 2.39.5