Add option to turn off DNSCrypt and use regular DNS

simonclausen / dnscrypt-autoinstall

Automatic installation and configuration of DNSCrypt (on Debian + Redhat like systems). This script will install DNSCrypt and configure it to start on boot and use an optional dnscrypt service.

Other

224 stars 73 forks source link

Add option to turn off DNSCrypt and use regular DNS #52

Closed lucaspetter closed 9 years ago

lucaspetter commented 9 years ago

Summary of changes:

Feature to turn off DNSCrypt and use regular, unencrypted DNS. You no longer need to completely uninstall/reinstall to switch back and forth between DNSCrypt and regular DNS, you can now just turn it off/on quickly. This fixes #35 (except for the part about making a PPA).
Updated management of resolv.conf and resolv.conf-dnscryptbak. This is to facilitate the new off feature so the backup doesn't get lost when the user re-enables DNSCrypt after turning it off.
Changes to the text user interface. Mainly for using the off feature, but also for clarity.

Tested with dnscrypt-autoinstall.sh and I can confirm everything works. I haven't tested dnscrypt-autoinstall-redhat.sh, but don't foresee any issues.

simonclausen commented 9 years ago

I'll have to come to back to this one later

lucaspetter commented 9 years ago

So I thought I could resolve a merge conflict in README.md myself by updating it to the latest code from simonclausen/dnscrypt-autoinstall/master. But now the diff view for this PR shows tons of changes for README.md, even though it's the same as in master.

Should I leave the merge conflicts for you to resolve? I want to help, but don't want to make anything more confusing/complicated. :cold_sweat:

simonclausen commented 9 years ago

I really appreciate your help - it is great to see contributions going far beyond what I originally imagines with this little project. So no worries about that :)

That said, I probably won't find peace of mind to sit down and do any actual work on this in the near future, so if you would like to go ahead with fixing it, you are very welcome.

lucaspetter commented 9 years ago

Okay, I'll try fixing the merge conflicts soon. I'm only using the web version of GitHub, which doesn't actually highlight conflicts, and the diff view for this pull request may get pretty big/complex as I commit all the latest updates from master. I haven't really dealt with fixing conflicts before, so am hoping I don't mess up and have to start fresh with a new pull request!

lucaspetter commented 9 years ago

I've fixed the merge conflicts in #65.