From 221fcf5f43f250c4ea0b8196ffed1b0fe64d2268 Mon Sep 17 00:00:00 2001 From: Guillaume Lesniak Date: Wed, 18 Jan 2017 15:36:38 +0100 Subject: [PATCH 1/5] composer: Use beta branches and GitHub repos --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index aedd9d8..1c990dd 100644 --- a/composer.json +++ b/composer.json @@ -14,9 +14,9 @@ "doctrine/doctrine-orm-module": "^0.10", "robmorgan/phinx": "0.5.*", "monarc/core": "dev-master", - "monarc/frontoffice": "dev-master", + "monarc/frontoffice": "dev-beta", "phing/phing": "~2.0", - "phpoffice/phpword": "dev-master" + "phpoffice/phpword": "dev-beta" }, "config": { "bin-dir": "bin/" @@ -24,15 +24,15 @@ "repositories": [ { "type": "vcs", - "url": "git+ssh://gogs@rhea.netlor.fr:2222/monarc/zm_core" + "url": "https://github.com/CASES-LU//zm-core" }, { "type": "vcs", - "url": "git+ssh://gogs@rhea.netlor.fr:2222/monarc/zm_client" + "url": "https://github.com/CASES-LU/zm-client" }, { "type": "vcs", - "url": "git+ssh://gogs@rhea.netlor.fr:2222/libs/PHPWord" + "url": "https://github.com/CASES-LU/monarc_phpword" } ] } From c394820a77fb895ff5cda42a56f539a8bb7cf6da Mon Sep 17 00:00:00 2001 From: Guillaume Lesniak Date: Fri, 20 Jan 2017 11:09:45 +0100 Subject: [PATCH 2/5] Update NPM repositories paths --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 08e9cad..0a4c335 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,8 @@ "author": "Netlor", "license": "Copyright", "dependencies": { - "ng_anr": "git+ssh://gogs@rhea.netlor.fr:2222/monarc/ng_anr#master", - "ng_client": "git+ssh://gogs@rhea.netlor.fr:2222/monarc/ng_client#master" + "ng_anr": "https://github.com/CASES-LU/ng-anr#beta", + "ng_client": "https://github.com/CASES-LU/ng-client#beta" }, "devDependencies": { "grunt": "~0.4.1", From fa0fd8fe0c13d5f5d141ff062c506681f66e608b Mon Sep 17 00:00:00 2001 From: Jerome Lombardi Date: Wed, 8 Mar 2017 14:43:38 +0100 Subject: [PATCH 3/5] Fix : set the correct repository for the application --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 1c990dd..fa04182 100644 --- a/composer.json +++ b/composer.json @@ -14,9 +14,9 @@ "doctrine/doctrine-orm-module": "^0.10", "robmorgan/phinx": "0.5.*", "monarc/core": "dev-master", - "monarc/frontoffice": "dev-beta", + "monarc/frontoffice": "dev-master", "phing/phing": "~2.0", - "phpoffice/phpword": "dev-beta" + "phpoffice/phpword": "dev-stable" }, "config": { "bin-dir": "bin/" @@ -24,7 +24,7 @@ "repositories": [ { "type": "vcs", - "url": "https://github.com/CASES-LU//zm-core" + "url": "https://github.com/CASES-LU/zm-core" }, { "type": "vcs", From 9f1f3b8301b7f7e1d9791825fa9a859f605048d2 Mon Sep 17 00:00:00 2001 From: Jerome Lombardi Date: Wed, 8 Mar 2017 15:12:21 +0100 Subject: [PATCH 4/5] Fix : set the correct repository for the application --- composer.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/composer.json b/composer.json index fa04182..f0dc9ea 100644 --- a/composer.json +++ b/composer.json @@ -36,3 +36,5 @@ } ] } + + From 0513d19cb41fa329d0f98dcf182ee147c857873f Mon Sep 17 00:00:00 2001 From: Jerome Lombardi Date: Thu, 9 Mar 2017 08:27:30 +0100 Subject: [PATCH 5/5] Fix - improve the readme --- README.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 2bf37bd..ad2792b 100644 --- a/README.md +++ b/README.md @@ -22,8 +22,8 @@ Installation PHP & MySQL ----------- -Install PHP (version 7.0 recommended) with Apache (or Nginx) with extensions : xml, mbstring, mysql, zip, unzip, mcrypt, intl, imagick (extension php) -For Apache add mods : rewrite, ssl (a2enmod) +Install PHP (version 7.0 recommended) with extensions : xml, mbstring, mysql, zip, unzip, mcrypt, intl, imagick (extension php) +Install Apache (or Nginx) and enable mods : rewrite, ssl (a2enmod) Install MySQL (version 5.7 recommended) or MariaDb equivalent @@ -35,7 +35,7 @@ Alternately, clone the repository and manually invoke `composer` using the shipp `composer.phar`: cd my/project/dir - git clone ssh://github.com/CASES-LU/MonarcAppFO.git ./monarc + git clone https://github.com/CASES-LU/MonarcAppFO.git ./monarc cd monarc php composer.phar self-update php composer.phar install -o (modifier le package.json deux errreurs passer en dev-beta le core et il y a un / en trop pour zm-core) @@ -54,11 +54,12 @@ Create 2 databases: Change Sql Mode in my.cnf: + [mysqld] sql-mode = MYSQL40 There is 2 databases: -* monarc_common contain models and data create by smile. -* monarc_cli contain all client risks analyses. Each analysis is based on Smile model of monarc_common +* monarc_common contain models and data create by CASES. +* monarc_cli contain all client risks analyses. Each analysis is based on CASES model of monarc_common Symbolics links --------------- @@ -168,7 +169,7 @@ Configuration Create file configuration - sudo cp /config/autoload/local.php.dist /config/autoload/local.php + sudo cp ./config/autoload/local.php.dist ./config/autoload/local.php Update connexion information to local.php and global.php @@ -197,7 +198,7 @@ This shell script use others shell script. May be you node to change rights of t Create Initial User and Client ------------------------------ -Modify email and password (firstname or lastname) of first user in /module/MonarcFO/migrations/seeds/adminUserInit.php +Modify email and password (firstname or lastname) of first user in ./module/MonarcFO/migrations/seeds/adminUserInit.php If you have a mail server, you can keep default password and click on "Password forgotten ?" after user creation.