docs: minor fixes

This commit is contained in:
Maximilian Hils
2015-09-07 10:52:18 +02:00
parent 31ee4607c8
commit c4286b15dc
31 changed files with 93 additions and 80 deletions

View File

@@ -63,4 +63,4 @@ conversation back to the file.
.. _Firebug: https://getfirebug.com/
.. _urllib: https://docs.python.org/library/urllib.html
.. _Toggle Proxy: https://addons.mozilla.org/en-us/firefox/addon/toggle-proxy-51740/
.. _wicd: https://launchpad.net/wicd
.. _wicd: https://launchpad.net/wicd

View File

@@ -125,4 +125,4 @@ same score through perfect play, effectively beating the game. So, which is it
in this case? I'll leave that for you to decide.
.. _Super Mega Worm: https://itunes.apple.com/us/app/super-mega-worm/id388541990?mt=8
.. _property list: https://en.wikipedia.org/wiki/Property_list
.. _property list: https://en.wikipedia.org/wiki/Property_list

View File

@@ -5,7 +5,8 @@ Transparently proxify virtual machines
This walkthrough illustrates how to set up transparent proxying with mitmproxy.
We use VirtualBox VMs with an Ubuntu proxy machine in this example,
but the general *Internet <--> Proxy VM <--> (Virtual) Internal Network* setup can be applied to other setups.
but the general *Internet <--> Proxy VM <--> (Virtual) Internal Network* setup can be applied to
other setups.
1. Configure Proxy VM
---------------------
@@ -35,9 +36,9 @@ DHCP and TFTP) services to a small-scale network.
- Before we get to that, we need to fix some Ubuntu quirks:
**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
`[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
>>> sudo restart network-manager
@@ -84,4 +85,5 @@ Finally, we can run mitmproxy in transparent mode with
>>> mitmproxy -T
The proxied machine cannot to leak any data outside of HTTP or DNS requests.
If required, you can now :ref:`install the mitmproxy certificates on the proxied machine <certinstall>`.
If required, you can now :ref:`install the mitmproxy certificates on the proxied machine
<certinstall>`.