Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

quickstart script support custom ports and ssl certificates #1410

Closed
wants to merge 5 commits into from
+120 −16
Closed

quickstart script support custom ports and ssl certificates #1410

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b2c3682
custom ports and ssl certs
jiangslee Dec 26, 2023
e668742
remove the unused lines
jiangslee Jan 6, 2024
145a48e
Default ports
jiangslee Jan 6, 2024
6b603e7
Merge branch 'netbirdio:main' into main-custom-ports-ssl-certs
jiangslee Jan 6, 2024
9010418
Update infrastructure_files/getting-started-with-zitadel.sh
jiangslee Jan 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 114 additions & 12 deletions infrastructure_files/getting-started-with-zitadel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ init_zitadel() {
PROJECT_ID=$(create_new_project "$INSTANCE_URL" "$PAT")

ZITADEL_DEV_MODE=false
BASE_REDIRECT_URL=$NETBIRD_HTTP_PROTOCOL://$NETBIRD_DOMAIN
BASE_REDIRECT_URL=$NETBIRD_HTTP_PROTOCOL://$NETBIRD_DOMAIN:$NETBIRD_PORT
if [[ $NETBIRD_HTTP_PROTOCOL == "http" ]]; then
ZITADEL_DEV_MODE=true
fi
Expand Down Expand Up @@ -402,29 +402,126 @@ read_nb_domain() {
echo "$READ_NETBIRD_DOMAIN"
}

check_nb_port() {
HTTPS_PORT=$1
if [ "$HTTPS_PORT-x" == "-x" ]; then
echo "The NETBIRD_PORT variable cannot be empty." > /dev/stderr
return 1
fi
return 0
}

read_nb_port() {
READ_NETBIRD_PORT=""
echo -n "Enter the https port you want to use for NetBird (e.g. 443): " > /dev/stderr
read -r READ_NETBIRD_PORT < /dev/tty
if ! check_nb_port "$READ_NETBIRD_PORT"; then
read_nb_port
fi
echo "$READ_NETBIRD_PORT"
}


check_nb_http_port() {
HTTP_PORT=$1
if [ "$HTTP_PORT-x" == "-x" ]; then
echo "The NETBIRD_HTTP_PORT variable cannot be empty." > /dev/stderr
return 1
fi
return 0
}

read_nb_http_port() {
READ_NETBIRD_HTTP_PORT=""
echo -n "Enter the http port you want to use for NetBird (e.g. 80): " > /dev/stderr
read -r READ_NETBIRD_HTTP_PORT < /dev/tty
if ! check_nb_http_port "$READ_NETBIRD_HTTP_PORT"; then
read_nb_http_port
fi
echo "$READ_NETBIRD_HTTP_PORT"
}

check_nb_8080_port() {
PORT_8080=$1
if [ "$PORT_8080-x" == "-x" ]; then
echo "The NETBIRD_8080_PORT variable cannot be empty." > /dev/stderr
return 1
fi
return 0
}

read_nb_8080_port() {
READ_NETBIRD_8080_PORT=""
echo -n "Enter the NETBIRD_8080_PORT you want to use for NetBird (e.g. 8080): " > /dev/stderr
read -r READ_NETBIRD_8080_PORT < /dev/tty
if ! check_nb_8080_port "$READ_NETBIRD_8080_PORT"; then
read_nb_8080_port
fi
echo "$READ_NETBIRD_8080_PORT"
}


check_nb_3478_port() {
PORT_3478=$1
if [ "$PORT_3478-x" == "-x" ]; then
echo "The NETBIRD_3478_PORT variable cannot be empty." > /dev/stderr
return 1
fi
return 0
}

read_nb_3478_port() {
READ_NETBIRD_3478_PORT=""
echo -n "Enter the TURN_LISTENING_PORT you want to use for NetBird (e.g. 3478): " > /dev/stderr
read -r READ_NETBIRD_3478_PORT < /dev/tty
if ! check_nb_3478_port "$READ_NETBIRD_3478_PORT"; then
read_nb_3478_port
fi
echo "$READ_NETBIRD_3478_PORT"
}

initEnvironment() {
CADDY_SECURE_DOMAIN=""
ZITADEL_EXTERNALSECURE="false"
ZITADEL_TLS_MODE="disabled"
ZITADEL_MASTERKEY="$(openssl rand -base64 32 | head -c 32)"
NETBIRD_PORT=80
#NETBIRD_PORT=80
jiangslee marked this conversation as resolved.
Show resolved Hide resolved
NETBIRD_HTTP_PROTOCOL="http"
TURN_USER="self"
TURN_PASSWORD=$(openssl rand -base64 32 | sed 's/=//g')
TURN_MIN_PORT=49152
TURN_MAX_PORT=65535
#TURN_LISTENING_PORT=3478
jiangslee marked this conversation as resolved.
Show resolved Hide resolved

if ! check_nb_domain "$NETBIRD_DOMAIN"; then
NETBIRD_DOMAIN=$(read_nb_domain)
fi

if ! check_nb_http_port "$NETBIRD_HTTP_PORT"; then
NETBIRD_HTTP_PORT=$(read_nb_http_port)
fi

if ! check_nb_http_port "$NETBIRD_8080_PORT"; then
NETBIRD_8080_PORT=$(read_nb_8080_port)
fi

if ! check_nb_3478_port "$TURN_LISTENING_PORT"; then
TURN_LISTENING_PORT=$(read_nb_3478_port)
fi

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's set default ports to be used when the user is not using the interactive mode.

if [ "$NETBIRD_DOMAIN" == "use-ip" ]; then
NETBIRD_DOMAIN=$(get_main_ip_address)
NETBIRD_PORT=$NETBIRD_HTTP_PORT
else
ZITADEL_EXTERNALSECURE="true"
ZITADEL_TLS_MODE="external"
NETBIRD_PORT=443
CADDY_SECURE_DOMAIN=", $NETBIRD_DOMAIN:$NETBIRD_PORT"
#NETBIRD_PORT=443
jiangslee marked this conversation as resolved.
Show resolved Hide resolved

if ! check_nb_port "$NETBIRD_PORT"; then
jiangslee marked this conversation as resolved.
Show resolved Hide resolved
NETBIRD_PORT=$(read_nb_port)
fi

CADDY_SECURE_DOMAIN=", $NETBIRD_DOMAIN:443"
jiangslee marked this conversation as resolved.
Show resolved Hide resolved
NETBIRD_HTTP_PROTOCOL="https"
fi

Expand Down Expand Up @@ -527,6 +624,10 @@ renderCaddyfile() {
}
}

$NETBIRD_DOMAIN {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the effect of this setting? Does caddy will look for the certificates if none is provided? Does it fail? I think this block should be optional.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this should be optional. I will see how to change it to optional. Thanks.

tls /etc/caddy/ccerts/$NETBIRD_DOMAIN.pem /etc/caddy/ccerts/$NETBIRD_DOMAIN.key
}

:80${CADDY_SECURE_DOMAIN} {
import security_headers
# Signal
Expand Down Expand Up @@ -559,7 +660,7 @@ EOF

renderTurnServerConf() {
cat <<EOF
listening-port=3478
listening-port=$TURN_LISTENING_PORT
tls-listening-port=5349
min-port=$TURN_MIN_PORT
max-port=$TURN_MAX_PORT
Expand All @@ -582,14 +683,14 @@ renderManagementJson() {
"Stuns": [
{
"Proto": "udp",
"URI": "stun:$NETBIRD_DOMAIN:3478"
"URI": "stun:$NETBIRD_DOMAIN:$TURN_LISTENING_PORT"
}
],
"TURNConfig": {
"Turns": [
{
"Proto": "udp",
"URI": "turn:$NETBIRD_DOMAIN:3478",
"URI": "turn:$NETBIRD_DOMAIN:$TURN_LISTENING_PORT",
"Username": "$TURN_USER",
"Password": "$TURN_PASSWORD"
}
Expand All @@ -603,7 +704,7 @@ renderManagementJson() {
"HttpConfig": {
"AuthIssuer": "$NETBIRD_HTTP_PROTOCOL://$NETBIRD_DOMAIN",
"AuthAudience": "$NETBIRD_AUTH_CLIENT_ID",
"OIDCConfigEndpoint":"$NETBIRD_HTTP_PROTOCOL://$NETBIRD_DOMAIN/.well-known/openid-configuration"
"OIDCConfigEndpoint":"$NETBIRD_HTTP_PROTOCOL://$NETBIRD_DOMAIN:$NETBIRD_PORT/.well-known/openid-configuration"
},
"IdpManagerConfig": {
"ManagerType": "zitadel",
Expand Down Expand Up @@ -644,7 +745,7 @@ AUTH_SUPPORTED_SCOPES="openid profile email offline_access"
AUTH_REDIRECT_URI=/nb-auth
AUTH_SILENT_REDIRECT_URI=/nb-silent-auth
# SSL
NGINX_SSL_PORT=443
NGINX_SSL_PORT=$NETBIRD_PORT
# Letsencrypt
LETSENCRYPT_DOMAIN=none
EOF
Expand Down Expand Up @@ -686,12 +787,13 @@ services:
restart: unless-stopped
networks: [ netbird ]
ports:
- '443:443'
- '80:80'
- '8080:8080'
- '$NETBIRD_PORT:443'
- '$NETBIRD_HTTP_PORT:80'
- '$NETBIRD_8080_PORT:8080'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be removed, it is probably a leftover

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I will remove it.

volumes:
- netbird_caddy_data:/data
- ./Caddyfile:/etc/caddy/Caddyfile
- ./certs:/etc/caddy/ccerts
#UI dashboard
dashboard:
image: wiretrustee/dashboard:latest
Expand Down
Loading