diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-01-31 17:42:22 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-07-01 18:02:28 +0200 |
| commit | 1965751801357781e5d2b384d261c608fdafdde7 (patch) | |
| tree | 2e45c36bdbb6bfbbe323e8bf7e32c4ba53d41d5b /install | |
| parent | 7da7f3e1f660f43e32d1e0144a9104245eb0a638 (diff) | |
| download | Ishtar-1965751801357781e5d2b384d261c608fdafdde7.tar.bz2 Ishtar-1965751801357781e5d2b384d261c608fdafdde7.zip | |
Fix path for fixtures when Ishtar use of alternate lib path
Diffstat (limited to 'install')
| -rw-r--r-- | install/config.template | 3 | ||||
| -rwxr-xr-x | install/ishtar-install | 1 | ||||
| -rwxr-xr-x | install/ishtar-prepare-instance | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/install/config.template b/install/config.template index 67d6b0c37..0a8107640 100644 --- a/install/config.template +++ b/install/config.template @@ -3,4 +3,5 @@ ISHTAR_DB=127.0.0.1 ISHTAR_WEBSERVER=nginx ISHTAR_LOCALE=fr_FR USE_CELERY=no -USE_LIBREOFFICE=no
\ No newline at end of file +USE_LIBREOFFICE=no +ISHTAR_LIB_PATH=/usr/lib/python3/dist-packages/ diff --git a/install/ishtar-install b/install/ishtar-install index 7baa428b0..5a1d2a12b 100755 --- a/install/ishtar-install +++ b/install/ishtar-install @@ -625,6 +625,7 @@ EOF echo "ISHTAR_DB="$default_db >> $etc_path"config" echo "ISHTAR_WEBSERVER="$webserver >> $etc_path"config" echo "ISHTAR_LOCALE="$current_locale >> $etc_path"config" + echo "ISHTAR_LIB_PATH="$full_install_path >> $etc_path"config" if [ "$install_celery" == 'yes' ]; then echo "USE_CELERY="$install_celery >> $etc_path"config" fi diff --git a/install/ishtar-prepare-instance b/install/ishtar-prepare-instance index fc6484038..d9e4e87af 100755 --- a/install/ishtar-prepare-instance +++ b/install/ishtar-prepare-instance @@ -363,7 +363,7 @@ EOF $PYTHON ./manage.py migrate cecho y " - loading fixtures" - FIXTURES="$DEST/fixtures/initial_data-auth-fr.json $DEST/ishtar_common/fixtures/initial_data-fr.json $DEST/ishtar_common/fixtures/initial_importtypes-fr.json $DEST/archaeological_operations/fixtures/initial_data-fr.json $DEST/archaeological_operations/fixtures/initial_data_relation_type_norel-fr.json $DEST/archaeological_operations/fixtures/initial_data_relation_type-fr.json $DEST/archaeological_context_records/fixtures/initial_data-fr.json $DEST/archaeological_context_records/fixtures/initial_data_relation_type_norel-fr.json $DEST/archaeological_context_records/fixtures/initial_data_relation_type-fr.json $DEST/archaeological_files/fixtures/initial_data-fr.json $DEST/archaeological_finds/fixtures/initial_data-fr.json $DEST/archaeological_warehouse/fixtures/initial_data-fr.json" + FIXTURES="$DEST/fixtures/initial_data-auth-fr.json $ISHTAR_LIB_PATH/ishtar_common/fixtures/initial_data-fr.json $ISHTAR_LIB_PATH/ishtar_common/fixtures/initial_importtypes-fr.json $ISHTAR_LIB_PATH/archaeological_operations/fixtures/initial_data-fr.json $ISHTAR_LIB_PATH/archaeological_operations/fixtures/initial_data_relation_type_norel-fr.json $ISHTAR_LIB_PATH/archaeological_operations/fixtures/initial_data_relation_type-fr.json $ISHTAR_LIB_PATH/archaeological_context_records/fixtures/initial_data-fr.json $ISHTAR_LIB_PATH/archaeological_context_records/fixtures/initial_data_relation_type_norel-fr.json $ISHTAR_LIB_PATH/archaeological_context_records/fixtures/initial_data_relation_type-fr.json $ISHTAR_LIB_PATH/archaeological_files/fixtures/initial_data-fr.json $ISHTAR_LIB_PATH/archaeological_finds/fixtures/initial_data-fr.json $ISHTAR_LIB_PATH/archaeological_warehouse/fixtures/initial_data-fr.json" for data in $FIXTURES; do echo $data; $PYTHON ./manage.py loaddata $data; |