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.

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

Update yggdrasil to v0.3.2 #71

Merged
merged 5 commits into from Jan 5, 2019
Merged

Update yggdrasil to v0.3.2 #71

merged 5 commits into from Jan 5, 2019

Conversation

benhylau
Copy link
Member

@benhylau benhylau commented Dec 14, 2018

Resolves #70

Also updates to latest v0.3.2 release of yggdrasil.

@@ -162,7 +168,7 @@ cd ~
until [[ `ifconfig tun1 >/dev/null 2>&1; echo $?` -eq 0 ]]; do
sleep 1
done
echo -n `ifconfig tun1 | grep 'inet6 fd' | awk '{print $2'}` > ~/client-keys/rtmp_yggdrasil
echo -n `ifconfig tun1 | grep -E 'inet6 2[0-9a-fA-F]{2}:' | awk '{print $2}'` > ~/client-keys/rtmp_yggdrasil
Copy link
Contributor

Choose a reason for hiding this comment

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

Although i have never run into this issue, There is an assumption we are making that Yggdrasil will actually be on Tun1.

I found you can define the interface name it will be using
sudo sed -i "s/IfName: auto/IfName: ygg0/" /etc/yggdrasil.conf
That way instead of tun1 Yggdrasil will be on ygg0

PS: Great regex, going to port it over to prototype 👍

Copy link
Contributor

Choose a reason for hiding this comment

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

Also general comment:

should move to "$(xxx)" instead of the `xx`
SC2006: Use $(..) instead of legacy ...

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks for the comment re: SC2006

Opened a new issue to address the more general problem of needing shellcheck.

@benhylau
Copy link
Member Author

Thanks for the review @darkdrgn2k I have changed iface name to ygg0 and spun up the cluster to test. I am much happier with this now. Please go ahead and merge if you think this is ready.

@benhylau benhylau changed the title Update yggdrasil to v0.3.0 Update yggdrasil to v0.3.2 Jan 4, 2019
@benhylau
Copy link
Member Author

benhylau commented Jan 4, 2019

I changed this to v0.3.2 because they exposed the APIs that I need, so I no longer have a dependency on the DEBUG APIs now (which itself has a silly bug in v0.3.0) so I am able to remove my hack too. If this looks okay please merge. @darkdrgn2k

@darkdrgn2k
Copy link
Contributor

looks good..

@benhylau benhylau merged commit dccc050 into master Jan 5, 2019
@benhylau benhylau deleted the yggdrasil-v0.3.0 branch January 5, 2019 18:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants