Skip to content

Commit 50f5ef8

Browse files
punam20punam20
committed
Read configurations from env file
Signed-off-by: punam biswal <punam.biswal@intel.com>
1 parent 010d596 commit 50f5ef8

14 files changed

Lines changed: 61 additions & 270 deletions

File tree

‎device-discovery-agent/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.0.5-dev
1+
0.0.5

‎device-discovery-agent/debian/config‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎device-discovery-agent/debian/device-discovery-agent.service‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Wants=network-online.target
66

77
[Service]
88
Type=oneshot
9+
EnvironmentFile=/etc/edge-node/node/agent_variables
910
ExecStart=/opt/edge-node/bin/device-discovery-agent -config /etc/edge-node/node/confs/device-discovery-agent.env
1011
StandardOutput=journal
1112
StandardError=journal

‎device-discovery-agent/debian/postinst‎

Lines changed: 20 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,48 @@
11
#!/bin/bash -e
22

3-
. /usr/share/debconf/confmodule
4-
53
# Update onboarding service URL (OBM_SVC)
6-
db_get device-discovery-agent/onboarding.serviceURL
7-
if [ ! -z "$RET" ]; then
8-
sed -i "s|^OBM_SVC=.*|OBM_SVC=$RET|" /etc/edge-node/node/confs/device-discovery-agent.env
4+
if [ ! -z "$ONBOARDING_SVC_URL" ]; then
5+
sed -i "s|^OBM_SVC=.*|OBM_SVC=$ONBOARDING_SVC_URL|" /etc/edge-node/node/confs/device-discovery-agent.env
96
fi
107

118
# Update onboarding service port (OBM_PORT)
12-
db_get device-discovery-agent/onboarding.servicePort
13-
if [ ! -z "$RET" ]; then
14-
sed -i "s|^OBM_PORT=.*|OBM_PORT=$RET|" /etc/edge-node/node/confs/device-discovery-agent.env
9+
if [ ! -z "$ONBOARDING_SVC_PORT" ]; then
10+
sed -i "s|^OBM_PORT=.*|OBM_PORT=$ONBOARDING_SVC_PORT|" /etc/edge-node/node/confs/device-discovery-agent.env
1511
fi
1612

17-
# Update discovery service URL (OBS_SVC)
18-
db_get device-discovery-agent/discovery.serviceURL
19-
if [ ! -z "$RET" ]; then
20-
sed -i "s|^OBS_SVC=.*|OBS_SVC=$RET|" /etc/edge-node/node/confs/device-discovery-agent.env
13+
# Update onboarding stream service URL (OBS_SVC)
14+
if [ ! -z "$ONBOARDING_STREAM_SVC_URL" ]; then
15+
sed -i "s|^OBS_SVC=.*|OBS_SVC=$ONBOARDING_STREAM_SVC_URL|" /etc/edge-node/node/confs/device-discovery-agent.env
2116
fi
2217

23-
# Update Keycloak URL (KEYCLOAK_URL)
24-
db_get device-discovery-agent/auth.keycloakURL
25-
if [ ! -z "$RET" ]; then
26-
sed -i "s|^KEYCLOAK_URL=.*|KEYCLOAK_URL=$RET|" /etc/edge-node/node/confs/device-discovery-agent.env
18+
# Update keycloak URL (KEYCLOAK_URL)
19+
if [ ! -z "$KEYCLOAK_URL" ]; then
20+
sed -i "s|^KEYCLOAK_URL=.*|KEYCLOAK_URL=$KEYCLOAK_URL|" /etc/edge-node/node/confs/device-discovery-agent.env
2721
fi
2822

2923
# Update CA certificate path (CA_CERT)
30-
db_get device-discovery-agent/onboarding.caCertPath
31-
if [ ! -z "$RET" ]; then
32-
sed -i "s|^CA_CERT=.*|CA_CERT=$RET|" /etc/edge-node/node/confs/device-discovery-agent.env
24+
if [ ! -z "$CA_PEM" ]; then
25+
sed -i "s|^CA_CERT=.*|CA_CERT=$CA_PEM|" /etc/edge-node/node/confs/device-discovery-agent.env
3326
fi
3427

