Renamed kypo2 to kypo

assets/oidc-examples/oidc-client-example.json

@@ -3,10 +3,10 @@
   "registration_access_token": "eyJraWQiOiJyc2ExIiwiYWxnIjoiUlMyNTYifQ.eyJhdWQiOiIwYmYzM2YwMC0yNzAwLTRlZmItYWIwOS0xODYwNzZmODVjN2QiLCJpc3MiOiJodHRwOlwvXC9sb2NhbGhvc3Q6ODA4MFwvY3NpcnRtdS1kdW1teS1pc3N1ZXItc2VydmVyXC8iLCJpYXQiOjE1ODYzNDc4OTgsImp0aSI6IjBiM2QwMGRkLTNkMmEtNDUxYS05N2IyLTVjOWRkZWRmNzJiMSJ9.khomSWZRvSIag91fjPVs7ADTP81hx58MN9mdyfQCrMmr3GkvIdNa08eRTQRrznHj_QsZq7ActjGxfoIW-Ec2Gv0ayyRFlxKEKbk7yXwuwbEIBoLwO7RQXY1odZV4F4VFD5dXS9PT-00BTXm-yMfFHUpw1x_CmiZKdt664l1ScD3MUcxvM4DHVyz17J4Vxjb_8bqFh3zfsmyQ19RspP7cfPyOYxJO0J2R6TX2DMvwVgZfFhP13relILYqIIKnhte4TymrlniNVg-7WeKSzWXefpWZ6BijuWExTvIDeUBiZPWvb_zcBbpPfJDwKIUOKALiwlh25hx3oF97vucR_fwvkA",
   "client_secret": "FuYcAhuNfn_tdGnD811ULXnXDiWtRIgvW0UAakHpkUPRCIJuFdzmeeoAn2xvO0T-k8vrFMcZTBxswiN0vLyGRQ",
   "redirect_uris": [
-    "https://172.19.0.22/kypo2-rest-user-and-group/api/v1/webjars/springfox-swagger-ui/oauth2-redirect.html",
+    "https://172.19.0.22/kypo-rest-user-and-group/api/v1/webjars/springfox-swagger-ui/oauth2-redirect.html",
     "https://172.19.0.22/silent-refresh.html",
     "https://172.19.0.22/index.html",
-    "https://172.19.0.22/kypo2-rest-training/api/v1/webjars/springfox-swagger-ui/oauth2-redirect.html",
+    "https://172.19.0.22/kypo-rest-training/api/v1/webjars/springfox-swagger-ui/oauth2-redirect.html",
     "https://172.19.0.22"
   ],
   "client_name": "KYPO-Client",
@@ -56,4 +56,4 @@
   "registration_client_uri": "https://172.19.0.22:443/csirtmu-dummy-issuer-server/register/0bf33f00-2700-4efb-ab09-186076f85c7d",
   "client_secret_expires_at": 0,
   "client_id_issued_at": 1586347898
-}
\ No newline at end of file
+}

provisioning/group_vars/all.yml

@@ -89,7 +89,7 @@ kypo_crp_oidc_scopes:
 kypo_crp_git: '{{ kypo_crp_git_internal }}'
 
 kypo_crp_uag_service_container_name: uag-service
-kypo_crp_uag_service_context_path: /kypo2-rest-user-and-group/api/v1/
+kypo_crp_uag_service_context_path: /kypo-rest-user-and-group/api/v1/
 kypo_crp_uag_service_url: '{{ kypo_crp_url }}{{ kypo_crp_uag_service_context_path }}'
 kypo_crp_uag_service_authorization_strategy_url: '{{ kypo_crp_uag_service_url }}users/info'
 kypo_crp_uag_service_swagger_redirect_url: '{{ kypo_crp_uag_service_url }}webjars/springfox-swagger-ui/oauth2-redirect.html'
