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 DNS filtering advice in FAQ #1389

Merged
merged 2 commits into from Apr 7, 2019

Conversation

TC1977
Copy link
Contributor

@TC1977 TC1977 commented Apr 6, 2019

Updates how to temporarily disable adblocking on IPsec and Wireguard clients separately, and also updates the IPSsec command to avoid ipsec restart which isn't appreciated by systemd.

Description

Updates FAQ as above.

Motivation and Context

Keep docs updated.

How Has This Been Tested?

sudo systemctl restart strongswan tested on Ubuntu 18.04.1 server on Amazon Lightsail. It works, and systemctl status strongswan doesn't give an incorrect status.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)

Checklist:

  • I have updated the documentation accordingly.

@TC1977
Copy link
Contributor Author

TC1977 commented Apr 6, 2019

No idea why the cloud-init build fails...

@davidemyers
Copy link
Contributor

Just a guess, but it looks like the test script is trying to download the new install.sh script from your forked branch rather than from master, but your branch is a little behind and the script isn't there.

@TC1977
Copy link
Contributor Author

TC1977 commented Apr 6, 2019

Just a guess, but it looks like the test script is trying to download the new install.sh script from your forked branch rather than from master, but your branch is a little behind and the script isn't there.

Ok, what do I do to catch it up? I just caught the master branch of my fork up to the upstream master. Should I merge the upstream master into this branch as well?

Last time I tried doing this it looked like I was trying to merge 880 commits all over again...

@davidemyers
Copy link
Contributor

I'm not confident enough in my git skills to say for sure. This could be totally wrong:

git fetch upstream
git checkout faq-adblock-bypass
git rebase upstream/master
git push -f

Updates how to temporarily disable adblocking on IPsec and Wireguard clients separately, and also updates the IPSsec command to avoid `ipsec restart` which [isn't appreciated by systemd](https://bugs.launchpad.net/ubuntu/+source/strongswan/+bug/1287339).
Fix typo
@TC1977
Copy link
Contributor Author

TC1977 commented Apr 7, 2019

I'm not confident enough in my git skills to say for sure. This could be totally wrong:

git fetch upstream
git checkout faq-adblock-bypass
git rebase upstream/master
git push -f

It got me close enough that I could google the rest of it (I needed to also git reset --hard to get rid of local changes). Looks like the checks passed now. Thanks!

@TC1977 TC1977 closed this Apr 7, 2019
@TC1977 TC1977 reopened this Apr 7, 2019
@jackivanov jackivanov merged commit 8af0efa into trailofbits:master Apr 7, 2019
@TC1977 TC1977 deleted the faq-adblock-bypass branch April 9, 2019 14:05
andreimc added a commit to tunnelhero/algo that referenced this pull request Apr 29, 2019
* upstream/master: (22 commits)
  Automatically create cloud firewall rules for installs onto Vultr (trailofbits#1400)
  Refactoring, Linting and additional tests (trailofbits#1397)
  Update Linux WireGuard client instructions (trailofbits#1407)
  Update cloud-vultr.md (trailofbits#1406)
  Update openssl.yml (trailofbits#1403)
  Update deploy-from-script-or-cloud-init-to-localhost.md
  Update README.md (trailofbits#1380)
  Update Adblock lists (trailofbits#1394)
  fix: get public IP from default interface (trailofbits#1396)
  Move `Delete the CA key` task to the appropriate role (trailofbits#1393)
  Update deploy-from-script-or-cloud-init-to-localhost.md
  Consolidate firewall documentation (trailofbits#1386)
  Fix 963 again (trailofbits#1379)
  Refactoring to support roles inclusion (trailofbits#1365)
  Update DNS filtering advice in FAQ (trailofbits#1389)
  Use VULTR_API_CONFIG variable if set (trailofbits#1374)
  IPv6 range to AllowedIPs only when ipv6_support (trailofbits#1388)
  Update ubuntu.yml (trailofbits#1383)
  Script to support cloud-init and local easy deploy (trailofbits#1366)
  Update 10-algo-lo100.network.j2 (trailofbits#1369)
  ...
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

3 participants