3528
# Update auto-detect setting (AUTO_DETECT)
36-
db_get device-discovery-agent/sysinfo.autoDetect
37-
if [ ! -z "$RET" ]; then
38-
sed -i "s|^AUTO_DETECT=.*|AUTO_DETECT=$RET|" /etc/edge-node/node/confs/device-discovery-agent.env
29+
if [ ! -z "$AUTO_DETECT" ]; then
30+
sed -i "s|^AUTO_DETECT=.*|AUTO_DETECT=$AUTO_DETECT|" /etc/edge-node/node/confs/device-discovery-agent.env
3931
fi
4032

4133
# Update debug mode (DEBUG)
42-
db_get device-discovery-agent/debug
43-
if [ ! -z "$RET" ]; then
44-
sed -i "s|^DEBUG=.*|DEBUG=$RET|" /etc/edge-node/node/confs/device-discovery-agent.env
34+
if [ ! -z "$DEBUG" ]; then
35+
sed -i "s|^DEBUG=.*|DEBUG=$DEBUG|" /etc/edge-node/node/confs/device-discovery-agent.env
4536
fi
4637

4738
# Update disable interactive mode (DISABLE_INTERACTIVE)
48-
db_get device-discovery-agent/disableInteractive
49-
if [ ! -z "$RET" ]; then
50-
sed -i "s|^DISABLE_INTERACTIVE=.*|DISABLE_INTERACTIVE=$RET|" /etc/edge-node/node/confs/device-discovery-agent.env
39+
if [ ! -z "$DISABLE_INTERACTIVE" ]; then
40+
sed -i "s|^DISABLE_INTERACTIVE=.*|DISABLE_INTERACTIVE=$DISABLE_INTERACTIVE|" /etc/edge-node/node/confs/device-discovery-agent.env
5141
fi
5242

5343
# Update use kernel args (USE_KERNEL_ARGS)
54-
db_get device-discovery-agent/useKernelArgs
55-
if [ ! -z "$RET" ]; then
56-
sed -i "s|^USE_KERNEL_ARGS=.*|USE_KERNEL_ARGS=$RET|" /etc/edge-node/node/confs/device-discovery-agent.env
44+
if [ ! -z "$KERNEL_ARGS" ]; then
45+
sed -i "s|^USE_KERNEL_ARGS=.*|USE_KERNEL_ARGS=$KERNEL_ARGS|" /etc/edge-node/node/confs/device-discovery-agent.env
5746
fi
5847

5948
# Read hardware serial number and update config

‎device-discovery-agent/debian/templates‎

Lines changed: 0 additions & 64 deletions
This file was deleted.

‎node-agent/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.10.4-dev
1+
1.10.4

‎node-agent/debian/config‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎node-agent/debian/node-agent.node-agent.service‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Documentation=https://github.com/open-edge-platform/edge-node-agents/blob/main/n
44

55
[Service]
66
EnvironmentFile=/etc/environment
7+
EnvironmentFile=/etc/edge-node/node/agent_variables
78
ExecStart=/opt/edge-node/bin/node-agent -config /etc/edge-node/node/confs/node-agent.yaml
89
StandardOutput=journal
910
StandardError=journal

‎node-agent/debian/postinst‎

Lines changed: 28 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,21 @@
11
#!/bin/bash -e
22

3-
. /usr/share/debconf/confmodule
3+
# Source agent variables from file created by Installer
44

5-
db_get node-agent/onboarding.enabled
6-
if [ ! -z "$RET" ]; then
7-
sed -i -e '/^onboarding:$/{n' -e 's/enabled:.*/enabled: '"$RET"'/' -e '}' /etc/edge-node/node/confs/node-agent.yaml
5+
if [ ! -z "$NODE_ONBOARDING_ENABLED" ]; then
6+
sed -i -e '/^onboarding:$/{n' -e 's/enabled:.*/enabled: '"$NODE_ONBOARDING_ENABLED"'/' -e '}' /etc/edge-node/node/confs/node-agent.yaml
87
fi
98

10-
db_get node-agent/onboarding.serviceURL
11-
if [ ! -z "$RET" ]; then
12-
sed -i -e '/^onboarding:$/{n' -e '/.*enabled:/{n' -e 's#serviceURL:.*#serviceURL: '"$RET"'#' -e '}}' /etc/edge-node/node/confs/node-agent.yaml
9+
if [ ! -z "$NODE_ONBOARDING_URL" ]; then
10+
sed -i -e '/^onboarding:$/{n' -e '/.*enabled:/{n' -e 's#serviceURL:.*#serviceURL: '"$NODE_ONBOARDING_URL"'#' -e '}}' /etc/edge-node/node/confs/node-agent.yaml
1311
fi
1412

