Skip to content

Commit

Permalink
feat(CS): EC key support for global configuration
Browse files Browse the repository at this point in the history 
it works

Refs: XRDDEV-2695
  • Loading branch information
@ovidijusnortal
ovidijusnortal committed Nov 7, 2024
1 parent 8d9ef2f commit cadf02c
Show file tree
Hide file tree
Showing 83 changed files with 2,334 additions and 1,109 deletions.
3 changes: 2 additions & 1 deletion Docker/centralserver/files/etc/xroad/services/local.conf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
XROAD_CS_ADMIN_SERVICE_PARAMS=" -Xdebug -agentlib:jdwp=transport=dt_socket,address=*:9950,server=y,suspend=n $XROAD_CS_ADMIN_SERVICE_PARAMS"
XROAD_CS_MANAGEMENT_SERVICE_PARAMS=" -Xdebug -agentlib:jdwp=transport=dt_socket,address=*:9951,server=y,suspend=n $XROAD_CS_MANAGEMENT_SERVICE_PARAMS"
XROAD_CS_REGISTRATION_SERVICE_PARAMS=" -Xdebug -agentlib:jdwp=transport=dt_socket,address=*:9952,server=y,suspend=n $XROAD_CS_REGISTRATION_SERVICE_PARAMS"
XROAD_CONFCLIENT_PARAMS=" -Xdebug -agentlib:jdwp=transport=dt_socket,address=*:9953,server=y,suspend=n $XROAD_CONFCLIENT_PARAMS"
XROAD_CONFCLIENT_PARAMS=" -Xdebug -agentlib:jdwp=transport=dt_socket,address=*:9953,server=y,suspend=n $XROAD_CONFCLIENT_PARAMS"
XROAD_SIGNER_PARAMS="$XROAD_SIGNER_PARAMS -Xdebug -agentlib:jdwp=transport=dt_socket,address=*:9994,server=y,suspend=n $SIGNER_JMX_PARAMS $SIGNER_TELEMETRY_PARAMS"
1 change: 1 addition & 0 deletions Docker/xrd-dev-stack/compose.dev.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ services:
- "4191:9951" # Management debug
- "4192:9952" # Registration debug
- "4193:9953" # Conf Client debug
- "4194:9994" # Signer debug port
networks:
- xroad-network
ss0:
Expand Down
15 changes: 12 additions & 3 deletions Docker/xrd-dev-stack/tools/deploy.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ deploy_module() {
local -a containers=("$@")
local jar_path
local service_name
local target_path

case $module_name in
"proxy")
Expand All @@ -16,6 +17,11 @@ deploy_module() {
jar_path="$XROAD_HOME/src/addons/messagelog/messagelog-addon/build/libs/messagelog-addon.jar"
service_name="xroad-proxy"
;;
"hwtoken-addon")
jar_path="$XROAD_HOME/src/addons/hwtoken/build/libs/hwtoken-1.0.jar"
service_name="xroad-signer"
target_path="usr/share/xroad/jlib/addon/signer"
;;
"metaservice-addon")
jar_path="$XROAD_HOME/src/addons/metaservice/build/libs/metaservice-1.0.jar"
service_name="xroad-proxy"
Expand All @@ -26,7 +32,7 @@ deploy_module() {
;;
"signer")
jar_path="$XROAD_HOME/src/signer/application/build/libs/signer-1.0.jar"
service_name="all"
service_name="xroad-signer"
;;
"configuration-client")
jar_path="$XROAD_HOME/src/configuration-client/application/build/libs/configuration-client-1.0.jar"
Expand Down Expand Up @@ -55,17 +61,20 @@ deploy_module() {
esac

for container in "${containers[@]}"; do
docker cp "$jar_path" "$container:/usr/share/xroad/jlib/"
docker cp "$jar_path" "$container:${target_path:-/usr/share/xroad/jlib/}"
docker exec -it "$container" supervisorctl restart "$service_name"
done
}

set -o xtrace

