simtabi · January 24, 2022 12:01 · Oct 23, 2020 · Oct 23, 2020 · Dec 3, 2018 · Aug 5, 2013
diff --git a/dnsmasq OS X.md b/dnsmasq OS X.md
@@ -1,5 +1,53 @@
-## Never touch your local /etc/hosts file in OS X again
+# Never touch your local /etc/hosts file in OS X again
 
-# NOTE this has been done properly by a guy here: https://www.stevenrombauts.be/2018/01/use-dnsmasq-instead-of-etc-hosts/
+> To setup your computer to work with *.test domains, e.g. project.test, awesome.test and so on, without having to add to your hosts file each time.
 
-## also never use .dev as a TLD for local dev work.
+## Requirements
+
+* [Homebrew](https://brew.sh/)
+* Mountain Lion -> High Sierra
+
+## Install
+```
+brew install dnsmasq
+```
+
+## Setup
+
+### Create config directory
+```
+mkdir -pv $(brew --prefix)/etc/
+```
+
+### Setup *.test
+
+```
+echo 'address=/.test/127.0.0.1' >> $(brew --prefix)/etc/dnsmasq.conf
+```
+### Change port for High Sierra
+```
+echo 'port=53' >> $(brew --prefix)/etc/dnsmasq.conf
+```
+
+## Autostart - now and after reboot
+```
+sudo brew services start dnsmasq
+```
+
+## Add to resolvers
+
+### Create resolver directory
+```
+sudo mkdir -v /etc/resolver
+```
+
+### Add your nameserver to resolvers
+```
+sudo bash -c 'echo "nameserver 127.0.0.1" > /etc/resolver/test'
+```
+
+## Finished
+
+That's it! You can run scutil --dns to show all of your current resolvers, and you should see that all requests for a domain ending in .test will go to the DNS server at 127.0.0.1
+
+## N.B. never use .dev as a TLD for local dev work. .test is fine though.
diff --git a/dnsmasq OS X.md b/dnsmasq OS X.md
@@ -2,63 +2,4 @@
 
 # NOTE this has been done properly by a guy here: https://www.stevenrombauts.be/2018/01/use-dnsmasq-instead-of-etc-hosts/
 
-## You should go and do that now, ignore all of this.
-
-> To setup your computer to work with *.dev domains, e.g. project.dev, awesome.dev and so on, without having to add to your hosts file each time.
-
-## Requirements
-
-* [Homebrew](http://mxcl.github.io/homebrew/)
-* Mountain Lion
-
-## Install
-```
-brew install dnsmasq
-```
-
-## Setup
-
-### Create config directory
-```
-mkdir -pv $(brew --prefix)/etc/
-```
-
-### Setup *.dev
-
-```
-echo 'address=/.dev/127.0.0.1' > $(brew --prefix)/etc/dnsmasq.conf
-```
-
-You should probably add `strict-order` to `dnsmasq.conf` to keep nameserver order of `resolv.conf` ([see here](https://gist.github.com/drye/5387341)).
-
-## Autostart
-
-### Work after reboot
-```
-sudo cp -v $(brew --prefix dnsmasq)/homebrew.mxcl.dnsmasq.plist /Library/LaunchDaemons
-```
-
-### Get it going right now
-```
-sudo launchctl load -w /Library/LaunchDaemons/homebrew.mxcl.dnsmasq.plist
-```
-
-## Add to resolvers
-
-### Create resolver directory
-```
-sudo mkdir -v /etc/resolver
-```
-
-### Add your nameserver to resolvers
-```
-sudo bash -c 'echo "nameserver 127.0.0.1" > /etc/resolver/dev'
-```
-
-## Add local DNS to search order in System Preferences
-
-System Preferences > Network > Wi-Fi (or whatever you use) > Advanced... > DNS > add 127.0.0.1 to top of the list.
-
-## Finished
-
-That's it! You can run scutil --dns to show all of your current resolvers, and you should see that all requests for a domain ending in .dev will go to the DNS server at 127.0.0.1
+## also never use .dev as a TLD for local dev work.
diff --git a/dnsmasq OS X.md b/dnsmasq OS X.md
@@ -1,4 +1,8 @@
-# Never touch your local /etc/hosts file in OS X again
+## Never touch your local /etc/hosts file in OS X again
+
+# NOTE this has been done properly by a guy here: https://www.stevenrombauts.be/2018/01/use-dnsmasq-instead-of-etc-hosts/
+
+## You should go and do that now, ignore all of this.
 
 > To setup your computer to work with *.dev domains, e.g. project.dev, awesome.dev and so on, without having to add to your hosts file each time.
 

diff --git a/dnsmasq OS X.md b/dnsmasq OS X.md
@@ -53,7 +53,7 @@ sudo bash -c 'echo "nameserver 127.0.0.1" > /etc/resolver/dev'
 
 ## Add local DNS to search order in System Preferences
 
-System Preferences > Network > Wi-Fi (or whatever you use) > Advanced... > DNS > add 127.0.0.1 to top of the list
+System Preferences > Network > Wi-Fi (or whatever you use) > Advanced... > DNS > add 127.0.0.1 to top of the list.
 
 ## Finished
 

diff --git a/dnsmasq OS X.md b/dnsmasq OS X.md
@@ -51,6 +51,10 @@ sudo mkdir -v /etc/resolver
 sudo bash -c 'echo "nameserver 127.0.0.1" > /etc/resolver/dev'
 ```
 
+## Add local DNS to search order in System Preferences
+
+System Preferences > Network > Wi-Fi (or whatever you use) > Advanced... > DNS > add 127.0.0.1 to top of the list
+
 ## Finished
 
 That's it! You can run scutil --dns to show all of your current resolvers, and you should see that all requests for a domain ending in .dev will go to the DNS server at 127.0.0.1
diff --git a/dnsmasq OS X.md b/dnsmasq OS X.md
@@ -25,7 +25,7 @@ mkdir -pv $(brew --prefix)/etc/
 echo 'address=/.dev/127.0.0.1' > $(brew --prefix)/etc/dnsmasq.conf
 ```
 
-You should probably add `strict-order` to `dnsmasq.conf` to keep nameserver order of `resolv.conf`
+You should probably add `strict-order` to `dnsmasq.conf` to keep nameserver order of `resolv.conf` ([see here](https://gist.github.com/drye/5387341)).
 
 ## Autostart
 

diff --git a/dnsmasq OS X.md b/dnsmasq OS X.md
@@ -25,6 +25,8 @@ mkdir -pv $(brew --prefix)/etc/
 echo 'address=/.dev/127.0.0.1' > $(brew --prefix)/etc/dnsmasq.conf
 ```
 
+You should probably add `strict-order` to `dnsmasq.conf` to keep nameserver order of `resolv.conf`
+
 ## Autostart
 
 ### Work after reboot

diff --git a/Instructions.md → dnsmasq OS X.md b/Instructions.md → dnsmasq OS X.md
diff --git a/Setup dnsmasq on OS X.md → Instructions.md b/Setup dnsmasq on OS X.md → Instructions.md
diff --git a/Setup.md → Setup dnsmasq on OS X.md b/Setup.md → Setup dnsmasq on OS X.md
diff --git a/Setup.md b/Setup.md
@@ -1,6 +1,6 @@
 # Never touch your local /etc/hosts file in OS X again
 
-> To setup your computer to work with *.dev domains, e.g. project.dev, awesome.dev and so on, without having to add to your hosts file each time
+> To setup your computer to work with *.dev domains, e.g. project.dev, awesome.dev and so on, without having to add to your hosts file each time.
 
 ## Requirements
 

diff --git a/Setup.md b/Setup.md
@@ -1 +1,54 @@
-_
+# Never touch your local /etc/hosts file in OS X again
+
+> To setup your computer to work with *.dev domains, e.g. project.dev, awesome.dev and so on, without having to add to your hosts file each time
+
+## Requirements
+
+* [Homebrew](http://mxcl.github.io/homebrew/)
+* Mountain Lion
+
+## Install
+```
+brew install dnsmasq
+```
+
+## Setup
+
+### Create config directory
+```
+mkdir -pv $(brew --prefix)/etc/
+```
+
+### Setup *.dev
+
+```
+echo 'address=/.dev/127.0.0.1' > $(brew --prefix)/etc/dnsmasq.conf
+```
+
+## Autostart
+
+### Work after reboot
+```
+sudo cp -v $(brew --prefix dnsmasq)/homebrew.mxcl.dnsmasq.plist /Library/LaunchDaemons
+```
+
+### Get it going right now
+```
+sudo launchctl load -w /Library/LaunchDaemons/homebrew.mxcl.dnsmasq.plist
+```
+
+## Add to resolvers
+
+### Create resolver directory
+```
+sudo mkdir -v /etc/resolver
+```
+
+### Add your nameserver to resolvers
+```
+sudo bash -c 'echo "nameserver 127.0.0.1" > /etc/resolver/dev'
+```
+
+## Finished
+
+That's it! You can run scutil --dns to show all of your current resolvers, and you should see that all requests for a domain ending in .dev will go to the DNS server at 127.0.0.1
diff --git a/Setup.md b/Setup.md
@@ -0,0 +1 @@
+_