15-
db_get node-agent/onboarding.heartbeatInterval
16-
if [ ! -z "$RET" ]; then
17-
sed -i -e '/^onboarding:$/{n' -e '/.*enabled:/{n' -e '/.*serviceURL:/{n' -e 's/heartbeatInterval:.*/heartbeatInterval: '"$RET"'/' -e '}}}' /etc/edge-node/node/confs/node-agent.yaml
13+
if [ ! -z "$NODE_ONBOARDING_HEARTBEAT" ]; then
14+
sed -i -e '/^onboarding:$/{n' -e '/.*enabled:/{n' -e '/.*serviceURL:/{n' -e 's/heartbeatInterval:.*/heartbeatInterval: '"$NODE_ONBOARDING_HEARTBEAT"'/' -e '}}}' /etc/edge-node/node/confs/node-agent.yaml
1815
fi
1916

20-
db_get node-agent/status.serviceClients
21-
if [ ! -z "$RET" ]; then
22-
IFS=',' read -r -a serviceClientArray <<< "$RET"
17+
if [ ! -z "$NODE_SERVICE_CLIENTS" ]; then
18+
IFS=',' read -r -a serviceClientArray <<< "$NODE_SERVICE_CLIENTS"
2319
arrayLength=${#serviceClientArray[@]}
2420
agentList=""
2521
index=0
@@ -34,9 +30,8 @@ if [ ! -z "$RET" ]; then
3430
sed -i -e '/^status:$/{n' -e '/.*endpoint:/{n' -e 's#serviceClients:.*#serviceClients: [ '"${agentList}"' ]#' -e '}}' /etc/edge-node/node/confs/node-agent.yaml
3531
fi
3632

37-
db_get node-agent/status.outboundClients
38-
if [ ! -z "$RET" ]; then
39-
IFS=',' read -r -a outboundClientArray <<< "$RET"
33+
if [ ! -z "$NODE_OUTBOUND_CLIENTS" ]; then
34+
IFS=',' read -r -a outboundClientArray <<< "$NODE_OUTBOUND_CLIENTS"
4035
arrayLength=${#outboundClientArray[@]}
4136
agentList=""
4237
index=0
@@ -51,24 +46,20 @@ if [ ! -z "$RET" ]; then
5146
sed -i -e '/^status:$/{n' -e '/.*endpoint:/{n' -e '/.*serviceClients:/{n' -e 's#outboundClients:.*#outboundClients: [ '"${agentList}"' ]#' -e '}}}' /etc/edge-node/node/confs/node-agent.yaml
5247
fi
5348

54-
db_get node-agent/metrics.enabled
55-
if [ ! -z "$RET" ]; then
56-
sed -i -e '/^metrics:$/{n' -e 's/enabled:.*/enabled: '"$RET"'/' -e '}' /etc/edge-node/node/confs/node-agent.yaml
49+
if [ ! -z "$NODE_METRICS_ENABLED" ]; then
50+
sed -i -e '/^metrics:$/{n' -e 's/enabled:.*/enabled: '"$NODE_METRICS_ENABLED"'/' -e '}' /etc/edge-node/node/confs/node-agent.yaml
5751
fi
5852

59-
db_get node-agent/auth.accessTokenURL
60-
if [ ! -z "$RET" ]; then
61-
sed -i -e '/^auth:$/{n' -e 's#accessTokenURL:.*#accessTokenURL: '"$RET"'#' -e '}' /etc/edge-node/node/confs/node-agent.yaml
53+
if [ ! -z "$NODE_ACCESS_URL" ]; then
54+
sed -i -e '/^auth:$/{n' -e 's#accessTokenURL:.*#accessTokenURL: '"$NODE_ACCESS_URL"'#' -e '}' /etc/edge-node/node/confs/node-agent.yaml
6255
fi
6356

64-
db_get node-agent/auth.rsTokenURL
65-
if [ ! -z "$RET" ]; then
66-
sed -i -e '/^auth:$/{n' -e '/.*accessTokenURL:/{n' -e 's#rsTokenURL:.*#rsTokenURL: '"$RET"'#' -e '}}' /etc/edge-node/node/confs/node-agent.yaml
57+
if [ ! -z "$NODE_RS_URL" ]; then
58+
sed -i -e '/^auth:$/{n' -e '/.*accessTokenURL:/{n' -e 's#rsTokenURL:.*#rsTokenURL: '"$NODE_RS_URL"'#' -e '}}' /etc/edge-node/node/confs/node-agent.yaml
6759
fi
6860

69-
db_get node-agent/auth.tokenClients
70-
if [ ! -z "$RET" ]; then
71-
IFS=',' read -r -a tokenClientArray <<< "$RET"
61+
if [ ! -z "$NODE_TOKEN_CLIENTS" ]; then
62+
IFS=',' read -r -a tokenClientArray <<< "$NODE_TOKEN_CLIENTS"
7263
arrayLength=${#tokenClientArray[@]}
7364
agentList=""
7465
index=0
@@ -83,29 +74,25 @@ if [ ! -z "$RET" ]; then
8374
sed -i -e '/^auth:$/{n' -e '/.*accessTokenURL:/{n' -e '/.*rsTokenURL:/{n' -e '/.*accessTokenPath:/{n' -e '/.*clientCredsPath:/{n' -e 's#tokenClients:.*#tokenClients: [ '"${agentList}"' ]#' -e '}}}}}' /etc/edge-node/node/confs/node-agent.yaml
8475
fi
8576

86-
db_get node-agent/proxy.aptSourceURL
87-
if [ ! -z "$RET" ]; then
88-
sed -i -e 's#reverse_proxy.*#reverse_proxy https://'"$RET"' {#' /etc/caddy/pua.caddy
77+
if [ ! -z "$CADDY_APT_PROXY_URL" ]; then
78+
sed -i -e 's#reverse_proxy.*#reverse_proxy https://'"$CADDY_APT_PROXY_URL"' {#' /etc/caddy/pua.caddy
8979
fi
9080

91-
db_get node-agent/proxy.aptSourceProxyPort
92-
if [ ! -z "$RET" ]; then
93-
sed -i -e 's#localhost.*#localhost:'"$RET"' {#' /etc/caddy/pua.caddy
94-
sed -i -E '/name: client-proxy/,/url:/ s|(http://[^:]+:)[0-9]+|\1'"$RET"'|' /etc/edge-node/node/confs/node-agent.yaml
81+
if [ ! -z "$CADDY_APT_PROXY_PORT" ]; then
82+
sed -i -e 's#localhost.*#localhost:'"$CADDY_APT_PROXY_PORT"' {#' /etc/caddy/pua.caddy
83+
sed -i -E '/name: client-proxy/,/url:/ s|(http://[^:]+:)[0-9]+|\1'"$CADDY_APT_PROXY_PORT"'|' /etc/edge-node/node/confs/node-agent.yaml
9584
fi
9685

97-
db_get node-agent/proxy.aptSourceFilesRSRoot
98-
if [ ! -z "$RET" ]; then
99-
sed -i -E '/name: client-proxy/,/url:/ s|(http://[^/]+/)[^/]+|\1'"$RET"'|' /etc/edge-node/node/confs/node-agent.yaml
86+
if [ ! -z "$FILE_RS_ROOT" ]; then
87+
sed -i -E '/name: client-proxy/,/url:/ s|(http://[^/]+/)[^/]+|\1'"$FILE_RS_ROOT"'|' /etc/edge-node/node/confs/node-agent.yaml
10088
fi
10189

10290
if ! grep -q "EnvironmentFile" "/lib/systemd/system/caddy.service"; then
10391
sed -i '/^\[Service\]$/a EnvironmentFile=\/etc\/environment' /lib/systemd/system/caddy.service
10492
fi
10593

106-
db_get node-agent/auth.RSType
107-
if [ ! -z "$RET" ]; then
108-
if [ "$RET" == "no-auth" ]; then
94+
if [ ! -z "$RS_TYPE" ]; then
95+
if [ "$RS_TYPE" == "no-auth" ]; then
10996
sed -i -e '/header_up Authorization.*/d' /etc/caddy/pua.caddy
11097
fi
11198
fi

‎node-agent/debian/templates‎

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)