Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
keeleliin
keeleliin-wrapper
Commits
0f029cbf
Commit
0f029cbf
authored
Mar 03, 2019
by
Indrek Jentson
Browse files
Eraldi sisse toodud teenuse url
parent
da63e135
Changes
3
Hide whitespace changes
Inline
Side-by-side
config_dist.js
View file @
0f029cbf
var
config
=
require
(
'
./global_config/global
'
);
/*
* Teenuse url ilma pordita. Kasutatakse teenuse serverisse installeerimisel teenuse urli moodustamiseks: <url>:<port>/api/v1/
* Teenuse
ja serveri
url ilma pordita. Kasutatakse teenuse serverisse installeerimisel teenuse urli moodustamiseks: <url>:<port>/api/v1/
*/
config
.
serverUrl
=
'
http://localhost
'
;
config
.
serviceUrl
=
'
http://localhost
'
;
// Docker-compose kontekstis 'http://teenusenimi'
config
.
serverUrl
=
'
http://localhost
'
;
// Docker-compose kontekstis 'http://server'
/*
* Redis serveri andmed. Kui kasutatakse vaikeseadeid, siis pole vaja muuta
*/
//config.redis = {
// host: process.env.REDIS_PORT_6379_TCP_ADDR || "127.0.0.1",
// host: process.env.REDIS_PORT_6379_TCP_ADDR || "127.0.0.1",
// Docker-compose kontekstis 'redis'
// port: process.env.REDIS_PORT_6379_TCP_PORT || 6379
//};
...
...
@@ -18,7 +19,7 @@ config.serverUrl = 'http://localhost';
*/
//config.integration = [
// {
// installUrl: 'http://keeleliin.keeleressursid.ee:3000/api/v1/service/install',
// installUrl: 'http://keeleliin.keeleressursid.ee:3000/api/v1/service/install',
// Docker-compose kontekstis 'http://server:3000/...'
// apiKey: 'server-wrapper-api-key'
// }
//];
...
...
global_config/global.js
View file @
0f029cbf
...
...
@@ -5,6 +5,7 @@ config.redis = {
port
:
process
.
env
.
REDIS_PORT_6379_TCP_PORT
||
6379
};
config
.
serviceUrl
=
'
http://localhost
'
;
config
.
serverUrl
=
'
http://localhost
'
;
config
.
integration
=
[
...
...
src/service/integration/installService.js
View file @
0f029cbf
...
...
@@ -57,7 +57,7 @@ var InstallService = function() {
configuration
.
sid
=
wrapper
.
id
;
configuration
.
name
=
wrapper
.
title
;
configuration
.
description
=
wrapper
.
description
;
configuration
.
url
=
config
.
serve
r
Url
+
'
:
'
+
wrapper
.
port
+
'
/api/v1/
'
;
configuration
.
url
=
config
.
serv
ic
eUrl
+
'
:
'
+
wrapper
.
port
+
'
/api/v1/
'
;
configuration
.
inputTypes
=
[];
configuration
.
outputTypes
=
[];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment