From edc51284fac00cfa7c84a3a0b9e985412c011db4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= Date: Mon, 7 Aug 2017 10:25:18 +0200 Subject: [PATCH] Master branch should alwys be working. --- INSTALL/INSTALL.ubuntu1704.md | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/INSTALL/INSTALL.ubuntu1704.md b/INSTALL/INSTALL.ubuntu1704.md index 384d2cc..a20f702 100644 --- a/INSTALL/INSTALL.ubuntu1704.md +++ b/INSTALL/INSTALL.ubuntu1704.md @@ -1,6 +1,17 @@ Installation on Ubuntu 17.04 ============================ +The master branch should always be working and it is recommended to install the +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 + $ sudo systemctl restart apache2 + + + PHP & MySQL ----------- @@ -95,7 +106,7 @@ There are 2 parts: * one only for front office: ng_client; * one common for front office and back office: ng_anr. -It is developed with Angular framework version 1 +It is developed with Angular framework version 1. ![Arbo](pictures/arbo3.png "Arbo") @@ -120,7 +131,7 @@ Note: The built-in CLI server is **for development only**. To setup Apache, setup a virtual host to point to the public/ directory of the project and you should be ready to go! It should look something like below: - + ServerName monarc.localhost DocumentRoot /path/to/monarc/public SetEnv APPLICATION_ENV "development" @@ -168,7 +179,7 @@ Create configuration file sudo cp ./config/autoload/local.php.dist ./config/autoload/local.php -Update connection information to local.php and global.php +Update connection information to *local.php* and *global.php*. Configuration files are stored in cache. If your changes have not been considered, empty cache by deleting file in @@ -180,20 +191,19 @@ Install Grunt sudo apt-get install nodejs sudo apt-get install npm sudo npm install -g grunt-cli - -Only for Linux systems: - sudo ln -s /usr/bin/nodejs /usr/bin/node Update project -------------- -Play script (mandatory from the root of the project)(pull and migrations): +Play script (mandatory from the root of the project): /bin/bash ./scripts/update-all.sh -This shell script uses others shell scripts. You may need to change the access -rights of those scripts. +This script will retrieve the updates from the last stable release of MONARC. + +It uses others shell scripts. You may need to change the access rights of those +scripts. Create Initial User and Client