diff --git a/home:entrouvert:cg14/passerelle/_service b/home:entrouvert:cg14/passerelle/_service deleted file mode 100644 index d4bdb4a..0000000 --- a/home:entrouvert:cg14/passerelle/_service +++ /dev/null @@ -1,7 +0,0 @@ - - - repos.entrouvert.org - http - /passerelle.git/snapshot/passerelle-9863723.tar.gz - - diff --git a/home:entrouvert:cg14/passerelle/local_settings.py b/home:entrouvert:cg14/passerelle/local_settings.py index 27d655f..8ed063b 100644 --- a/home:entrouvert:cg14/passerelle/local_settings.py +++ b/home:entrouvert:cg14/passerelle/local_settings.py @@ -45,6 +45,7 @@ INSTALLED_APPS = ( 'passerelle.repost', 'solis', 'makorepost', + 'south', ) MEDIA_ROOT = '/var/lib/passerelle/media' diff --git a/home:entrouvert:cg14/passerelle/passerelle-9863723_with-initial-base-migration.tar.gz b/home:entrouvert:cg14/passerelle/passerelle-9863723_with-initial-base-migration.tar.gz new file mode 100644 index 0000000..3d8cf25 Binary files /dev/null and b/home:entrouvert:cg14/passerelle/passerelle-9863723_with-initial-base-migration.tar.gz differ diff --git a/home:entrouvert:cg14/passerelle/passerelle.init b/home:entrouvert:cg14/passerelle/passerelle.init index 8f401d3..db4db6d 100644 --- a/home:entrouvert:cg14/passerelle/passerelle.init +++ b/home:entrouvert:cg14/passerelle/passerelle.init @@ -38,8 +38,22 @@ GUNICORN_OPTIONS="--bind 127.0.0.1:8484 --workers=3" start() { [ -x $DAEMON ] || exit 5 + # CG14 HACK -- first launch after South installation : fake migrations + # (to be removed) + if test ! -f /etc/passerelle/migrate-fake-done; then + # install south tables + $SCRIPTNAME manage syncdb --noinput && \ + $SCRIPTNAME manage migrate --fake --noinput && \ + touch /etc/passerelle/migrate-fake-done + fi + if test ! -f /etc/passerelle/migrate-fake-done; then + echo "ERR: migrate --fake failed" + echo "ERR: /etc/passerelle/migrate-fake-done file" + exit 1 + fi + # install new applications, if any - $SCRIPTNAME manage syncdb --noinput + $SCRIPTNAME manage syncdb --migrate --noinput echo $"Starting $NAME: " daemon $DAEMON --daemon \ diff --git a/home:entrouvert:cg14/passerelle/passerelle.spec b/home:entrouvert:cg14/passerelle/passerelle.spec index 328da22..2542dee 100644 --- a/home:entrouvert:cg14/passerelle/passerelle.spec +++ b/home:entrouvert:cg14/passerelle/passerelle.spec @@ -2,7 +2,7 @@ %define tag 0.3.0 %define commit 9863723 # si possible, minor = nombre de commit depuis le tag (à la "git describe") -%define minor 0 +%define minor 1 # si minor == 0 #%define version %{tag} @@ -19,7 +19,7 @@ Summary: Uniform access to multiple data sources and services. Group: Development/Languages License: AGPL URL: https://dev.entrouvert.org/projects/passerelle -Source0: passerelle-%{commit}.tar.gz +Source0: passerelle-9863723_with-initial-base-migration.tar.gz Source1: passerelle.init Source2: local_settings.py Source3: synchro-wcs-suivi.sh