August 2011 - tor-commits - lists.torproject.org

[torouter/master] add repo
by ioerror＠torproject.org 19 Aug '11

19 Aug '11

commit 9a84ce931b8b1e6643f946e9cfc6eecdd98b0ec9 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 19 13:38:54 2011 +0200 add repo --- packages/torouter_easy_setup.sh | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/packages/torouter_easy_setup.sh b/packages/torouter_easy_setup.sh index 6d15d86..2d65481 100755 --- a/packages/torouter_easy_setup.sh +++ b/packages/torouter_easy_setup.sh @@ -24,6 +24,11 @@ kGU= -----END PGP PUBLIC KEY BLOCK----- EOF +cat << 'EOF' >> /etc/apt/sources.list +# Torouter project repo +deb http://torrouter.torproject.org/torrouter torrouter main +EOF + apt-key add /tmp/torouter-repo.key apt-get update apt-get install -t torrouter -y torouter-prep

1 0

[torouter/master] add setup run
by ioerror＠torproject.org 19 Aug '11

19 Aug '11

commit ef2936842a39cd401bec53764b489500fd0047e2 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 19 13:37:26 2011 +0200 add setup run --- packages/torouter_easy_setup.sh | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/packages/torouter_easy_setup.sh b/packages/torouter_easy_setup.sh index 498dc00..6d15d86 100755 --- a/packages/torouter_easy_setup.sh +++ b/packages/torouter_easy_setup.sh @@ -27,3 +27,6 @@ EOF apt-key add /tmp/torouter-repo.key apt-get update apt-get install -t torrouter -y torouter-prep + +echo "We're going to trash your system now; you have 30 seconds to bail out!" +sleep 30 && /usr/bin/torouter_config.sh

1 0

[torouter/master] add dir for Makefile target
by ioerror＠torproject.org 19 Aug '11

19 Aug '11

commit 89a84c8bd8ebad59388b180dc1f8a7e497f3ba58 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 19 11:28:55 2011 +0200 add dir for Makefile target --- 0 files changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/packages-for-upload/.empty b/packages/packages-for-upload/.empty new file mode 100644 index 0000000..e69de29

1 0

[torouter/master] fix typo
by ioerror＠torproject.org 19 Aug '11

19 Aug '11

commit d8724e53d482f49796ac8c6bf78f164d8edd47dc Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 19 11:05:19 2011 +0200 fix typo --- packages/torouter_easy_setup.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/torouter_easy_setup.sh b/packages/torouter_easy_setup.sh index 2863266..498dc00 100755 --- a/packages/torouter_easy_setup.sh +++ b/packages/torouter_easy_setup.sh @@ -13,7 +13,7 @@ oikxj6w6uboVEnrbLPzsWEcSze28dLcqVzDMm3aHO0erjBMlUEN4a7rrU0MDf+SH 2z98eSzhJfTWKsjnPmSsp7QTu+lj+mJN7BBoLILLJ+xq1XPJfigiuQucK3k2xMBv eYEpK+11af6/bt5+yQec8dyH7+feYnpY2gW9ABEBAAG0H3RvcnJvdXRlciBhcmNo aXZlIGtleSAoMjAxMS0wOCmJAT4EEwECACgFAk5MF30CGwMFCQDtTgAGCwkIBwMC -BhUIAgkKCwQWAgMBAh6BAheAAAoJEJGCGDUEfmokfYEH/RzFD2x5j1kJ+1+F2pTN +BhUIAgkKCwQWAgMBAh4BAheAAAoJEJGCGDUEfmokfYEH/RzFD2x5j1kJ+1+F2pTN bTochEBvT4gsKCcuT+i7Q4FaorVCePoAyjcW3HBGBNf6G0a37KmtPoQBqXZ2wxVN 7SDFFG4nH27z+OdkrZkUmwnjr3O5QskMuiOfkvpD0aRKvmB/MznxjBW9brJr63Gx IGkdvvZad2V4+jEwTWiOAodWbYGX9A5CgWUL+SHFhsLe3B3ZMrvgbReJqbOGRBTR

1 0

[torouter/master] Add docs for torouter_easy_setup.sh
by ioerror＠torproject.org 19 Aug '11

19 Aug '11

commit 0d87f4989960ea543bfd6c104b388a171d83cb2f Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 19 11:02:32 2011 +0200 Add docs for torouter_easy_setup.sh --- packages/README | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/packages/README b/packages/README new file mode 100644 index 0000000..ad953f6 --- /dev/null +++ b/packages/README @@ -0,0 +1,6 @@ +If you wish to turn a DreamPlug into a Torouter simply follow these steps: + +scp torouter_easy_setup.sh DreamPlug:/tmp/ +ssh DreamPlug torouter_easy_setup.sh + +The DreamPlug should now be configured as a Torouter.

1 0

[torouter/master] add +x to torouter_easy_setup.sh
by ioerror＠torproject.org 19 Aug '11

19 Aug '11

commit 6a2342614d8bd5437d5484628898641f961db9e8 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 19 11:00:19 2011 +0200 add +x to torouter_easy_setup.sh --- 0 files changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/torouter_easy_setup.sh b/packages/torouter_easy_setup.sh old mode 100644 new mode 100755

1 0

[torouter/master] add torouter_easy_setup.sh for runnoing on a stock debian machine
by ioerror＠torproject.org 19 Aug '11

19 Aug '11