@@ -103,7 +103,7 @@ kypo_crp_sandbox_service_url: '{{ kypo_crp_url }}{{ kypo_crp_sandbox_service_con
 kypo_crp_sandbox_service_internal_url: 'http://{{ kypo_crp_sandbox_service_container_name }}:8000{{ kypo_crp_sandbox_service_context_path }}'
 
 kypo_crp_training_service_container_name: training-service
-kypo_crp_training_service_context_path: /kypo2-rest-training/api/v1/
+kypo_crp_training_service_context_path: /kypo-rest-training/api/v1/
 kypo_crp_training_service_url: '{{ kypo_crp_url }}{{ kypo_crp_training_service_context_path }}'
 kypo_crp_training_service_internal_url: 'http://{{ kypo_crp_training_service_container_name }}:8083{{ kypo_crp_training_service_context_path }}'
 kypo_crp_training_service_swagger_redirect_url: '{{ kypo_crp_training_service_url }}webjars/springfox-swagger-ui/oauth2-redirect.html'

provisioning/roles/kypo-crp-head/templates/configuration/adaptive-training-service/kypo-adaptive-training.properties

@@ -8,11 +8,11 @@ microservice.name=kypo-adaptive-training
 ## Allows you to specify allowed origins for CORS mapping. You could set it as, e.g., http://domain1.com, http://domain2.com, etc. The default value is: *
 cors.allowed.origins={{ kypo_crp_url }}
 
-# calling user-and-group project, e.g., https://localhost:8084/kypo2-rest-user-and-group/api/v1
+# calling user-and-group project, e.g., https://localhost:8084/kypo-rest-user-and-group/api/v1
 user-and-group-server.uri={{ kypo_crp_uag_service_internal_url }}
-# calling kypo2-openstack, e.g., http://localhost:8080/kypo-openstack/api/v1
+# calling kypo-openstack, e.g., http://localhost:8080/kypo-openstack/api/v1
 openstack-server.uri={{ kypo_crp_sandbox_service_internal_url }}
-# calling kypo-elasticsearch-service, e.g., http://elastic-service:8085/kypo2-elastic/api/v1
+# calling kypo-elasticsearch-service, e.g., http://elastic-service:8085/kypo-elastic/api/v1
 elasticsearch-service.uri={{ kypo_crp_elasticsearch_service_internal_url }}
 # calling kypo-smart-assistant-service, e.g., http://smart-assistant-service:8086/kypo-adaptive-smart-assistant/api/v1
 smart-assistant-service.uri={{ kypo_crp_smart_assistant_service_internal_url }}

provisioning/roles/kypo-crp-head/templates/configuration/elasticsearch-service/kypo-elasticsearch-service.properties

@@ -2,7 +2,7 @@
 server.port=8085
 ## server context path (the base url for the service), e.g., /kypo-elasticsearch-service/api/v1
 server.servlet.context-path=/kypo-elasticsearch-service/api/v1
-## microservice name which is used for identification of this service, e.g., kypo2-elastic
+## microservice name which is used for identification of this service, e.g., kypo-elastic
 microservice.name=kypo-elasticsearch-service
 
 ## Allows you to specify allowed origins for CORS mapping. You could set it as, e.g., http://domain1.com, http://domain2.com, etc. The default value is: *
@@ -46,5 +46,5 @@ elasticsearch.host=kypo-elasticsearch
 ## Port on which Elasticsearch is running, e.g. 9200 is default
 elasticsearch.port=9200
 
-# calling user-and-group project, e.g., https://localhost:8084/kypo2-rest-user-and-group/api/v1
+# calling user-and-group project, e.g., https://localhost:8084/kypo-rest-user-and-group/api/v1
 user-and-group-server.uri={{ kypo_crp_uag_service_internal_url }}

provisioning/roles/kypo-crp-head/templates/configuration/smart-assistant-service/kypo-smart-assistant.properties

@@ -8,11 +8,11 @@ microservice.name=kypo-adaptive-smart-assistant
 ## Allows you to specify allowed origins for CORS mapping. You could set it as, e.g., http://domain1.com, http://domain2.com, etc. The default value is: *
 cors.allowed.origins={{ kypo_crp_url }}
 
