Merge pull request #350 from monarc-project/feature/320

Feature/320 Updated the mospApiUrl, added a script to update all the clients configs.
phpword_v0.18.1
Ruslan Baidan 2021-05-05 10:56:29 +02:00 committed by GitHub
commit 15fd1aa83d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 27 additions and 6 deletions

View File

@ -1,6 +1,16 @@
MONARC Changelog
================
## 2.10.3 (2021-??-??) Includes bug-fixes and a new feature.
### Fix
TODO: add fixes!
### New
- Implementation of the library objects import and assets export from/to MOSP.
([#320](https://github.com/monarc-project/MonarcAppFO/issues/320)).
## 2.10.2 (2021-02-24) Includes 3 bug-fixes and a new feature.
### Fix

View File

@ -219,7 +219,7 @@ local.php file:
],
- 'mospApiUrl' => 'https://objects.monarc.lu/api/v1/'
+ 'mospApiUrl' => 'https://objects.monarc.lu/api/v1/',
+ 'mospApiUrl' => 'https://objects.monarc.lu/api/',
+
+ 'statsApi' => [
+ 'baseUrl' => 'http://127.0.0.1:5005',

View File

@ -1 +1 @@
{"major":2, "minor":10, "hotfix":2}
{"major":2, "minor":10, "hotfix":3}

View File

@ -74,7 +74,7 @@ return [
'cliModel' => 'generic',
],
'mospApiUrl' => 'https://objects.monarc.lu/api/v1/',
'mospApiUrl' => 'https://objects.monarc.lu/api/',
'statsApi' => [
'baseUrl' => 'http://127.0.0.1:5005',

View File

@ -1,6 +1,6 @@
{
"name": "MONARC",
"version": "2.10.2",
"version": "2.10.3",
"description": "Monarc front office application",
"private": true,
"repository": {

View File

@ -118,4 +118,6 @@ if [[ $forceClearCache -eq 0 && $bypass -eq 0 ]]; then
touch ./data/cache/upgrade && chmod 777 ./data/cache/upgrade
fi
./scripts/update_config_variables.sh
exit 0

View File

@ -0,0 +1,9 @@
version=$(cat ./VERSION.json)
version_affected='{"major":2, "minor":10, "hotfix":3}'
if [[ $version == "$version_affected" ]]; then
conf_file='./config/autoload/local.php'
if [ -f "$conf_file" ]; then
sed -i 's/https:\/\/objects.monarc.lu\/api\/v1\//https:\/\/objects.monarc.lu\/api\//g' "$conf_file"
echo "Done for $conf_file"
fi
fi

View File

@ -84,7 +84,7 @@ return [
'from' => 'info@monarc.lu',
],
'mospApiUrl' => 'https://objects.monarc.lu/api/v1/',
'mospApiUrl' => 'https://objects.monarc.lu/api/',
'monarc' => [
'ttl' => 60,

View File

@ -341,7 +341,7 @@ return [
'from' => 'info@monarc.lu',
],
'mospApiUrl' => 'https://objects.monarc.lu/api/v1/',
'mospApiUrl' => 'https://objects.monarc.lu/api/',
'monarc' => [
'ttl' => 60, // timeout