diff options
| author | Arturo FilastoĢ <hellais@torproject.org> | 2011-08-19 15:22:43 +0200 |
|---|---|---|
| committer | Arturo FilastoĢ <hellais@torproject.org> | 2011-08-19 15:22:43 +0200 |
| commit | 21472ffb02bb44782d232ce5efe79042c8cb27c6 (patch) | |
| tree | 625afbba9ab2eedb565d4597912ca112b3ede91d | |
| parent | e4d842cd5c1b66e43687f269adae4e4a4dcbaad7 (diff) | |
| parent | 7c28ada512ff9f99b11b2b0df4f3b11a37d5f472 (diff) | |
| download | torouter-21472ffb02bb44782d232ce5efe79042c8cb27c6.tar.gz torouter-21472ffb02bb44782d232ce5efe79042c8cb27c6.zip | |
Merge branch 'master' of ssh://git-rw.torproject.org/torouter
| -rw-r--r-- | packages/torouter-prep/configs/openntpd-default | 6 | ||||
| -rw-r--r-- | packages/torouter-prep/configs/sources.list | 3 | ||||
| -rw-r--r-- | packages/torouter-prep/src/torouter_config.sh | 1 | ||||
| -rw-r--r-- | packages/torouter-web/src/runui.py | 1 | ||||
| -rwxr-xr-x | packages/torouter_easy_setup.sh | 8 |
5 files changed, 19 insertions, 0 deletions
diff --git a/packages/torouter-prep/configs/openntpd-default b/packages/torouter-prep/configs/openntpd-default new file mode 100644 index 0000000..318e7bd --- /dev/null +++ b/packages/torouter-prep/configs/openntpd-default @@ -0,0 +1,6 @@ +# /etc/default/openntpd + +# Append '-s' to set the system time when starting in case the offset +# between the local clock and the servers is more than 180 seconds. +# For other options, see man ntpd(8). +DAEMON_OPTS="-f /etc/openntpd/ntpd.conf -s" diff --git a/packages/torouter-prep/configs/sources.list b/packages/torouter-prep/configs/sources.list index c7e7e4a..2b25569 100644 --- a/packages/torouter-prep/configs/sources.list +++ b/packages/torouter-prep/configs/sources.list @@ -2,6 +2,9 @@ deb http://ftp.de.debian.org/pub/debian/ squeeze main non-free contrib deb-src http://ftp.de.debian.org/pub/debian/ squeeze main non-free contrib deb http://security.debian.org/ squeeze/updates main +# Sid for uaputl +deb http://ftp.debian.org/debian sid main + # experimental for natpmp deb http://ftp.debian.org/debian experimental main deb-src http://ftp.debian.org/debian experimental main diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh index 7d78f04..e27c81e 100644 --- a/packages/torouter-prep/src/torouter_config.sh +++ b/packages/torouter-prep/src/torouter_config.sh @@ -93,6 +93,7 @@ cp $config_dir/dnsmasq.conf /etc/dnsmasq.conf # Configure ntp cp $config_dir/ntp.conf /etc/ntp.conf +cp $config_dir/openntpd-default /etc/default/openntpd # XXX We should configure ufw here # XXX We should configure denyhosts diff --git a/packages/torouter-web/src/runui.py b/packages/torouter-web/src/runui.py index da1960a..43d8943 100644 --- a/packages/torouter-web/src/runui.py +++ b/packages/torouter-web/src/runui.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python # tui - Tor web UI # by Arturo Filasto' <hellais@torproject.org> # diff --git a/packages/torouter_easy_setup.sh b/packages/torouter_easy_setup.sh index 498dc00..2d65481 100755 --- a/packages/torouter_easy_setup.sh +++ b/packages/torouter_easy_setup.sh @@ -24,6 +24,14 @@ 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 + +echo "We're going to trash your system now; you have 30 seconds to bail out!" +sleep 30 && /usr/bin/torouter_config.sh |