-# calling user-and-group project, e.g., https://localhost:8084/kypo2-rest-user-and-group/api/v1
+# calling user-and-group project, e.g., https://localhost:8084/kypo-rest-user-and-group/api/v1
 user-and-group-server.uri={{ kypo_crp_uag_service_internal_url }}
-# calling kypo2-openstack, e.g., http://localhost:8080/kypo-openstack/api/v1
+# calling kypo-openstack, e.g., http://localhost:8080/kypo-openstack/api/v1
 openstack-server.uri={{ kypo_crp_sandbox_service_internal_url }}
-# calling kypo-elasticsearch-service, e.g., http://elastic-service:8085/kypo2-elastic/api/v1
+# calling kypo-elasticsearch-service, e.g., http://elastic-service:8085/kypo-elastic/api/v1
 elasticsearch-service.uri={{ kypo_crp_elasticsearch_service_internal_url }}
 
 # OpenID Connect OIDC configuration settings for a resource servers configuration

provisioning/roles/kypo-crp-head/templates/configuration/training-service/kypo-training.properties

 ## server port for a given service, e.g., 8083
 server.port=8083
-## server context path (the base url for the service), e.g., /kypo2-rest-training/api/v1
-server.servlet.context-path=/kypo2-rest-training/api/v1
-## microservice name which is used in user management service for identification of this service, e.g. kypo2-training
-microservice.name=kypo2-training
+## server context path (the base url for the service), e.g., /kypo-rest-training/api/v1
+server.servlet.context-path=/kypo-rest-training/api/v1
+## microservice name which is used in user management service for identification of this service, e.g. kypo-training
+microservice.name=kypo-training
 
 ## Allows you to specify allowed origins for CORS mapping. You could set it as, e.g., http://domain1.com, http://domain2.com, etc. The default value is: *
 cors.allowed.origins={{ kypo_crp_url }}
 
-# calling user-and-group project, e.g., https://localhost:8084/kypo2-rest-user-and-group/api/v1
+# calling user-and-group project, e.g., https://localhost:8084/kypo-rest-user-and-group/api/v1
 user-and-group-server.uri={{ kypo_crp_uag_service_internal_url }}
-# calling kypo2-openstack, e.g., http://localhost:8080/kypo-openstack/api/v1
+# calling kypo-openstack, e.g., http://localhost:8080/kypo-openstack/api/v1
 openstack-server.uri={{ kypo_crp_sandbox_service_internal_url }}
-# calling kypo-elasticsearch-service, e.g., http://elastic-service:8085/kypo2-elastic/api/v1
+# calling kypo-elasticsearch-service, e.g., http://elastic-service:8085/kypo-elastic/api/v1
 elasticsearch-service.uri={{ kypo_crp_elasticsearch_service_internal_url }}
 
 # OpenID Connect OIDC configuration settings for a resource servers configuration

provisioning/roles/kypo-crp-head/templates/configuration/user-and-group-service/kypo-user-and-group.properties

 ## server port for a given service, e.g., 8084
 server.port=8084
-## server context path (the base url for the service), e.g., /kypo2-rest-user-and-group/api/v1
-server.servlet.context-path=/kypo2-rest-user-and-group/api/v1
-## microservice name which is used for identification of this service, e.g., kypo2-user-and-group
-service.name=kypo2-user-and-group
+## server context path (the base url for the service), e.g., /kypo-rest-user-and-group/api/v1
+server.servlet.context-path=/kypo-rest-user-and-group/api/v1
+## microservice name which is used for identification of this service, e.g., kypo-user-and-group
+service.name=kypo-user-and-group
 
 ## Allows you to specify allowed origins for CORS mapping. You could set it as, e.g., http://domain1.com, http://domain2.com, etc. The default value is: *
 cors.allowed.origins={{ kypo_crp_url }}