aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Orr <andrew@andreworr.ca>2016-10-31 17:11:51 -0500
committerGitHub <noreply@github.com>2016-10-31 17:11:51 -0500
commitbff75f4ff6e7392a75577f62a0c1a27261f57a25 (patch)
treef3accb54e6cebc2adf11ce946b5b2edabc01863d
parent2c85b262d5036db08a1c1b8df50d84f8ed6410da (diff)
downloadmitmproxy-bff75f4ff6e7392a75577f62a0c1a27261f57a25.tar.gz
mitmproxy-bff75f4ff6e7392a75577f62a0c1a27261f57a25.tar.bz2
mitmproxy-bff75f4ff6e7392a75577f62a0c1a27261f57a25.zip
Update for Ubuntu 16.04
-rw-r--r--docs/tutorials/transparent-dhcp.rst20
1 files changed, 16 insertions, 4 deletions
diff --git a/docs/tutorials/transparent-dhcp.rst b/docs/tutorials/transparent-dhcp.rst
index ce285b63..d993707d 100644
--- a/docs/tutorials/transparent-dhcp.rst
+++ b/docs/tutorials/transparent-dhcp.rst
@@ -38,8 +38,14 @@ DHCP and TFTP) services to a small-scale network.
**Ubuntu >12.04** runs an internal dnsmasq instance (listening on loopback only) by default
`[1] <https://www.stgraber.org/2012/02/24/dns-in-ubuntu-12-04/>`_. For our use case, this needs
to be disabled by changing ``dns=dnsmasq`` to ``#dns=dnsmasq`` in
- **/etc/NetworkManager/NetworkManager.conf** and running
-
+ **/etc/NetworkManager/NetworkManager.conf** and
+
+ if on Ubuntu 16.04 or newer running:
+
+ >>> sudo systemctl restart NetworkManager
+
+ if on Ubuntu 12.04 or 14.04 running:
+
>>> sudo restart network-manager
afterwards.
@@ -61,6 +67,12 @@ DHCP and TFTP) services to a small-scale network.
Apply changes:
+ if on Ubuntu 16.04 or newer:
+
+ >>> sudo systemctl restart dnsmasq
+
+ if on Ubuntu 12.04 or 14.04:
+
>>> sudo service dnsmasq restart
Your **proxied machine** in the internal virtual network should now receive an IP address via DHCP:
@@ -74,8 +86,8 @@ To redirect traffic to mitmproxy, we need to add two iptables rules:
.. code-block:: none
- iptables -t nat -A PREROUTING -i eth1 -p tcp --dport 80 -j REDIRECT --to-port 8080
- iptables -t nat -A PREROUTING -i eth1 -p tcp --dport 443 -j REDIRECT --to-port 8080
+ sudo iptables -t nat -A PREROUTING -i eth1 -p tcp --dport 80 -j REDIRECT --to-port 8080
+ sudo iptables -t nat -A PREROUTING -i eth1 -p tcp --dport 443 -j REDIRECT --to-port 8080
4. Run mitmproxy
----------------