Skip to content

Commit e6e200f

Browse files
author
Anders Breid
authored
Remove ei.frontend.service.port property (#193)
Restructuring application.properties
1 parent c5d14cd commit e6e200f

File tree

3 files changed

+19
-20
lines changed

3 files changed

+19
-20
lines changed

src/main/docker/docker-compose.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
# limitations under the License.
1717
#
1818
##################################################################################################
19-
# docker-compose commands
19+
# docker-compose commands
2020
#
21-
# run: docker-compose up
21+
# run: docker-compose up
2222
# stop: docker-compose stop
2323
# stop/remove: docker-compose down --volumes
2424
#
2525
# Cleanup/Remove (if needed):
26-
# Dangling Volumes: docker volume rm `docker volume ls -q -f dangling=true`
26+
# Dangling Volumes: docker volume rm `docker volume ls -q -f dangling=true`
2727
# Unused Images: docker images -q | xargs docker rmi
28-
# Stopped containers: docker rm `docker ps -a -q`
28+
# Stopped containers: docker rm `docker ps -a -q`
2929
#
3030
# Maintainer: Eiffel-Community
3131
##################################################################################################
@@ -38,11 +38,11 @@ services:
3838
- "27017"
3939
ports:
4040
- "27017:27017"
41-
healthcheck:
41+
healthcheck:
4242
test: ["CMD-SHELL","echo", "'db.stats().ok' | mongo localhost:27017/test", "--quiet"]
4343
interval: 30s
4444
timeout: 10s
45-
retries: 5
45+
retries: 5
4646
networks:
4747
eiffel_2.0_1:
4848
aliases:
@@ -85,7 +85,7 @@ services:
8585
eiffel_2.0_1:
8686
aliases:
8787
- eiffel-er
88-
environment: # Overrides settings in config file in catalina folder. OBS --> skip quotes for rabbitmq.bindingKey value
88+
environment: # Overrides settings in config file in catalina folder. OBS --> skip quotes for rabbitmq.bindingKey value
8989
# No config file copied to catalina folder in Dockerfile, only uses env vars below ;-)
9090
# /eventrepository removed in contextpath
9191
- server.contextPath=/
@@ -184,9 +184,8 @@ services:
184184
- ei-frontend
185185
environment: # Overrides settings in application config file
186186
- spring.application.name=ei-frontend
187-
- server.port=8080
187+
- server.port=8081
188188
- ei.frontend.service.host=${HOST}
189-
- ei.frontend.service.port=8081
190189
- ei.frontend.context.path=
191190
- ei.backend.instances.list.json.content=${EIFFEL2_EI_FRONTEND_EI_INSTANCES_LIST}
192191
- ei.backend.instances.filepath=/tmp/ei-instances-list.conf

src/main/java/com/ericsson/ei/frontend/utils/WebControllerUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class WebControllerUtils {
4343
@Value("${ei.frontend.service.host:#{null}}")
4444
private String frontendServiceHost;
4545

46-
@Value("${ei.frontend.service.port:#{null}}")
46+
@Value("${server.port:#{null}}")
4747
private int frontendServicePort;
4848

4949
@Value("${ei.frontend.context.path:#{null}}")

src/main/resources/application.properties

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,29 @@ spring.jackson.default-property-inclusion=non_null
33

44
# An extra optional version tag, version will be added after github release version
55
# Example if build.version=1.2.3-internal becomes Version 0.0.18 (1.2.3-internal)
6-
build.version=
6+
#build.version=
77

8+
######## EI Front-End
89
server.port=8080
10+
ei.frontend.service.host=localhost
11+
ei.frontend.context.path=
12+
13+
######## EI Front-end security
14+
ei.use.secure.http.frontend=false
915
#server.ssl.key-store: <keystore.p12>
1016
#server.ssl.key-store-password: <mypassword>
1117
#server.ssl.key-store-type: <PKCS12>
1218
#server.ssl.key-alias: <tomcat>
1319

14-
######## EI Front-End
15-
ei.frontend.service.host=localhost
16-
ei.frontend.service.port=8080
17-
ei.frontend.context.path=
18-
ei.use.secure.http.frontend=false
19-
2020
######## EI Default Back-Ends
2121
ei.backend.instances.filepath=
2222
ei.backend.instances.list.json.content=[{ "contextPath": "", "port": "8090", "name": "EI-Backend-1", "host": "localhost", "https": false, "defaultBackend": true}]
2323

2424
###### EI Documentation Link Url ##########
2525
ei.eiffel.documentation.urls={ "EI Frontend GitHub": "https://github.com/eiffel-community/eiffel-intelligence-frontend",\
26-
"EI Backend GitHub": "https://github.com/eiffel-community/eiffel-intelligence",\
27-
"Eiffel Github main page": "https://github.com/eiffel-community/eiffel",\
28-
"Test Rules User Guide": "https://github.com/eiffel-community/eiffel-intelligence-frontend/blob/master/wiki/markdown/test-rules.md" }
26+
"EI Backend GitHub": "https://github.com/eiffel-community/eiffel-intelligence",\
27+
"Eiffel Github main page": "https://github.com/eiffel-community/eiffel",\
28+
"Test Rules User Guide": "https://github.com/eiffel-community/eiffel-intelligence-frontend/blob/master/wiki/markdown/test-rules.md" }
2929

3030
#### LOGGING #########
3131
logging.level.root: INFO

0 commit comments

Comments
 (0)