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

[torouter/master] remove minissdpd
by ioerror＠torproject.org 23 Aug '11

23 Aug '11

commit e851b4a60db561e32f32a1aea777670ee10d0d46 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Aug 23 15:01:01 2011 +0200 remove minissdpd --- packages/torouter-prep/src/torouter_config.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh index 81b90ab..e5a3391 100644 --- a/packages/torouter-prep/src/torouter_config.sh +++ b/packages/torouter-prep/src/torouter_config.sh @@ -117,7 +117,7 @@ cp $config_dir/ttdnsd-default /etc/default/ttdnsd cp $config_dir/sshd_config /etc/ssh/sshd_config # Clean up our cache -apt-get -y remove polipo +apt-get -y remove polipo minissdpd apt-get -y autoremove apt-get -y clean

1 0

[torouter/master] use $IFACE rather than uap0 per suggestion by weasel
by ioerror＠torproject.org 23 Aug '11

23 Aug '11

commit 3dd720f3d17b946481ab59ec191bf17cafec50e5 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Aug 23 15:19:17 2011 +0200 use $IFACE rather than uap0 per suggestion by weasel --- packages/torouter-prep/configs/interfaces | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/torouter-prep/configs/interfaces b/packages/torouter-prep/configs/interfaces index 903bdb4..ef3071a 100644 --- a/packages/torouter-prep/configs/interfaces +++ b/packages/torouter-prep/configs/interfaces @@ -28,11 +28,11 @@ iface uap0 inet static netmask 255.255.255.0 network 172.16.23.0 broadcast 172.16.23.255 - pre-up ifconfig uap0 hw ether 00:66:66:66:66:66 + pre-up ifconfig $IFACE hw ether 00:66:66:66:66:66 post-up /etc/init.d/tor reload post-up /etc/init.d/dnsmasq restart post-up /etc/init.d/ttdnsd restart - post-up /usr/bin/uaputl sys_cfg_ssid "torproject" - post-up /usr/bin/uaputl bss_start + post-up /usr/bin/uaputl sys_cfg_ssid "torproject" + post-up /usr/bin/uaputl bss_start post-up /usr/share/torouter-prep/example-configs/tor-wireless-firewall.sh pre-down /usr/bin/uaputl bss_stop

1 0

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

23 Aug '11

commit 5c61f445926f1420f61e509cea51dc7a24e1b0b5 Merge: 3dd720f b540393 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Aug 23 15:20:12 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter packages/torouter-web/setup.py | 6 +- packages/torouter-web/src/runui.py | 2 +- packages/torouter-web/src/tui/view.py | 5 ++- packages/torouter-web/src/tui/views/base.html | 55 ++++++++++++++++++++++++- 4 files changed, 62 insertions(+), 6 deletions(-)

1 0

[torouter/master] Fix typo
by hellais＠torproject.org 23 Aug '11

23 Aug '11

