Skip to content
Snippets Groups Projects
Commit 95779e6d authored by trantzas's avatar trantzas
Browse files

Merge branch '11-update-deployment-configuration-of-apis-tmf-api-osapi-oasapi' into 'develop' 

Resolve "Update deployment configuration of APIs (TMF api, osapi, oasapi)"

See merge request !18
parents e0c15a17 babb83a7
No related branches found
No related tags found
3 merge requests!34Merging develop (merged from 2024Q2_RC) into main creating for 2024Q2 Release,!33Merging 2024Q2_RC into main creating for 2024Q2 Release,!18Resolve "Update deployment configuration of APIs (TMF api, osapi, oasapi)"
Hide whitespace changes
Inline Side-by-side
compose/docker-compose.yaml.configure
+ 11
− 4
View file @ 95779e6d
......@@ -89,6 +89,7 @@ services:
image: org.etsi.osl.portal.api:latest
environment:
SPRING_APPLICATION_JSON: '{
"origins": "http://localhost",
"spring.datasource.url": "jdbc:mysql://amysql/osdb?createDatabaseIfNotExist=true",
"spring.datasource.username":"root",
"spring.datasource.password":"letmein",
......@@ -106,7 +107,8 @@ services:
"spring.activemq.password": "artemis",
"logging.level.org.springframework" : "INFO",
"spring.portal.main.domain": "http://localhost",
"spring.portal.portal.title": "Openslice"
"spring.portal.portal.title": "Openslice",
"server.forward-headers-strategy":"FRAMEWORK"
}'
logging:
driver: "json-file"
......@@ -186,6 +188,7 @@ services:
image: org.etsi.osl.tmf.api:latest
environment:
SPRING_APPLICATION_JSON: '{
"origins": "http://localhost",
"spring.datasource.url": "jdbc:mysql://amysql/ostmfdb?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=utf8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC",
"spring.datasource.username":"root",
"spring.datasource.password":"letmein",
......@@ -202,7 +205,8 @@ services:
"spring.activemq.user": "artemis",
"spring.activemq.password": "artemis",
"logging.level.org.springframework" : "INFO",
"kroki.serverurl" : "http://localhost/kroki"
"kroki.serverurl" : "http://localhost/kroki",
"server.forward-headers-strategy":"FRAMEWORK"
}'
volumes:
- ./repo:/root
......@@ -251,6 +255,7 @@ services:
image: org.etsi.osl.oas:latest
environment:
SPRING_APPLICATION_JSON: '{
"origins": "http://localhost",
"spring.datasource.url": "jdbc:mysql://amysql/ostmfdb?createDatabaseIfNotExist=true&useUnicode=true&nullCatalogMeansCurrent=true&characterEncoding=utf8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC",
"spring.datasource.username":"root",
"spring.datasource.password":"letmein",
......@@ -266,7 +271,8 @@ services:
"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
"spring.activemq.user": "artemis",
"spring.activemq.password": "artemis",
"logging.level.org.springframework" : "INFO"
"logging.level.org.springframework" : "INFO",
"server.forward-headers-strategy":"FRAMEWORK"
}'
volumes:
- ./repo:/root
......@@ -328,7 +334,8 @@ services:
"spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
"spring.activemq.user": "artemis",
"spring.activemq.password": "artemis",
"centrallogurl":"http://elk_ip:elk_port/index_name/_doc"
"centrallogurl":"http://elk_ip:elk_port/index_name/_doc",
"logging.level.org.springframework" : "INFO"
}'
ports:
- 13013:13013
......
compose/nginx/nginx.conf.default
+ 36
− 53
View file @ 95779e6d
......@@ -30,39 +30,30 @@ http {
#include /etc/nginx/conf.d/*.conf;
server {
listen 80;
server {
listen 80;
listen [::]:80;
server_name localhost;
location / {
root /webstatic/services/;
index index.html;
try_files $uri $uri/ /index.html;
}
# location / {
# root /webstatic/nfvportal/openslicehome;
# index index.html;
# }
location /nfvportal {
root /webstatic;
index index.html;
autoindex off;
try_files $uri $uri/ /nfvportal/index.html;
location / {
root /webstatic/services/;
index index.html;
try_files $uri $uri/ /index.html;
}
location /nfvportal {
root /webstatic;
index index.html;
autoindex off;
try_files $uri $uri/ /nfvportal/index.html;
}
location /osapi {
proxy_pass http://osportalapi:13000/osapi;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $http_host;
proxy_set_header X-Forwarded-Proto $scheme;
}
location /tmf-api {
......@@ -70,6 +61,7 @@ http {
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $http_host;
proxy_set_header X-Forwarded-Proto $scheme;
}
location /oas-api {
......@@ -77,46 +69,37 @@ http {
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $http_host;
proxy_set_header X-Forwarded-Proto $scheme;
}
# For http
location /auth {
proxy_pass http://keycloak:8080/auth;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $http_host;
proxy_pass http://keycloak:8080/auth;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $http_host;
}
location /kroki {
rewrite /kroki/(.*) /$1 break;
proxy_pass http://kroki:8000;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $http_host;
rewrite /kroki/(.*) /$1 break;
proxy_pass http://kroki:8000;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $http_host;
}
# location /auth {
# proxy_pass https://keycloak:8443/auth;
# proxy_set_header X-Real-IP $remote_addr;
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# proxy_set_header Host $http_host;
# proxy_set_header X-Forwarded-Server $host;
# proxy_set_header X-Forwarded-Proto $scheme;
# proxy_set_header X-Forwarded-Port 443;
# }
# For https
# location /auth {
# proxy_pass https://keycloak:8443/auth;
# proxy_set_header X-Real-IP $remote_addr;
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# proxy_set_header Host $http_host;
# proxy_set_header X-Forwarded-Server $host;
# proxy_set_header X-Forwarded-Proto $scheme;
# proxy_set_header X-Forwarded-Port 443;
# }
}
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment