diff --git a/INSTALL/INSTALL.ubuntu1704.md b/INSTALL/INSTALL.ubuntu1704.md index 0a78859..67a46b0 100644 --- a/INSTALL/INSTALL.ubuntu1704.md +++ b/INSTALL/INSTALL.ubuntu1704.md @@ -7,7 +7,7 @@ project using this one. If you have already installed MONARC and want to upgrade to a later version, you can use the provided script: - $ scripts/update-all.sh + $ ./scripts/update-all.sh $ sudo systemctl restart apache2 @@ -61,10 +61,16 @@ Change SQL Mode in my.cnf: sql-mode = MYSQL40 There are 2 databases: + * monarc_common contains models and data created by CASES; * monarc_cli contains all client risk analyses. Each analysis is based on CASES model of monarc_common. +Populate the monarc_common database: + + mysql -u user -p monarc_common < db-bootstrap/monarc_structure.sql + mysql -u user -p monarc_common < db-bootstrap/monarc_data.sql + API --- @@ -84,6 +90,7 @@ Create 2 symbolic links in the root of project directory: ln -s ./../vendor/monarc/frontoffice MonarcFO There are 2 parts: + * one only for front office; * one common for front office and back office (private project). diff --git a/db-bootstrap/monarc_common.sql b/db-bootstrap/monarc_structure.sql similarity index 100% rename from db-bootstrap/monarc_common.sql rename to db-bootstrap/monarc_structure.sql diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh index c1e3936..9ec5967 100644 --- a/vagrant/bootstrap.sh +++ b/vagrant/bootstrap.sh @@ -205,7 +205,7 @@ echo -e "\n--- Creation of the data bases---\n" mysql -u $DBUSER_MONARC -p$DBPASSWORD_MONARC -e "CREATE DATABASE monarc_cli DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;" > /dev/null 2>&1 mysql -u $DBUSER_MONARC -p$DBPASSWORD_MONARC -e "CREATE DATABASE monarc_common DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;" > /dev/null 2>&1 echo -e "\n--- Populating MONARC DB ---\n" -mysql -u $DBUSER_MONARC -p$DBPASSWORD_MONARC monarc_common < db-bootstrap/monarc_common.sql > /dev/null 2>&1 +mysql -u $DBUSER_MONARC -p$DBPASSWORD_MONARC monarc_common < db-bootstrap/monarc_structure.sql > /dev/null 2>&1 mysql -u $DBUSER_MONARC -p$DBPASSWORD_MONARC monarc_common < db-bootstrap/monarc_data.sql > /dev/null 2>&1