commit b54039300353ad6bfb59e6668f03fe9e1745c763 Author: Arturo Filastò <hellais(a)torproject.org> Date: Tue Aug 23 15:18:21 2011 +0200 Fix typo --- packages/torouter-web/src/tui/view.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/torouter-web/src/tui/view.py b/packages/torouter-web/src/tui/view.py index 48b03c5..ea885be 100644 --- a/packages/torouter-web/src/tui/view.py +++ b/packages/torouter-web/src/tui/view.py @@ -9,6 +9,6 @@ t_globals = dict( # get the path where the script currently resides current_path = "/".join(os.path.abspath(__file__).split("/")[:-1]) # create the render object -cender = web.template.render(current_path+'/views', cache=config.cache, globals=t_globals) +render = web.template.render(current_path+'/views', cache=config.cache, globals=t_globals) render._keywords['globals']['render'] = render

1 0

[torouter/master] * Fix issue with distutils
by hellais＠torproject.org 23 Aug '11

23 Aug '11

commit 6f17b6fbc8f1accdfff5e5a5503baf7eafc9dc08 Author: Arturo Filastò <hellais(a)torproject.org> Date: Tue Aug 23 15:15:27 2011 +0200 * Fix issue with distutils * Temporarily move the style sheet to base.html * Fix issues related to absolute paths * Correct pid file location * misc cleanup --- packages/torouter-web/setup.py | 6 +- packages/torouter-web/src/runui.py | 2 +- packages/torouter-web/src/tui/view.py | 5 ++- packages/torouter-web/src/tui/views/base.html | 55 ++++++++++++++++++++++++- 4 files changed, 62 insertions(+), 6 deletions(-) diff --git a/packages/torouter-web/setup.py b/packages/torouter-web/setup.py index a0e5c65..fe01ab8 100644 --- a/packages/torouter-web/setup.py +++ b/packages/torouter-web/setup.py @@ -4,8 +4,8 @@ from distutils.core import setup setup(name='torouter-tui', packages=['tui', 'tui.controllers', 'tui.models', 'tui.utils'], - package_dir = {'tui': 'src/tui/'}, - package_data = {'tui': ['src/tui/', 'views/*html']}, + package_dir = {'tui': 'src/tui'}, + package_data = {'tui': ['src/tui', 'views/*html']}, data_files = [('/usr/share/torouter-tui/static', ['src/static/main.css'])], version='0.1', @@ -13,5 +13,5 @@ setup(name='torouter-tui', author='Arturo Filasto', author_email='hellais(a)torproject.org', url='https://www.torproject.org/', - scripts=['src/runui.py', 'src/tui/view.py', 'src/tui/config.py', 'src/daemon.py']) + scripts=['src/runui.py', 'src/daemon.py']) diff --git a/packages/torouter-web/src/runui.py b/packages/torouter-web/src/runui.py index b016ea9..87c6626 100644 --- a/packages/torouter-web/src/runui.py +++ b/packages/torouter-web/src/runui.py @@ -41,7 +41,7 @@ DEBUG = False if __name__ == "__main__": if DEBUG: app.run() - service = TorWebDaemon(os.path.join(os.getcwd(),'tui.pid')) + service = TorWebDaemon('/tmp/tui.pid') if len(sys.argv) == 2: if 'start' == sys.argv[1]: sys.argv[1] = '8080' diff --git a/packages/torouter-web/src/tui/view.py b/packages/torouter-web/src/tui/view.py index 0252ad8..48b03c5 100644 --- a/packages/torouter-web/src/tui/view.py +++ b/packages/torouter-web/src/tui/view.py @@ -1,3 +1,4 @@ +import os import web from tui import config @@ -5,7 +6,9 @@ t_globals = dict( datestr=web.datestr, ) +# get the path where the script currently resides +current_path = "/".join(os.path.abspath(__file__).split("/")[:-1]) # create the render object -render = web.template.render('tui/views', cache=config.cache, globals=t_globals) +cender = web.template.render(current_path+'/views', cache=config.cache, globals=t_globals) render._keywords['globals']['render'] = render diff --git a/packages/torouter-web/src/tui/views/base.html b/packages/torouter-web/src/tui/views/base.html index bce4110..5db0249 100644 --- a/packages/torouter-web/src/tui/views/base.html +++ b/packages/torouter-web/src/tui/views/base.html @@ -5,7 +5,60 @@ $def with (page,submenu=None) <html> <head> <title>TUI - Tor Web User Interface</title> - <link REL="stylesheet" href="/static/main.css" type="text/css"> +<style type="text/css"> +/* Clear all */ +body { margin: 0;border: 0;padding: 0; } + +div.wrapper { + min-height: 300px; + width: 800px; + margin: 0 auto; +} + +div.footer { + text-align: center; + background-color: #333; + color: white; + padding-top: 20px; + padding-bottom: 20px; +} + +div.header { + color: white; +} + +div.header ul { + list-style: none; + height: 20px; +} + +div.header ul li { + font-size: 20px; + float: left; + padding: 5px 10px; +} + +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; +line-height: 2em; +} + +#torrc em { +font-weight: bold; +font-style: normal; +} +</style> + </head> <body> <div class="header">

1 0

[torouter/master] Add views directory. Still suffers from distutils bug
by hellais＠torproject.org 23 Aug '11

23 Aug '11

commit 8687350c9d572d2253b31a0739f04e1ddffc0d5f Author: Arturo Filastò <hellais(a)torproject.org> Date: Tue Aug 23 14:46:58 2011 +0200 Add views directory. Still suffers from distutils bug --- packages/torouter-web/setup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/torouter-web/setup.py b/packages/torouter-web/setup.py index fe3e6e8..a0e5c65 100644 --- a/packages/torouter-web/setup.py +++ b/packages/torouter-web/setup.py @@ -5,7 +5,7 @@ setup(name='torouter-tui', packages=['tui', 'tui.controllers', 'tui.models', 'tui.utils'], package_dir = {'tui': 'src/tui/'}, - package_data = {'tui': ['src/tui/']}, + package_data = {'tui': ['src/tui/', 'views/*html']}, data_files = [('/usr/share/torouter-tui/static', ['src/static/main.css'])], version='0.1',

1 0

r24962: {translation} fix typo, thanks kaner (translation/trunk/documentation)
by Runa Sandvik 23 Aug '11

23 Aug '11

Author: runa Date: 2011-08-23 12:15:54 +0000 (Tue, 23 Aug 2011) New Revision: 24962 Modified: translation/trunk/documentation/howto.txt Log: fix typo, thanks kaner Modified: translation/trunk/documentation/howto.txt =================================================================== --- translation/trunk/documentation/howto.txt 2011-08-23 00:38:00 UTC (rev 24961) +++ translation/trunk/documentation/howto.txt 2011-08-23 12:15:54 UTC (rev 24962) @@ -261,7 +261,7 @@ 2. Creating/Updating Translation Template Files To update the translation template file for GetTor, run the - following command inside the BridgeDB source directory: + following command inside the GetTor source directory: $ xgettext lib/gettor/i18n.py -dgettor --from-code=utf-8 \ -o i18n/templates/gettor.pot

1 0

[torouter/master] Remove the sys.argv hack from one of the cases
by hellais＠torproject.org 23 Aug '11

23 Aug '11

commit 8c342073f62fceece5cd484c78ad1c60ad6c36bd Author: Arturo Filastò <hellais(a)torproject.org> Date: Tue Aug 23 12:47:42 2011 +0200 Remove the sys.argv hack from one of the cases --- packages/torouter-web/src/runui.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/packages/torouter-web/src/runui.py b/packages/torouter-web/src/runui.py index 4353475..b016ea9 100644 --- a/packages/torouter-web/src/runui.py +++ b/packages/torouter-web/src/runui.py @@ -55,7 +55,6 @@ if __name__ == "__main__": sys.exit(2) sys.exit(0) else: - sys.argv[1] = '8080' print "starting daemon..." service.start()

1 0

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

23 Aug '11

commit cc1981d0e85f2e640ba6a9f6f9e57bbca323dccf Merge: 8c34207 9e05744 Author: Arturo Filastò <hellais(a)torproject.org> Date: Tue Aug 23 12:48:30 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter packages/torouter-prep/src/torouter_config.sh | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)

1 0

[torouter/master] pin to debian experimental for orport auto and so on
by ioerror＠torproject.org 23 Aug '11

23 Aug '11

commit aeaeb4b616c0d4c4b3c4a37f408a98e730304745 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Aug 23 12:37:26 2011 +0200 pin to debian experimental for orport auto and so on --- packages/torouter-prep/configs/torrc | 4 ++-- packages/torouter-prep/src/torouter_config.sh | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/torouter-prep/configs/torrc b/packages/torouter-prep/configs/torrc index 29a9526..0979ddc 100644 --- a/packages/torouter-prep/configs/torrc +++ b/packages/torouter-prep/configs/torrc @@ -96,8 +96,8 @@ Nickname Torouter ## Define these to limit how much relayed traffic you will allow. Your ## own traffic is still unthrottled. Note that RelayBandwidthRate must ## be at least 20 KBytes. -RelayBandwidthRate 50KB KBytes -RelayBandwidthBurst 75KB KBytes +RelayBandwidthRate 50KB +RelayBandwidthBurst 75KB ## Contact info to be published in the directory, so we can contact you ## if your relay is misconfigured or something else goes wrong. Google diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh index 106ffc3..11956f9 100644 --- a/packages/torouter-prep/src/torouter_config.sh +++ b/packages/torouter-prep/src/torouter_config.sh @@ -52,7 +52,7 @@ apt-get -y install denyhosts ufw apt-get -y -t squeeze-backports install openntpd # Install Tor and deps: -apt-get -y install tor tor-geoipdb +apt-get -y -t experimental-squeeze install tor tor-geoipdb # To build a 0.2.3.x Tor: # apt-get source tor=0.2.3.1-alpha-1~~squeeze+1 # Debuild here... @@ -115,6 +115,8 @@ cp $config_dir/ttdnsd-default /etc/default/ttdnsd cp $config_dir/sshd_config /etc/ssh/sshd_config # Clean up our cache +apt-get -y polipo +apt-get -y autoremove apt-get -y clean ## Disable ipv6 support for now

1 0