From 0f613d437894e77832bb81e009de4169109b0a0c Mon Sep 17 00:00:00 2001 From: Jamil Date: Tue, 16 Jan 2024 14:40:05 -0800 Subject: [PATCH] fix(gateway): Fix gateway systemd command for non-bash shells (#3264) Fixes a couple issues detected when running the command under the plain POSIX shell `/bin/sh`. --- elixir/apps/web/lib/web/live/sites/new_token.ex | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/elixir/apps/web/lib/web/live/sites/new_token.ex b/elixir/apps/web/lib/web/live/sites/new_token.ex index 1a838520a..1162b2b9b 100644 --- a/elixir/apps/web/lib/web/live/sites/new_token.ex +++ b/elixir/apps/web/lib/web/live/sites/new_token.ex @@ -188,11 +188,11 @@ defmodule Web.Sites.NewToken do defp systemd_command(env) do """ - ( function install-firezone { + ( install_firezone() { # Create firezone user and group sudo groupadd -f firezone - id -u firezone &>/dev/null || sudo useradd -r -g firezone -s /sbin/nologin firezone + id -u firezone > /dev/null 2>&1 || sudo useradd -r -g firezone -s /sbin/nologin firezone # Create systemd unit file cat << EOF | sudo tee /etc/systemd/system/firezone-gateway.service @@ -294,7 +294,7 @@ defmodule Web.Sites.NewToken do sudo systemctl start firezone-gateway } - install-firezone ) + install_firezone ) """ end