Removed from the mospApiUrl /v1 and added a script to fix it for the release.

pull/350/head
Ruslan Baidan 2021-03-24 11:48:13 +01:00
parent d4d5a77380
commit 23effdec6b
No known key found for this signature in database
GPG Key ID: 4B7724C136BF1D89
9 changed files with 32 additions and 6 deletions

View File

@ -1,6 +1,16 @@
MONARC Changelog 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. ## 2.10.2 (2021-02-24) Includes 3 bug-fixes and a new feature.
### Fix ### 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/v1/', + 'mospApiUrl' => 'https://objects.monarc.lu/api/',
+ +
+ 'statsApi' => [ + 'statsApi' => [
+ 'baseUrl' => 'http://127.0.0.1:5005', + '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', 'cliModel' => 'generic',
], ],
'mospApiUrl' => 'https://objects.monarc.lu/api/v1/', 'mospApiUrl' => 'https://objects.monarc.lu/api/',
'statsApi' => [ 'statsApi' => [
'baseUrl' => 'http://127.0.0.1:5005', 'baseUrl' => 'http://127.0.0.1:5005',

View File

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

View File

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

View File

@ -0,0 +1,14 @@
version=$(cat ./VERSION.json)
version_affected='{"major":2, "minor":10, "hotfix":3}'
if [[ $version == "$version_affected" ]]; then
for conf_file in /var/www/*/local.php
do
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."
else
sed -i 's/https:\/\/objects.monarc.lu\/api\/v1\//https:\/\/objects.monarc.lu\/api\//g' "./config/autoload/local.php"
echo "Done for ./config/autoload/local.php"
fi
done
fi

View File

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

View File

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