Skip to content

Small fix to vpn output - carriage return was messing up the formatting #104

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

Merged
bmonkman merged 3 commits into from
Sep 22, 2020
Merged

Small fix to vpn output - carriage return was messing up the formatting #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2eda8a8
Small fix to vpn output - carriage return was messing up the formatting
bmonkman Sep 21, 2020
6540d39
Don't strip newlines from ip list
bmonkman Sep 22, 2020
d447261
hashing vpn server_conf as deployment version
davidcheung Sep 22, 2020
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
2 changes: 2 additions & 0 deletions templates/kubernetes/terraform/modules/kubernetes/vpn.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,8 @@ resource "kubernetes_deployment" "wireguard" {
metadata {
labels = {
app = "wireguard"
# this hash is to update the deployment whenever configmap is updated with new users
configmap_version = sha1(data.template_file.vpn_server_conf.rendered)
}
}

Expand Down
6 changes: 3 additions & 3 deletions templates/scripts/add-vpn-user.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ read name
# collect keys
server_public_key=$($EXEC "cat /etc/wireguard/privatekey | wg pubkey")
client_private_key=$($EXEC "wg genkey")
client_public_key=$($EXEC "echo -n $client_private_key | wg pubkey")
client_public_key=$($EXEC "echo -n $client_private_key | wg pubkey | tr -d \"\r\n\f\"")

# get next available IP
existing_ips=$($EXEC "cat /etc/wireguard/wg0.conf | grep AllowedIPs| cut -d\" \" -f3 | cut -d\"/\" -f1 | sort")
last_ip=$(echo "$existing_ips" | tr -cd "[:alnum:]." | tail -1)
last_ip=$(echo "$existing_ips" | tr -cd "[:alnum:].\n" | tail -1)
next_ip=$last_ip
while [[ "$existing_ips" =~ "$next_ip" ]]; do
next_ip=${next_ip%.*}.$((${next_ip##*.}+1))
Expand All @@ -45,7 +45,7 @@ echo
echo "Please modify kubernetes/terraform/environments/<env>/main.tf and append the following line to var.vpn_client_publickeys."
echo "Then apply the terraform, or ask an administrator to."
echo
printf ' ["%s", "%s", "%s"]' "$name" "$next_ip/32" "$client_public_key"
printf ' ["%s", "%s", "%s"],' "$name" "$next_ip/32" "$client_public_key"
echo
echo "After this is done you should be able to open the wireguard client and activate the tunnel."
echo "You can download the client at https://www.wireguard.com/install/"
Expand Down