Skip to content

Commit b56f61b

Browse files
authored
[misc] fix relay exposed address test (#3931)
1 parent 64f1119 commit b56f61b

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.github/workflows/test-infrastructure-files.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,11 @@ jobs:
172172
grep "NETBIRD_STORE_ENGINE_MYSQL_DSN=$NETBIRD_STORE_ENGINE_MYSQL_DSN" docker-compose.yml
173173
grep NETBIRD_STORE_ENGINE_POSTGRES_DSN docker-compose.yml | egrep "$NETBIRD_STORE_ENGINE_POSTGRES_DSN"
174174
# check relay values
175-
grep "NB_EXPOSED_ADDRESS=$CI_NETBIRD_DOMAIN:33445" docker-compose.yml
175+
grep "NB_EXPOSED_ADDRESS=rels://$CI_NETBIRD_DOMAIN:33445" docker-compose.yml
176176
grep "NB_LISTEN_ADDRESS=:33445" docker-compose.yml
177177
grep '33445:33445' docker-compose.yml
178178
grep -A 10 'relay:' docker-compose.yml | egrep 'NB_AUTH_SECRET=.+$'
179-
grep -A 7 Relay management.json | grep "rel://$CI_NETBIRD_DOMAIN:33445"
179+
grep -A 7 Relay management.json | grep "rels://$CI_NETBIRD_DOMAIN:33445"
180180
grep -A 7 Relay management.json | egrep '"Secret": ".+"'
181181
grep DisablePromptLogin management.json | grep 'true'
182182
grep LoginFlag management.json | grep 0

infrastructure_files/configure.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ fi
170170
if [[ "$NETBIRD_DISABLE_LETSENCRYPT" == "true" ]]; then
171171
export NETBIRD_DASHBOARD_ENDPOINT="https://$NETBIRD_DOMAIN:443"
172172
export NETBIRD_SIGNAL_ENDPOINT="https://$NETBIRD_DOMAIN:$NETBIRD_SIGNAL_PORT"
173-
export NETBIRD_RELAY_ENDPOINT="rels://$NETBIRD_DOMAIN:$NETBIRD_SIGNAL_PORT/relay"
173+
export NETBIRD_RELAY_ENDPOINT="rels://$NETBIRD_DOMAIN:$NETBIRD_RELAY_PORT/relay"
174174

175175
echo "Letsencrypt was disabled, the Https-endpoints cannot be used anymore"
176176
echo " and a reverse-proxy with Https needs to be placed in front of netbird!"

infrastructure_files/setup.env.example

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,12 @@ NETBIRD_RELAY_DOMAIN=""
105105
# should be updated to match TLS-port of reverse proxy when netbird is running behind reverse proxy
106106
NETBIRD_RELAY_PORT=""
107107

108-
# Management API connectin port. If none is supplied
108+
# Management API connecting port. If none is supplied
109109
# it will default to 33073
110110
# should be updated to match TLS-port of reverse proxy when netbird is running behind reverse proxy
111111
NETBIRD_MGMT_API_PORT=""
112112

113-
# Signal service connectin port. If none is supplied
113+
# Signal service connecting port. If none is supplied
114114
# it will default to 10000
115115
# should be updated to match TLS-port of reverse proxy when netbird is running behind reverse proxy
116116
NETBIRD_SIGNAL_PORT=""

0 commit comments

Comments
 (0)