case $1 in
"proxy" | "messagelog-addon" | "metaservice-addon" | "proxy-ui-api" | "signer" | "configuration-client" | "op-monitor-daemon")
"proxy" | "messagelog-addon" | "metaservice-addon" | "proxy-ui-api" | "configuration-client" | "op-monitor-daemon")
deploy_module "$1" "ss0" "ss1"
;;
"signer" | "hwtoken-addon")
deploy_module "$1" "ss0" "ss1" "cs"
;;
"cs-admin-service" | "cs-management-service" | "cs-registration-service")
deploy_module "$1" "cs"
;;
Expand Down
149 changes: 77 additions & 72 deletions doc/Manuals/ig-cs_x-road_6_central_server_installation_guide.md
View file

Large diffs are not rendered by default.

224 changes: 114 additions & 110 deletions doc/Manuals/ig-ss_x-road_v6_security_server_installation_guide.md
View file

Large diffs are not rendered by default.

84 changes: 44 additions & 40 deletions doc/Manuals/ug-cp_x-road_v6_configuration_proxy_manual.md
View file

Large diffs are not rendered by default.

39 changes: 19 additions & 20 deletions doc/Manuals/ug-sc_x-road_signer-console_user_guide.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,25 @@ Doc. ID: UG-SC

## Version history <!-- omit in toc -->

Date | Version | Description | Author
-------- |---------|---------------------------------------------------------------------------| --------------------
20.11.2014 | 0.1 | First draft |
20.11.2014 | 0.2 | Some improvements done |
01.12.2014 | 1.0 | Minor corrections done |
19.01.2015 | 1.1 | License information added |
02.04.2015 | 1.2 | "sdsb" changed to "xroad" |
30.06.2015 | 1.3 | Minor corrections done |
09.09.2015 | 2.0 | Editorial changes made |
14.09.2015 | 2.1 | Audit log added |
20.09.2015 | 2.2 | Editorial changes made |
06.09.2015 | 2.3 | Added certificate request format argument |
03.11.2015 | 2.4 | Added label parameter for key generation command |
10.12.2015 | 2.5 | Editorial changes made |
26.02.2021 | 2.6 | Convert documentation to markdown | Caro Hautamäki
01.03.2021 | 2.7 | Added [2.4.19 update-software-token-pin](#2419-update-software-token-pin) | Caro Hautamäki
25.08.2021 | 2.8 | Update X-Road references from version 6 to 7 | Caro Hautamäki
01.06.2023 | 2.9 | Update references | Petteri Kivimäki


| Date | Version | Description | Author |
|------------|---------|---------------------------------------------------------------------------|------------------|
| 20.11.2014 | 0.1 | First draft | |
| 20.11.2014 | 0.2 | Some improvements done | |
| 01.12.2014 | 1.0 | Minor corrections done | |
| 19.01.2015 | 1.1 | License information added | |
| 02.04.2015 | 1.2 | "sdsb" changed to "xroad" | |
| 30.06.2015 | 1.3 | Minor corrections done | |
| 09.09.2015 | 2.0 | Editorial changes made | |
| 14.09.2015 | 2.1 | Audit log added | |
| 20.09.2015 | 2.2 | Editorial changes made | |
| 06.09.2015 | 2.3 | Added certificate request format argument | |
| 03.11.2015 | 2.4 | Added label parameter for key generation command | |
| 10.12.2015 | 2.5 | Editorial changes made | |
| 26.02.2021 | 2.6 | Convert documentation to markdown | Caro Hautamäki |
| 01.03.2021 | 2.7 | Added [2.4.19 update-software-token-pin](#2419-update-software-token-pin) | Caro Hautamäki |
| 25.08.2021 | 2.8 | Update X-Road references from version 6 to 7 | Caro Hautamäki |
| 01.06.2023 | 2.9 | Update references | Petteri Kivimäki |

## Table of Contents <!-- omit in toc -->

<!-- toc -->
Expand Down
Loading

0 comments on commit cadf02c

Please sign in to comment.