commit 5e49b4a2970e8ee7a525db78d1876ca95de01c6d Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 19 10:59:29 2011 +0200 add torouter_easy_setup.sh for runnoing on a stock debian machine --- packages/torouter_easy_setup.sh | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/packages/torouter_easy_setup.sh b/packages/torouter_easy_setup.sh new file mode 100644 index 0000000..2863266 --- /dev/null +++ b/packages/torouter_easy_setup.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +echo "We're adding Torouter packages to your Debian system" + +cat << 'EOF' > /tmp/torouter-repo.key +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.9 (GNU/Linux) + +mQENBE5MF30BCACy2Ywqme78KCxY0qEXxm0vpBYe9X2kTdaJMS65tLfjbuHJ+WO4 +OKCJ5AJc7NMvZGpVucn4JPTRN34oReXzYWrlm0yfmqnRHm9sEJhDqNbSV6RML+9E +oikxj6w6uboVEnrbLPzsWEcSze28dLcqVzDMm3aHO0erjBMlUEN4a7rrU0MDf+SH +4rz0kkEaBj8gzX+cJQEU5uIdlcINFtL34cNIZPAB3O2ZOjvrDbWJcI6wG/ZfefDk +2z98eSzhJfTWKsjnPmSsp7QTu+lj+mJN7BBoLILLJ+xq1XPJfigiuQucK3k2xMBv +eYEpK+11af6/bt5+yQec8dyH7+feYnpY2gW9ABEBAAG0H3RvcnJvdXRlciBhcmNo +aXZlIGtleSAoMjAxMS0wOCmJAT4EEwECACgFAk5MF30CGwMFCQDtTgAGCwkIBwMC +BhUIAgkKCwQWAgMBAh6BAheAAAoJEJGCGDUEfmokfYEH/RzFD2x5j1kJ+1+F2pTN +bTochEBvT4gsKCcuT+i7Q4FaorVCePoAyjcW3HBGBNf6G0a37KmtPoQBqXZ2wxVN +7SDFFG4nH27z+OdkrZkUmwnjr3O5QskMuiOfkvpD0aRKvmB/MznxjBW9brJr63Gx +IGkdvvZad2V4+jEwTWiOAodWbYGX9A5CgWUL+SHFhsLe3B3ZMrvgbReJqbOGRBTR +nGWYjLH5K0lNLPNb8spKOxT/h5gKib9p5680hQG672n9EJGixfmvrCQF/3cqy2SG +CmfX5Tt7+l/C6LfyaHWHsQsjqVtCmwPjfQ1sRa1S9UPXjrZb/54kDUHfpUByB/ab +kGU= +=ZXbM +-----END PGP PUBLIC KEY BLOCK----- +EOF + +apt-key add /tmp/torouter-repo.key +apt-get update +apt-get install -t torrouter -y torouter-prep

1 0

[torouter/master] Merge branch 'master' of ssh://git-rw.torproject.org/torouter
by ioerror＠torproject.org 19 Aug '11

19 Aug '11

commit d4b0267763c7501b855daffba8c9aa6ce61f462e Merge: 5e49b4a 11aaab5 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 19 10:59:57 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter packages/torouter-web/src/static/main.css | 5 +++++ .../torouter-web/src/tui/controllers/network.py | 4 ++-- packages/torouter-web/src/tui/utils/parsing.py | 1 + 3 files changed, 8 insertions(+), 2 deletions(-)

1 0

[torouter/master] Add style to sub-menus
by hellais＠torproject.org 19 Aug '11

19 Aug '11

commit 1908a9a1966f67313a2afe3aefab33768cf8dce8 Author: Arturo Filastò <hellais(a)torproject.org> Date: Wed Aug 17 18:20:48 2011 +0200 Add style to sub-menus --- packages/torouter-web/static/main.css | 5 +++++ packages/torouter-web/tui/controllers/network.py | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/torouter-web/static/main.css b/packages/torouter-web/static/main.css index 34e26cf..7277912 100644 --- a/packages/torouter-web/static/main.css +++ b/packages/torouter-web/static/main.css @@ -35,6 +35,11 @@ div.header ul#submenu li { font-size: 15px; } +div.header ul#submenu li a.sel { + color: black; + text-decoration: none; +} + /* More specific stuff */ #torrc { list-style: none; diff --git a/packages/torouter-web/tui/controllers/network.py b/packages/torouter-web/tui/controllers/network.py index d189d0c..cc46643 100644 --- a/packages/torouter-web/tui/controllers/network.py +++ b/packages/torouter-web/tui/controllers/network.py @@ -55,14 +55,14 @@ class firewall: def GET(self): if session.is_logged() > 0: - return render.base(render.firewall(configuration.get_form("firewall")),menu(0)) + return render.base(render.firewall(configuration.get_form("firewall")),menu(1)) else: return render.base(render.login()) def POST(self): if session.is_logged() > 0: self.update_config(web.input()) - return render.base(render.firewall(),menu(1)) + return render.base(render.firewall(configuration.get_form("firewall")),menu(1)) else: return render.base(render.login())

1 0

[torouter/master] Fix comment line parsing (thanks atgar)
by hellais＠torproject.org 19 Aug '11

19 Aug '11

commit 4a55d3546be8f0444b12d634ccf01c5a107d46eb Author: Arturo Filastò <hellais(a)torproject.org> Date: Wed Aug 17 18:23:11 2011 +0200 Fix comment line parsing (thanks atgar) --- packages/torouter-web/tui/utils/parsing.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/packages/torouter-web/tui/utils/parsing.py b/packages/torouter-web/tui/utils/parsing.py index 6acf988..beb45d3 100644 --- a/packages/torouter-web/tui/utils/parsing.py +++ b/packages/torouter-web/tui/utils/parsing.py @@ -81,6 +81,7 @@ class torrc: def parse(self): for line in self.fp.readlines(): + line = line.lstrip() if line.startswith("#") or line == "": continue else:

1 0