Updated the installation instructions with the StatsService details and updated zm-client version.
Ruslan Baidan
parent
b5aa4e006f
commit
4777c19586
|
|
@ -148,29 +148,28 @@ Create the configuration file:
|
||||||
|
|
||||||
And configure the database connection:
|
And configure the database connection:
|
||||||
|
|
||||||
return array(
|
return [
|
||||||
'doctrine' => array(
|
'doctrine' => [
|
||||||
'connection' => array(
|
'connection' => [
|
||||||
'orm_default' => array(
|
'orm_default' => [
|
||||||
'params' => array(
|
'params' => [
|
||||||
'host' => 'localhost',
|
'host' => 'localhost',
|
||||||
'user' => 'monarc',
|
'user' => 'monarc',
|
||||||
'password' => 'password',
|
'password' => 'password',
|
||||||
'dbname' => 'monarc_common',
|
'dbname' => 'monarc_common',
|
||||||
),
|
],
|
||||||
),
|
],
|
||||||
'orm_cli' => array(
|
'orm_cli' => [
|
||||||
'params' => array(
|
'params' => [
|
||||||
'host' => 'localhost',
|
'host' => 'localhost',
|
||||||
'user' => 'monarc',
|
'user' => 'monarc',
|
||||||
'password' => 'password',
|
'password' => 'password',
|
||||||
'dbname' => 'monarc_cli',
|
'dbname' => 'monarc_cli',
|
||||||
),
|
],
|
||||||
),
|
],
|
||||||
),
|
],
|
||||||
),
|
],
|
||||||
);
|
];
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# 3. Update MONARC
|
# 3. Update MONARC
|
||||||
|
|
@ -192,3 +191,18 @@ then update MONARC:
|
||||||
|
|
||||||
|
|
||||||
The username is *admin@admin.localhost* and the password is *admin*.
|
The username is *admin@admin.localhost* and the password is *admin*.
|
||||||
|
|
||||||
|
|
||||||
|
# 5. Statistics for Global Dashboard
|
||||||
|
|
||||||
|
If you would like to use the global dashboard stats feature, you need to configure a StatsService on your server.
|
||||||
|
The architecture, installation instructions and GitHub project can be found here:
|
||||||
|
|
||||||
|
https://monarc-stats-service.readthedocs.io/en/latest/architecture.html
|
||||||
|
https://monarc-stats-service.readthedocs.io/en/latest/installation.html
|
||||||
|
https://github.com/monarc-project/stats-service
|
||||||
|
|
||||||
|
The communication of access to the StatsService is performed on each instance of FrontOffice.
|
||||||
|
This includes the following lines change in your local.php file:
|
||||||
|
|
||||||
|
https://github.com/monarc-project/MonarcAppFO/blob/master/config/autoload/local.php.dist#L99-L102
|
||||||
|
|
|
||||||
|
|
@ -143,29 +143,28 @@ Create the configuration file:
|
||||||
|
|
||||||
And configure the database connection:
|
And configure the database connection:
|
||||||
|
|
||||||
return array(
|
return [
|
||||||
'doctrine' => array(
|
'doctrine' => [
|
||||||
'connection' => array(
|
'connection' => [
|
||||||
'orm_default' => array(
|
'orm_default' => [
|
||||||
'params' => array(
|
'params' => [
|
||||||
'host' => 'host',
|
'host' => 'localhost',
|
||||||
'user' => 'user',
|
'user' => 'monarc',
|
||||||
'password' => 'password',
|
'password' => 'password',
|
||||||
'dbname' => 'monarc_common',
|
'dbname' => 'monarc_common',
|
||||||
),
|
],
|
||||||
),
|
],
|
||||||
'orm_cli' => array(
|
'orm_cli' => [
|
||||||
'params' => array(
|
'params' => [
|
||||||
'host' => 'host',
|
'host' => 'localhost',
|
||||||
'user' => 'user',
|
'user' => 'monarc',
|
||||||
'password' => 'password',
|
'password' => 'password',
|
||||||
'dbname' => 'monarc_cli',
|
'dbname' => 'monarc_cli',
|
||||||
),
|
],
|
||||||
),
|
],
|
||||||
),
|
],
|
||||||
),
|
],
|
||||||
);
|
];
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Update MONARC
|
# Update MONARC
|
||||||
|
|
@ -192,3 +191,18 @@ execute the database migration scripts and compile the translations.
|
||||||
|
|
||||||
|
|
||||||
The username is *admin@admin.localhost* and the password is *admin*.
|
The username is *admin@admin.localhost* and the password is *admin*.
|
||||||
|
|
||||||
|
|
||||||
|
# Statistics for Global Dashboard
|
||||||
|
|
||||||
|
If you would like to use the global dashboard stats feature, you need to configure a StatsService on your server.
|
||||||
|
The architecture, installation instructions and GitHub project can be found here:
|
||||||
|
|
||||||
|
https://monarc-stats-service.readthedocs.io/en/latest/architecture.html
|
||||||
|
https://monarc-stats-service.readthedocs.io/en/latest/installation.html
|
||||||
|
https://github.com/monarc-project/stats-service
|
||||||
|
|
||||||
|
The communication of access to the StatsService is performed on each instance of FrontOffice.
|
||||||
|
This includes the following lines change in your local.php file:
|
||||||
|
|
||||||
|
https://github.com/monarc-project/MonarcAppFO/blob/master/config/autoload/local.php.dist#L99-L102
|
||||||
|
|
|
||||||
|
|
@ -144,29 +144,28 @@ Create the configuration file:
|
||||||
|
|
||||||
And configure the database connection:
|
And configure the database connection:
|
||||||
|
|
||||||
return array(
|
return [
|
||||||
'doctrine' => array(
|
'doctrine' => [
|
||||||
'connection' => array(
|
'connection' => [
|
||||||
'orm_default' => array(
|
'orm_default' => [
|
||||||
'params' => array(
|
'params' => [
|
||||||
'host' => 'localhost',
|
'host' => 'localhost',
|
||||||
'user' => 'monarc',
|
'user' => 'monarc',
|
||||||
'password' => 'password',
|
'password' => 'password',
|
||||||
'dbname' => 'monarc_common',
|
'dbname' => 'monarc_common',
|
||||||
),
|
],
|
||||||
),
|
],
|
||||||
'orm_cli' => array(
|
'orm_cli' => [
|
||||||
'params' => array(
|
'params' => [
|
||||||
'host' => 'localhost',
|
'host' => 'localhost',
|
||||||
'user' => 'monarc',
|
'user' => 'monarc',
|
||||||
'password' => 'password',
|
'password' => 'password',
|
||||||
'dbname' => 'monarc_cli',
|
'dbname' => 'monarc_cli',
|
||||||
),
|
],
|
||||||
),
|
],
|
||||||
),
|
],
|
||||||
),
|
],
|
||||||
);
|
];
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# 3. Update MONARC
|
# 3. Update MONARC
|
||||||
|
|
@ -188,3 +187,18 @@ then update MONARC:
|
||||||
|
|
||||||
|
|
||||||
The username is *admin@admin.localhost* and the password is *admin*.
|
The username is *admin@admin.localhost* and the password is *admin*.
|
||||||
|
|
||||||
|
|
||||||
|
# 5. Statistics for Global Dashboard
|
||||||
|
|
||||||
|
If you would like to use the global dashboard stats feature, you need to configure a StatsService on your server.
|
||||||
|
The architecture, installation instructions and GitHub project can be found here:
|
||||||
|
|
||||||
|
https://monarc-stats-service.readthedocs.io/en/latest/architecture.html
|
||||||
|
https://monarc-stats-service.readthedocs.io/en/latest/installation.html
|
||||||
|
https://github.com/monarc-project/stats-service
|
||||||
|
|
||||||
|
The communication of access to the StatsService is performed on each instance of FrontOffice.
|
||||||
|
This includes the following lines change in your local.php file:
|
||||||
|
|
||||||
|
https://github.com/monarc-project/MonarcAppFO/blob/master/config/autoload/local.php.dist#L99-L102
|
||||||
|
|
|
||||||
|
|
@ -1545,21 +1545,21 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "doctrine/orm",
|
"name": "doctrine/orm",
|
||||||
"version": "2.7.4",
|
"version": "2.7.5",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/doctrine/orm.git",
|
"url": "https://github.com/doctrine/orm.git",
|
||||||
"reference": "7d84a4998091ece4d645253ac65de9f879eeed2f"
|
"reference": "01187c9260cd085529ddd1273665217cae659640"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/doctrine/orm/zipball/7d84a4998091ece4d645253ac65de9f879eeed2f",
|
"url": "https://api.github.com/repos/doctrine/orm/zipball/01187c9260cd085529ddd1273665217cae659640",
|
||||||
"reference": "7d84a4998091ece4d645253ac65de9f879eeed2f",
|
"reference": "01187c9260cd085529ddd1273665217cae659640",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"composer/package-versions-deprecated": "^1.8",
|
"composer/package-versions-deprecated": "^1.8",
|
||||||
"doctrine/annotations": "^1.8",
|
"doctrine/annotations": "^1.11.1",
|
||||||
"doctrine/cache": "^1.9.1",
|
"doctrine/cache": "^1.9.1",
|
||||||
"doctrine/collections": "^1.5",
|
"doctrine/collections": "^1.5",
|
||||||
"doctrine/common": "^2.11 || ^3.0",
|
"doctrine/common": "^2.11 || ^3.0",
|
||||||
|
|
@ -1574,9 +1574,9 @@
|
||||||
"symfony/console": "^3.0|^4.0|^5.0"
|
"symfony/console": "^3.0|^4.0|^5.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"doctrine/coding-standard": "^5.0",
|
"doctrine/coding-standard": "^6.0",
|
||||||
"phpstan/phpstan": "^0.12.18",
|
"phpstan/phpstan": "^0.12.18",
|
||||||
"phpunit/phpunit": "^7.5",
|
"phpunit/phpunit": "^8.0",
|
||||||
"symfony/yaml": "^3.4|^4.0|^5.0",
|
"symfony/yaml": "^3.4|^4.0|^5.0",
|
||||||
"vimeo/psalm": "^3.11"
|
"vimeo/psalm": "^3.11"
|
||||||
},
|
},
|
||||||
|
|
@ -1631,9 +1631,9 @@
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/doctrine/orm/issues",
|
"issues": "https://github.com/doctrine/orm/issues",
|
||||||
"source": "https://github.com/doctrine/orm/tree/2.7.4"
|
"source": "https://github.com/doctrine/orm/tree/2.7.5"
|
||||||
},
|
},
|
||||||
"time": "2020-10-10T17:11:26+00:00"
|
"time": "2020-12-03T08:52:14+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "doctrine/persistence",
|
"name": "doctrine/persistence",
|
||||||
|
|
@ -4243,16 +4243,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laminas/laminas-view",
|
"name": "laminas/laminas-view",
|
||||||
"version": "2.11.4",
|
"version": "2.11.5",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/laminas/laminas-view.git",
|
"url": "https://github.com/laminas/laminas-view.git",
|
||||||
"reference": "3bbb2e94287383604c898284a18d2d06cf17301e"
|
"reference": "16611035d7b3a6ef2c636a9268c213146123b663"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/laminas/laminas-view/zipball/3bbb2e94287383604c898284a18d2d06cf17301e",
|
"url": "https://api.github.com/repos/laminas/laminas-view/zipball/16611035d7b3a6ef2c636a9268c213146123b663",
|
||||||
"reference": "3bbb2e94287383604c898284a18d2d06cf17301e",
|
"reference": "16611035d7b3a6ef2c636a9268c213146123b663",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -4264,7 +4264,7 @@
|
||||||
"php": "^5.6 || ^7.0"
|
"php": "^5.6 || ^7.0"
|
||||||
},
|
},
|
||||||
"replace": {
|
"replace": {
|
||||||
"zendframework/zend-view": "self.version"
|
"zendframework/zend-view": "^2.11.4"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"laminas/laminas-authentication": "^2.5",
|
"laminas/laminas-authentication": "^2.5",
|
||||||
|
|
@ -4288,7 +4288,7 @@
|
||||||
"laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
|
"laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
|
||||||
"laminas/laminas-session": "^2.8.1",
|
"laminas/laminas-session": "^2.8.1",
|
||||||
"laminas/laminas-uri": "^2.5",
|
"laminas/laminas-uri": "^2.5",
|
||||||
"phpunit/phpunit": "^5.7.15 || ^6.0.8"
|
"phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.18"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"laminas/laminas-authentication": "Laminas\\Authentication component",
|
"laminas/laminas-authentication": "Laminas\\Authentication component",
|
||||||
|
|
@ -4309,12 +4309,6 @@
|
||||||
"bin/templatemap_generator.php"
|
"bin/templatemap_generator.php"
|
||||||
],
|
],
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
|
||||||
"branch-alias": {
|
|
||||||
"dev-master": "2.11.x-dev",
|
|
||||||
"dev-develop": "2.12.x-dev"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
"Laminas\\View\\": "src/"
|
"Laminas\\View\\": "src/"
|
||||||
|
|
@ -4338,7 +4332,13 @@
|
||||||
"rss": "https://github.com/laminas/laminas-view/releases.atom",
|
"rss": "https://github.com/laminas/laminas-view/releases.atom",
|
||||||
"source": "https://github.com/laminas/laminas-view"
|
"source": "https://github.com/laminas/laminas-view"
|
||||||
},
|
},
|
||||||
"time": "2019-12-31T18:03:30+00:00"
|
"funding": [
|
||||||
|
{
|
||||||
|
"url": "https://funding.communitybridge.org/projects/laminas-project",
|
||||||
|
"type": "community_bridge"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"time": "2020-12-15T14:57:08+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laminas/laminas-zendframework-bridge",
|
"name": "laminas/laminas-zendframework-bridge",
|
||||||
|
|
@ -4497,12 +4497,12 @@
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/monarc-project/zm-client.git",
|
"url": "https://github.com/monarc-project/zm-client.git",
|
||||||
"reference": "5f98129ad383760c596ab28b3029eec497c5bb1e"
|
"reference": "6fa4d2d6b9009fe9c2ca4f1a452d10394207b5f2"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/monarc-project/zm-client/zipball/5f98129ad383760c596ab28b3029eec497c5bb1e",
|
"url": "https://api.github.com/repos/monarc-project/zm-client/zipball/6fa4d2d6b9009fe9c2ca4f1a452d10394207b5f2",
|
||||||
"reference": "5f98129ad383760c596ab28b3029eec497c5bb1e",
|
"reference": "6fa4d2d6b9009fe9c2ca4f1a452d10394207b5f2",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -4581,7 +4581,7 @@
|
||||||
"issues": "https://github.com/monarc-project/zm-client/issues",
|
"issues": "https://github.com/monarc-project/zm-client/issues",
|
||||||
"source": "https://github.com/monarc-project/zm-client/tree/v2.9.20"
|
"source": "https://github.com/monarc-project/zm-client/tree/v2.9.20"
|
||||||
},
|
},
|
||||||
"time": "2020-12-01T14:03:59+00:00"
|
"time": "2020-12-17T11:13:25+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "monarc/phpword",
|
"name": "monarc/phpword",
|
||||||
|
|
@ -7030,16 +7030,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phar-io/version",
|
"name": "phar-io/version",
|
||||||
"version": "3.0.3",
|
"version": "3.0.4",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/phar-io/version.git",
|
"url": "https://github.com/phar-io/version.git",
|
||||||
"reference": "726c026815142e4f8677b7cb7f2249c9ffb7ecae"
|
"reference": "e4782611070e50613683d2b9a57730e9a3ba5451"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/phar-io/version/zipball/726c026815142e4f8677b7cb7f2249c9ffb7ecae",
|
"url": "https://api.github.com/repos/phar-io/version/zipball/e4782611070e50613683d2b9a57730e9a3ba5451",
|
||||||
"reference": "726c026815142e4f8677b7cb7f2249c9ffb7ecae",
|
"reference": "e4782611070e50613683d2b9a57730e9a3ba5451",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -7075,9 +7075,9 @@
|
||||||
"description": "Library for handling version information and constraints",
|
"description": "Library for handling version information and constraints",
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/phar-io/version/issues",
|
"issues": "https://github.com/phar-io/version/issues",
|
||||||
"source": "https://github.com/phar-io/version/tree/3.0.3"
|
"source": "https://github.com/phar-io/version/tree/3.0.4"
|
||||||
},
|
},
|
||||||
"time": "2020-11-30T09:21:21+00:00"
|
"time": "2020-12-13T23:18:30+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpdocumentor/reflection-common",
|
"name": "phpdocumentor/reflection-common",
|
||||||
|
|
@ -7306,16 +7306,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/php-code-coverage",
|
"name": "phpunit/php-code-coverage",
|
||||||
"version": "7.0.13",
|
"version": "7.0.14",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
|
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
|
||||||
"reference": "ad0dcd7b184e76f7198a1fe07685bfbec3ae911a"
|
"reference": "bb7c9a210c72e4709cdde67f8b7362f672f2225c"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ad0dcd7b184e76f7198a1fe07685bfbec3ae911a",
|
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/bb7c9a210c72e4709cdde67f8b7362f672f2225c",
|
||||||
"reference": "ad0dcd7b184e76f7198a1fe07685bfbec3ae911a",
|
"reference": "bb7c9a210c72e4709cdde67f8b7362f672f2225c",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -7324,7 +7324,7 @@
|
||||||
"php": ">=7.2",
|
"php": ">=7.2",
|
||||||
"phpunit/php-file-iterator": "^2.0.2",
|
"phpunit/php-file-iterator": "^2.0.2",
|
||||||
"phpunit/php-text-template": "^1.2.1",
|
"phpunit/php-text-template": "^1.2.1",
|
||||||
"phpunit/php-token-stream": "^3.1.1",
|
"phpunit/php-token-stream": "^3.1.1 || ^4.0",
|
||||||
"sebastian/code-unit-reverse-lookup": "^1.0.1",
|
"sebastian/code-unit-reverse-lookup": "^1.0.1",
|
||||||
"sebastian/environment": "^4.2.2",
|
"sebastian/environment": "^4.2.2",
|
||||||
"sebastian/version": "^2.0.1",
|
"sebastian/version": "^2.0.1",
|
||||||
|
|
@ -7367,7 +7367,7 @@
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
|
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
|
||||||
"source": "https://github.com/sebastianbergmann/php-code-coverage/tree/7.0.13"
|
"source": "https://github.com/sebastianbergmann/php-code-coverage/tree/7.0.14"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
|
@ -7375,7 +7375,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-11-30T08:35:22+00:00"
|
"time": "2020-12-02T13:39:03+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/php-file-iterator",
|
"name": "phpunit/php-file-iterator",
|
||||||
|
|
@ -7704,12 +7704,12 @@
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/Roave/SecurityAdvisories.git",
|
"url": "https://github.com/Roave/SecurityAdvisories.git",
|
||||||
"reference": "6aaf24c946b1f2689b85f0b3a62d30534d9aa1e4"
|
"reference": "d5961914bf7f90e81af509b81e51450bff419815"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/6aaf24c946b1f2689b85f0b3a62d30534d9aa1e4",
|
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/d5961914bf7f90e81af509b81e51450bff419815",
|
||||||
"reference": "6aaf24c946b1f2689b85f0b3a62d30534d9aa1e4",
|
"reference": "d5961914bf7f90e81af509b81e51450bff419815",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
|
|
@ -7739,7 +7739,7 @@
|
||||||
"composer/composer": "<=1-alpha.11",
|
"composer/composer": "<=1-alpha.11",
|
||||||
"contao-components/mediaelement": ">=2.14.2,<2.21.1",
|
"contao-components/mediaelement": ">=2.14.2,<2.21.1",
|
||||||
"contao/core": ">=2,<3.5.39",
|
"contao/core": ">=2,<3.5.39",
|
||||||
"contao/core-bundle": "= 4.10.0|>=4,<4.4.52|>=4.5,<4.9.6",
|
"contao/core-bundle": ">=4,<4.4.52|>=4.5,<4.9.6|= 4.10.0",
|
||||||
"contao/listing-bundle": ">=4,<4.4.8",
|
"contao/listing-bundle": ">=4,<4.4.8",
|
||||||
"datadog/dd-trace": ">=0.30,<0.30.2",
|
"datadog/dd-trace": ">=0.30,<0.30.2",
|
||||||
"david-garcia/phpwhois": "<=4.3.1",
|
"david-garcia/phpwhois": "<=4.3.1",
|
||||||
|
|
@ -7783,6 +7783,8 @@
|
||||||
"friendsoftypo3/mediace": ">=7.6.2,<7.6.5",
|
"friendsoftypo3/mediace": ">=7.6.2,<7.6.5",
|
||||||
"fuel/core": "<1.8.1",
|
"fuel/core": "<1.8.1",
|
||||||
"getgrav/grav": "<1.7-beta.8",
|
"getgrav/grav": "<1.7-beta.8",
|
||||||
|
"getkirby/cms": ">=3,<3.4.5",
|
||||||
|
"getkirby/panel": "<2.5.14",
|
||||||
"gos/web-socket-bundle": "<1.10.4|>=2,<2.6.1|>=3,<3.3",
|
"gos/web-socket-bundle": "<1.10.4|>=2,<2.6.1|>=3,<3.3",
|
||||||
"gree/jose": "<=2.2",
|
"gree/jose": "<=2.2",
|
||||||
"gregwar/rst": "<1.0.3",
|
"gregwar/rst": "<1.0.3",
|
||||||
|
|
@ -8015,7 +8017,7 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2020-12-01T13:02:08+00:00"
|
"time": "2020-12-08T15:02:56+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sebastian/code-unit-reverse-lookup",
|
"name": "sebastian/code-unit-reverse-lookup",
|
||||||
|
|
|
||||||
|
|
@ -12,27 +12,27 @@
|
||||||
*/
|
*/
|
||||||
$package_json = json_decode(file_get_contents('./package.json'), true);
|
$package_json = json_decode(file_get_contents('./package.json'), true);
|
||||||
|
|
||||||
return array(
|
return [
|
||||||
'doctrine' => array(
|
'doctrine' => [
|
||||||
'connection' => array(
|
'connection' => [
|
||||||
'orm_default' => array(
|
'orm_default' => [
|
||||||
'params' => array(
|
'params' => [
|
||||||
'host' => 'localhost',
|
'host' => 'localhost',
|
||||||
'user' => 'sqlmonarcuser',
|
'user' => 'sqlmonarcuser',
|
||||||
'password' => 'password',
|
'password' => 'password',
|
||||||
'dbname' => 'monarc_common',
|
'dbname' => 'monarc_common',
|
||||||
),
|
],
|
||||||
),
|
],
|
||||||
'orm_cli' => array(
|
'orm_cli' => [
|
||||||
'params' => array(
|
'params' => [
|
||||||
'host' => 'localhost',
|
'host' => 'localhost',
|
||||||
'user' => 'sqlmonarcuser',
|
'user' => 'sqlmonarcuser',
|
||||||
'password' => 'password',
|
'password' => 'password',
|
||||||
'dbname' => 'monarc_cli',
|
'dbname' => 'monarc_cli',
|
||||||
),
|
],
|
||||||
),
|
],
|
||||||
),
|
],
|
||||||
),
|
],
|
||||||
|
|
||||||
'languages' => [
|
'languages' => [
|
||||||
'fr' => [
|
'fr' => [
|
||||||
|
|
@ -55,27 +55,7 @@ return array(
|
||||||
|
|
||||||
'defaultLanguageIndex' => 1,
|
'defaultLanguageIndex' => 1,
|
||||||
|
|
||||||
/* Link with (ModuleCore)
|
'activeLanguages' => ['fr', 'en', 'de', 'nl',],
|
||||||
config['languages'] = [
|
|
||||||
'fr' => array(
|
|
||||||
'index' => 1,
|
|
||||||
'label' => 'Français'
|
|
||||||
),
|
|
||||||
'en' => array(
|
|
||||||
'index' => 2,
|
|
||||||
'label' => 'English'
|
|
||||||
),
|
|
||||||
'de' => array(
|
|
||||||
'index' => 3,
|
|
||||||
'label' => 'Deutsch'
|
|
||||||
),
|
|
||||||
'nl' => array(
|
|
||||||
'index' => 4,
|
|
||||||
'label' => 'Nederlands',
|
|
||||||
),
|
|
||||||
]
|
|
||||||
*/
|
|
||||||
'activeLanguages' => array('fr','en','de','nl',),
|
|
||||||
|
|
||||||
'appVersion' => $package_json['version'],
|
'appVersion' => $package_json['version'],
|
||||||
|
|
||||||
|
|
@ -90,8 +70,8 @@ return array(
|
||||||
'terms' => 'https://my.monarc.lu/terms.html',
|
'terms' => 'https://my.monarc.lu/terms.html',
|
||||||
|
|
||||||
'monarc' => array(
|
'monarc' => array(
|
||||||
'ttl' => 60, // timeout
|
'ttl' => 60,
|
||||||
'cliModel' => 'generic', // model to display for the client, an ID of a specific model or 'generic' (empty for all)
|
'cliModel' => 'generic',
|
||||||
),
|
),
|
||||||
|
|
||||||
'mospApiUrl' => 'https://objects.monarc.lu/api/v1/',
|
'mospApiUrl' => 'https://objects.monarc.lu/api/v1/',
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ MONARC will be automatically deployed in an Ubuntu Bionic Server.
|
||||||
$ vagrant up
|
$ vagrant up
|
||||||
|
|
||||||
Once the VM will be configured by Vagrant, go to the address
|
Once the VM will be configured by Vagrant, go to the address
|
||||||
http://127.0.0.1:5001.
|
http://127.0.0.1:5001
|
||||||
|
|
||||||
The username is *admin@admin.localhost* and the password is *admin*.
|
The username is *admin@admin.localhost* and the password is *admin*.
|
||||||
|
|
||||||
|
|
@ -38,6 +38,9 @@ You can now edit the source code with your favorite editor and test it in your
|
||||||
browser. The only thing is to not forget to restart Apache in the VM after a
|
browser. The only thing is to not forget to restart Apache in the VM after a
|
||||||
modification.
|
modification.
|
||||||
|
|
||||||
|
The StatsService service will be configured, launched and accessible by the following url:
|
||||||
|
http://127.0.0.1:5005
|
||||||
|
|
||||||
------------------------------
|
------------------------------
|
||||||
Run tests.
|
Run tests.
|
||||||
The test can be run from Monarc root folder (/home/ubuntu/monarc) of your vagrant VM (params in square brackets are optional):
|
The test can be run from Monarc root folder (/home/ubuntu/monarc) of your vagrant VM (params in square brackets are optional):
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue