From ef2936842a39cd401bec53764b489500fd0047e2 Mon Sep 17 00:00:00 2001 From: Jacob Appelbaum Date: Fri, 19 Aug 2011 13:37:26 +0200 Subject: add setup run --- packages/torouter_easy_setup.sh | 3 +++ 1 file changed, 3 insertions(+) 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 -- cgit v1.2.3 From 9a84ce931b8b1e6643f946e9cfc6eecdd98b0ec9 Mon Sep 17 00:00:00 2001 From: Jacob Appelbaum Date: Fri, 19 Aug 2011 13:38:54 +0200 Subject: add repo --- packages/torouter_easy_setup.sh | 5 +++++ 1 file changed, 5 insertions(+) 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 -- cgit v1.2.3 From 6d5f6e5e68fbb4cb017224f273ae76dbe104f3cb Mon Sep 17 00:00:00 2001 From: Jacob Appelbaum Date: Fri, 19 Aug 2011 14:13:15 +0200 Subject: add sid --- packages/torouter-prep/configs/sources.list | 3 +++ 1 file changed, 3 insertions(+) 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 -- cgit v1.2.3 From 1ce6ae2823cd10c38340da21962a48f90879bde0 Mon Sep 17 00:00:00 2001 From: Jacob Appelbaum Date: Fri, 19 Aug 2011 14:31:45 +0200 Subject: sync time on first startup and all subsequent startups --- packages/torouter-prep/configs/openntpd-default | 6 ++++++ packages/torouter-prep/src/torouter_config.sh | 1 + 2 files changed, 7 insertions(+) create mode 100644 packages/torouter-prep/configs/openntpd-default 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/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 -- cgit v1.2.3 From 7c28ada512ff9f99b11b2b0df4f3b11a37d5f472 Mon Sep 17 00:00:00 2001 From: Jacob Appelbaum Date: Fri, 19 Aug 2011 14:47:18 +0200 Subject: add python #! --- packages/torouter-web/src/runui.py | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/torouter-web/src/runui.py b/packages/torouter-web/src/runui.py index 80836b3..4c9e199 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' # -- cgit v1.2.3