Monarc
/
MonarcAppFO
mirror of https://github.com/monarc-project/MonarcAppFO
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed conflicts

feature/2FA
Cédric Bonhomme 2022-05-19 11:24:15 +02:00
parent 62027f673f 2508028c6d
commit 77da8592f0
No known key found for this signature in database
GPG Key ID: A1CB94DE57B7A70D
2 changed files with 642 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
INSTALL/INSTALL.rhel7.9.md
View File

@ -108,10 +108,10 @@ CREATE DATABASE monarc_common DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_ge
## Install MONARC
```bash
[root@monarc ~]# mkdir -p /var/lib/monarc/fo
[root@monarc ~]# mkdir -p /var/www/html/monarc/fo
[root@monarc ~]# yum install git
[root@monarc ~]# git clone https://github.com/monarc-project/MonarcAppFO.git /var/lib/monarc/fo
[root@monarc ~]# cd /var/lib/monarc/fo
[root@monarc ~]# git clone https://github.com/monarc-project/MonarcAppFO.git /var/www/html/monarc/fo
[root@monarc ~]# cd /var/www/html/monarc/fo
[root@monarc fo]# mkdir -p data/cache
[root@monarc fo]# mkdir -p data/LazyServices/Proxy
[root@monarc fo]# chmod -R g+w data
@ -183,7 +183,7 @@ grant create, delete, insert, select, update, drop, alter on monarc_cli.* to 'mo
## Set up database connection
```bash
[root@monarc fo]# cd /var/lib/monarc/fo/config/autoload/
[root@monarc fo]# cd /var/www/html/monarc/fo/config/autoload/
[root@monarc autoload]# cp local.php.dist local.php
[root@monarc autoload]# vi local.php
```
@ -237,6 +237,7 @@ StrictHostKeyChecking no
[root@monarc conf.d]# systemctl stop firewalld
[root@monarc conf.d]# systemctl restart httpd.service
```
monarc.conf can be found [here](https://github.com/monarc-project/MonarcAppFO/blob/master/INSTALL/INSTALL.rhel7.md#configure-virtual-host)
## Create MONARC Admin User

644
package-lock.json generated
View File

@ -3254,10 +3254,10 @@
"resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-1.0.6.tgz",
"integrity": "sha512-k+RF7WvI08PC8reEoXa/w2nSg5AUMTi+peBD9cmFc+0ixHfbs4QmxxkarVal1IkVkgxVuk9JSHhJURHiyHKAuQ=="
},
"d3-quadtree": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-1.0.7.tgz",
"integrity": "sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA=="
"async": {
"version": "3.2.3",
"resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
"integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="
},
"d3-random": {
"version": "1.1.2",
@ -4288,9 +4288,639 @@
},
"dependencies": {
"angular": {
"version": "1.7.8",
"resolved": "https://registry.npmjs.org/angular/-/angular-1.7.8.tgz",
"integrity": "sha512-wtef/y4COxM7ZVhddd7JtAAhyYObq9YXKar9tsW7558BImeVYteJiTxCKeJOL45lJ/+7B4wrAC49j8gTFYEthg=="
"version": "1.8.2"
},
"angular-animate": {
"version": "1.8.2"
},
"angular-aria": {
"version": "1.8.2"
},
"angular-breadcrumb": {
"version": "0.5.0"
},
"angular-gettext": {
"version": "2.4.2"
},
"angular-gettext-tools": {
"version": "2.5.3",
"requires": {
"@babel/parser": "^7.4.3",
"binary-search": "^1.2.0",
"cheerio": "^0.22.0",
"lodash": "^4.17.5",
"pofile": "~1.0.0"
}
},
"angular-legacy-sortablejs": {
"version": "0.4.1"
},
"angular-loading-bar": {
"version": "0.9.0"
},
"angular-local-storage": {
"version": "0.7.1"
},
"angular-material": {
"version": "1.2.2",
"requires": {}
},
"angular-material-data-table": {
"version": "0.10.10",
"requires": {}
},
"angular-messages": {
"version": "1.8.2"
},
"angular-resizable": {
"version": "1.2.0"
},
"angular-resource": {
"version": "1.8.2"
},
"angular-route": {
"version": "1.8.2"
},
"angular-sanitize": {
"version": "1.8.2"
},
"angular-toastr": {
"version": "2.1.1"
},
"angular-trix": {
"version": "1.0.2",
"requires": {
"angular": ">=1.2.0",
"trix": "latest"
}
},
"angular-ui-tree": {
"version": "2.22.6"
},
"ansi-regex": {
"version": "2.1.1"
},
"ansi-styles": {
"version": "2.2.1"
},
"binary-search": {
"version": "1.3.6"
},
"boolbase": {
"version": "1.0.0"
},
"chalk": {
"version": "1.1.3",
"requires": {
"ansi-styles": "^2.2.1",
"escape-string-regexp": "^1.0.2",
"has-ansi": "^2.0.0",
"strip-ansi": "^3.0.0",
"supports-color": "^2.0.0"
}
},
"cheerio": {
"version": "0.22.0",
"requires": {
"css-select": "~1.2.0",
"dom-serializer": "~0.1.0",
"entities": "~1.1.1",
"htmlparser2": "^3.9.1",
"lodash.assignin": "^4.0.9",
"lodash.bind": "^4.1.4",
"lodash.defaults": "^4.0.1",
"lodash.filter": "^4.4.0",
"lodash.flatten": "^4.2.0",
"lodash.foreach": "^4.3.0",
"lodash.map": "^4.4.0",
"lodash.merge": "^4.4.0",
"lodash.pick": "^4.2.1",
"lodash.reduce": "^4.4.0",
"lodash.reject": "^4.4.0",
"lodash.some": "^4.4.0"
}
},
"color-convert": {
"version": "1.9.3",
"requires": {
"color-name": "1.1.3"
}
},
"color-name": {
"version": "1.1.3"
},
"commander": {
"version": "2.20.3"
},
"css-select": {
"version": "1.2.0",
"requires": {
"boolbase": "~1.0.0",
"css-what": "2.1",
"domutils": "1.5.1",
"nth-check": "~1.0.1"
}
},
"css-what": {
"version": "2.1.3"
},
"d3": {
"version": "5.16.0",
"requires": {
"d3-array": "1",
"d3-axis": "1",
"d3-brush": "1",
"d3-chord": "1",
"d3-collection": "1",
"d3-color": "1",
"d3-contour": "1",
"d3-dispatch": "1",
"d3-drag": "1",
"d3-dsv": "1",
"d3-ease": "1",
"d3-fetch": "1",
"d3-force": "1",
"d3-format": "1",
"d3-geo": "1",
"d3-hierarchy": "1",
"d3-interpolate": "1",
"d3-path": "1",
"d3-polygon": "1",
"d3-quadtree": "1",
"d3-random": "1",
"d3-scale": "2",
"d3-scale-chromatic": "1",
"d3-selection": "1",
"d3-shape": "1",
"d3-time": "1",
"d3-time-format": "2",
"d3-timer": "1",
"d3-transition": "1",
"d3-voronoi": "1",
"d3-zoom": "1"
}
},
"d3-array": {
"version": "1.2.4"
},
"d3-axis": {
"version": "1.0.12"
},
"d3-brush": {
"version": "1.1.6",
"requires": {
"d3-dispatch": "1",
"d3-drag": "1",
"d3-interpolate": "1",
"d3-selection": "1",
"d3-transition": "1"
}
},
"d3-chord": {
"version": "1.0.6",
"requires": {
"d3-array": "1",
"d3-path": "1"
}
},
"d3-collection": {
"version": "1.0.7"
},
"d3-color": {
"version": "1.4.1"
},
"d3-contour": {
"version": "1.3.2",
"requires": {
"d3-array": "^1.1.1"
}
},
"d3-dispatch": {
"version": "1.0.6"
},
"d3-drag": {
"version": "1.2.5",
"requires": {
"d3-dispatch": "1",
"d3-selection": "1"
}
},
"d3-dsv": {
"version": "1.2.0",
"requires": {
"commander": "2",
"iconv-lite": "0.4",
"rw": "1"
}
},
"d3-ease": {
"version": "1.0.7"
},
"d3-fetch": {
"version": "1.2.0",
"requires": {
"d3-dsv": "1"
}
},
"d3-force": {
"version": "1.2.1",
"requires": {
"d3-collection": "1",
"d3-dispatch": "1",
"d3-quadtree": "1",
"d3-timer": "1"
}
},
"d3-format": {
"version": "1.4.5"
},
"d3-geo": {
"version": "1.12.1",
"requires": {
"d3-array": "1"
}
},
"d3-hierarchy": {
"version": "1.1.9"
},
"d3-interpolate": {
"version": "1.4.0",
"requires": {
"d3-color": "1"
}
},
"d3-path": {
"version": "1.0.9"
},
"d3-polygon": {
"version": "1.0.6"
},
"d3-quadtree": {
"version": "1.0.7"
},
"d3-random": {
"version": "1.1.2"
},
"d3-scale": {
"version": "2.2.2",
"requires": {
"d3-array": "^1.2.0",
"d3-collection": "1",
"d3-format": "1",
"d3-interpolate": "1",
"d3-time": "1",
"d3-time-format": "2"
}
},
"d3-scale-chromatic": {
"version": "1.5.0",
"requires": {
"d3-color": "1",
"d3-interpolate": "1"
}
},
"d3-selection": {
"version": "1.4.2"
},
"d3-shape": {
"version": "1.3.7",
"requires": {
"d3-path": "1"
}
},
"d3-time": {
"version": "1.1.0"
},
"d3-time-format": {
"version": "2.3.0",
"requires": {
"d3-time": "1"
}
},
"d3-timer": {
"version": "1.0.10"
},
"d3-transition": {
"version": "1.3.2",
"requires": {
"d3-color": "1",
"d3-dispatch": "1",
"d3-ease": "1",
"d3-interpolate": "1",
"d3-selection": "^1.1.0",
"d3-timer": "1"
}
},
"d3-voronoi": {
"version": "1.1.4"
},
"d3-zoom": {
"version": "1.8.3",
"requires": {
"d3-dispatch": "1",
"d3-drag": "1",
"d3-interpolate": "1",
"d3-selection": "1",
"d3-transition": "1"
}
},
"dom-serializer": {
"version": "0.1.1",
"requires": {
"domelementtype": "^1.3.0",
"entities": "^1.1.1"
}
},
"domelementtype": {
"version": "1.3.1"
},
"domhandler": {
"version": "2.4.2",
"requires": {
"domelementtype": "1"
}
},
"domutils": {
"version": "1.5.1",
"requires": {
"dom-serializer": "0",
"domelementtype": "1"
}
},
"duplexer": {
"version": "0.1.2"
},
"entities": {
"version": "1.1.2"
},
"escape-string-regexp": {
"version": "1.0.5"
},
"figures": {
"version": "1.7.0",
"requires": {
"escape-string-regexp": "^1.0.5",
"object-assign": "^4.1.0"
}
},
"flag-icon-css": {
"version": "3.5.0"
},
"grunt": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/grunt/-/grunt-1.4.1.tgz",
"integrity": "sha512-ZXIYXTsAVrA7sM+jZxjQdrBOAg7DyMUplOMhTaspMRExei+fD0BTwdWXnn0W5SXqhb/Q/nlkzXclSi3IH55PIA==",
"requires": {
"dateformat": "~3.0.3",
"eventemitter2": "~0.4.13",
"exit": "~0.1.2",
"findup-sync": "~0.3.0",
"glob": "~7.1.6",
"grunt-cli": "~1.4.2",
"grunt-known-options": "~2.0.0",
"grunt-legacy-log": "~3.0.0",
"grunt-legacy-util": "~2.0.1",
"iconv-lite": "~0.4.13",
"js-yaml": "~3.14.0",
"minimatch": "~3.0.4",
"mkdirp": "~1.0.4",
"nopt": "~3.0.6",
"rimraf": "~3.0.2"
}
},
"grunt-angular-gettext": {
"version": "2.5.3",
"requires": {
"angular-gettext-tools": "~2.5.3"
}
},
"grunt-contrib-concat": {
"version": "1.0.1",
"requires": {
"chalk": "^1.0.0",
"source-map": "^0.5.3"
}
},
"grunt-contrib-uglify": {
"version": "5.0.1",
"requires": {
"chalk": "^2.4.1",
"maxmin": "^2.1.0",
"uglify-js": "^3.13.3",
"uri-path": "^1.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "3.2.1",
"requires": {
"color-convert": "^1.9.0"
}
},
"chalk": {
"version": "2.4.2",
"requires": {
"ansi-styles": "^3.2.1",
"escape-string-regexp": "^1.0.5",
"supports-color": "^5.3.0"
}
},
"supports-color": {
"version": "5.5.0",
"requires": {
"has-flag": "^3.0.0"
}
}
}
},
"grunt-shell": {
"version": "3.0.1",
"requires": {
"chalk": "^2.4.1",
"npm-run-path": "^2.0.0",
"strip-ansi": "^5.0.0"
},
"dependencies": {
"ansi-regex": {
"version": "4.1.0"
},
"ansi-styles": {
"version": "3.2.1",
"requires": {
"color-convert": "^1.9.0"
}
},
"chalk": {
"version": "2.4.2",
"requires": {
"ansi-styles": "^3.2.1",
"escape-string-regexp": "^1.0.5",
"supports-color": "^5.3.0"
}
},
"strip-ansi": {
"version": "5.2.0",
"requires": {
"ansi-regex": "^4.1.0"
}
},
"supports-color": {
"version": "5.5.0",
"requires": {
"has-flag": "^3.0.0"
}
}
}
},
"gzip-size": {
"version": "3.0.0",
"requires": {
"duplexer": "^0.1.1"
}
},
"has-ansi": {
"version": "2.0.0",
"requires": {
"ansi-regex": "^2.0.0"
}
},
"has-flag": {
"version": "3.0.0"
},
"htmlparser2": {
"version": "3.10.1",
"requires": {
"domelementtype": "^1.3.1",
"domhandler": "^2.3.0",
"domutils": "^1.5.1",
"entities": "^1.1.1",
"inherits": "^2.0.1",
"readable-stream": "^3.1.1"
}
},
"iso-639-1": {
"version": "2.1.9"
},
"jschardet": {
"version": "2.3.0"
},
"lodash.assignin": {
"version": "4.2.0"
},
"lodash.bind": {
"version": "4.2.1"
},
"lodash.defaults": {
"version": "4.2.0"
},
"lodash.filter": {
"version": "4.6.0"
},
"lodash.flatten": {
"version": "4.4.0"
},
"lodash.foreach": {
"version": "4.5.0"
},
"lodash.map": {
"version": "4.6.0"
},
"lodash.merge": {
"version": "4.6.2"
},
"lodash.pick": {
"version": "4.4.0"
},
"lodash.reduce": {
"version": "4.6.0"
},
"lodash.reject": {
"version": "4.6.0"
},
"lodash.some": {
"version": "4.6.0"
},
"maxmin": {
"version": "2.1.0",
"requires": {
"chalk": "^1.0.0",
"figures": "^1.0.1",
"gzip-size": "^3.0.0",
"pretty-bytes": "^3.0.0"
}
},
"moment": {
"version": "2.24.0"
},
"ng-country-flags": {
"version": "1.0.7",
"requires": {
"angular": "1.7.8"
},
"dependencies": {
"angular": {
"version": "1.7.8"
}
}
},
"ng-file-upload": {
"version": "12.2.13"
},
"node-forge": {
"version": "0.10.0"
},
"npm-run-path": {
"version": "2.0.2",
"requires": {
"path-key": "^2.0.0"
}
},
"nth-check": {
"version": "1.0.2",
"requires": {
"boolbase": "~1.0.0"
}
},
"number-is-nan": {
"version": "1.0.1"
},
"path-key": {
"version": "2.0.1"
},
"pofile": {
"version": "1.0.11"
},
"pretty-bytes": {
"version": "3.0.1",
"requires": {
"number-is-nan": "^1.0.0"
}
},
"rw": {
"version": "1.3.3"
},
"save-svg-as-png": {
"version": "1.4.17"
},
"sortablejs": {
"version": "1.7.0"
},
"source-map": {
"version": "0.5.7"
},
"strip-ansi": {
"version": "3.0.1",
"requires": {
"ansi-regex": "^2.0.0"
}
},
"supports-color": {
"version": "2.0.0"
},
"uglify-js": {
"version": "3.13.5"
},
"uri-path": {
"version": "1.0.0"
}
}
},