diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b0a69779c8ffc39cc478f414ea8c0fa30aea2543..e0833bc9cf7defcbd7a2b540a6c65253722f29d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -101,9 +101,9 @@ build: - ssh -o StrictHostKeyChecking=no root@${SERVER_IP} 'echo "Successfully connected on $(hostname)"' script: # Copy jar - - scp ./$JAR_PATH root@${SERVER_IP}:/opt/${APP_NAME}/${APP_NAME}-${ENV}.jar + - scp ./$JAR_PATH root@${SERVER_IP}:/opt/bootapp/${APP_NAME}-${ENV}.jar # Restarting service with the updated jar and the according Spring profiles enabled - - ssh root@${SERVER_IP} "systemctl restart ${APP_NAME}@${ENV}" + - ssh root@${SERVER_IP} "systemctl restart bootapp@${APP_NAME}-${ENV}" - eval $(ssh-agent -k) - echo "Deploy done. Application should be available at http://${SERVER_IP}:${APP_PORT}/${CONTEXT_PATH}" @@ -131,6 +131,9 @@ deploy-to-beta: APP_PORT: ${BETA_GPDS_PORT} CONTEXT_PATH: ${BETA_GPDS_CONTEXT_PATH} <<: *deploy_to_vm + except: + refs: + - master only: refs: - branches @@ -160,12 +163,12 @@ deploy-to-int: allow_failure: false -deploy-to-public-prod: +deploy-to-prod-public: stage: production variables: - ENV: public-prod - APP_PORT: ${PUBLIC_PROD_GPDS_PORT} - CONTEXT_PATH: ${PUBLIC_PROD_GPDS_CONTEXT_PATH} + ENV: prod-public + APP_PORT: ${PROD_PUBLIC_GPDS_PORT} + CONTEXT_PATH: ${PROD_PUBLIC_GPDS_CONTEXT_PATH} <<: *deploy_to_vm only: refs: @@ -178,12 +181,12 @@ deploy-to-public-prod: allow_failure: false -deploy-to-private-prod: +deploy-to-prod-private: stage: production variables: - ENV: private-prod - APP_PORT: ${PRIVATE_PROD_GPDS_PORT} - CONTEXT_PATH: ${PRIVATE_PROD_GPDS_CONTEXT_PATH} + ENV: prod-private + APP_PORT: ${PROD_PRIVATE_GPDS_PORT} + CONTEXT_PATH: ${PROD_PRIVATE_GPDS_CONTEXT_PATH} <<: *deploy_to_vm only: refs: diff --git a/README.md b/README.md index 7cec202e353e61991a1dff885640fed8f313cf58..97ad87f471fe9f3b3acf099fa8a167fd91e0b59e 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ If you want to run an Elasticsearch server on your development machine you can u docker-compose up ``` -> This will launch an Elasticsearch server (with port forwarding `9200` and `9300`) and a Kibana server (with port forwarding `5601`) +> This will launch an Elasticsearch server (with port forwarding `9200`) and a Kibana server (with port forwarding `5601`) > **Warning**: This repository does not automatically index data into Elasticsearch, you need to prepare your indices beforehand. @@ -68,7 +68,7 @@ Otherwise, for the complete server (backend APIs + frontend interface), you can ./gradlew assemble && java -jar backend/build/libs/gpds.jar ``` -The server should then be accessible at http://localhost:8380/gnpis/gpds +The server should then be accessible at http://localhost:8380/gpds-dev ## Run frontend development server diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml index ebe053c7a170e89ecc058138708d0e63c3bbdebd..3b87c03f896f584172004ea031b0703edb5d653b 100644 --- a/backend/src/main/resources/application.yml +++ b/backend/src/main/resources/application.yml @@ -47,5 +47,5 @@ server: - text/css port: 8380 servlet: - context-path: /gnpis-dev/gpds + context-path: /gpds-dev diff --git a/docker-compose.yml b/docker-compose.yml index 4cc0e3ef04d3ceaf702460c8e3d1857964d43398..cac41bac4fd751bac98d6e7127805d3b2beea63f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,6 @@ services: - discovery.type=single-node ports: - 9200:9200 - - 9300:9300 kibana: image: docker.elastic.co/kibana/kibana:6.5.4 diff --git a/frontend/angular.json b/frontend/angular.json index 6a6ee052b1aab4c592e94c5f2cd9afdf353e1089..39359c6dd4a82fb1eb7069225412ea538f464ad0 100644 --- a/frontend/angular.json +++ b/frontend/angular.json @@ -42,7 +42,7 @@ "node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css" ], "scripts": [], - "baseHref": "/gnpis-dev/gpds/" + "baseHref": "/gpds-dev/" }, "configurations": { "production": { diff --git a/frontend/proxy.conf.js b/frontend/proxy.conf.js index f271334b4e14a95c6f96f19f19c3fdcc0979fadc..28c5f743c2de6a6f73c6d96706374b7e49f90165 100644 --- a/frontend/proxy.conf.js +++ b/frontend/proxy.conf.js @@ -1,8 +1,8 @@ const PROXY_CONFIG = [ { context: [ - "/gnpis-dev/gpds/brapi", - "/gnpis-dev/gpds/gnpis", + "/gpds-dev/brapi", + "/gpds-dev/gnpis", ], target: "http://localhost:8380", secure: false