From 91a2be8a5f023e8aef9cc8fd238fc371498d307b Mon Sep 17 00:00:00 2001
From: Jacob Appelbaum <jacob@appelbaum.net>
Date: Fri, 26 Aug 2011 01:38:23 +0200
Subject: add new packages for networking and dns

---
 packages/torouter-prep/src/torouter_config.sh | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'packages')

diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh
index d02ae0c..c2a8527 100644
--- a/packages/torouter-prep/src/torouter_config.sh
+++ b/packages/torouter-prep/src/torouter_config.sh
@@ -46,8 +46,11 @@ apt-get -y install vim
 # install a sane pager
 apt-get -y install less
 
+# Install screen
+apt-get -y install screen
+
 # Install a few networking tools
-apt-get -y install lsof wireless-tools
+apt-get -y install lsof wireless-tools iputils-ping
 
 # Install the weird wireless control for the DreamPlug
 apt-get install -y -t sid uaputl
@@ -91,6 +94,9 @@ apt-get -y install dnsmasq
 # install the best dhcp client we're gonna get in debian land
 apt-get -y install isc-dhcp-client
 
+# install our own real dns cache
+apt-get -y install unbound
+
 ##
 ## Configuration stage of the script
 ##
@@ -128,12 +134,12 @@ cp $config_dir/ttdnsd-default /etc/default/ttdnsd
 cp $config_dir/sshd_config /etc/ssh/sshd_config
 
 # Clean up our cache
-apt-get -f -y remove polipo minissdpd
+apt-get -f -y remove --purge polipo minissdpd
 
 # Remove a bunch of stuff:
 apt-get -y remove exim4-base exim4-config exim4-daemon-light dbus
 
-apt-get -y autoremove
+#apt-get -y autoremove
 apt-get -y clean
 
 # Fixup apt if something goes wrong
@@ -142,13 +148,16 @@ apt-get install -f
 
 ## Disable ipv6 support for now
 cp $config_dir/modprobe.d-blacklist.conf /etc/modprobe.d/blacklist.conf
-echo net.ipv6.conf.all.disable_ipv6=1 > /etc/sysctl.d/disableipv6.conf
+# We don't need this if the ipv6 module is not loaded
+#echo net.ipv6.conf.all.disable_ipv6=1 > /etc/sysctl.d/disableipv6.conf
 ##
 ## Restart the network here
 ##
 
 ifup -a
 
+apt-get -y install unbound
+
 ##
 ## Restart services here
 ##
-- 
cgit v1.2.3