aboutsummaryrefslogtreecommitdiffstats
path: root/packages/torouter-prep
diff options
context:
space:
mode:
authorArturo FilastoĢ€ <hellais@torproject.org>2011-08-19 15:22:43 +0200
committerArturo FilastoĢ€ <hellais@torproject.org>2011-08-19 15:22:43 +0200
commit21472ffb02bb44782d232ce5efe79042c8cb27c6 (patch)
tree625afbba9ab2eedb565d4597912ca112b3ede91d /packages/torouter-prep
parente4d842cd5c1b66e43687f269adae4e4a4dcbaad7 (diff)
parent7c28ada512ff9f99b11b2b0df4f3b11a37d5f472 (diff)
downloadtorouter-21472ffb02bb44782d232ce5efe79042c8cb27c6.tar.gz
torouter-21472ffb02bb44782d232ce5efe79042c8cb27c6.zip
Merge branch 'master' of ssh://git-rw.torproject.org/torouter
Diffstat (limited to 'packages/torouter-prep')
-rw-r--r--packages/torouter-prep/configs/openntpd-default6
-rw-r--r--packages/torouter-prep/configs/sources.list3
-rw-r--r--packages/torouter-prep/src/torouter_config.sh1
3 files changed, 10 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