clean up configs directory

2 files changed, 8 insertions, 5 deletions

diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh
index 8cfc07f..536fc10 100755
--- a/packages/torouter-prep/src/torouter_config.sh
+++ b/packages/torouter-prep/src/torouter_config.sh
@@ -13,14 +13,14 @@ export ADMINGROUP="torouter"
 export TORADMINGROUP="debian-tor"
 
 # This is the main Tor repo apt pubkey
-apt-key add $config_dir/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.apt-key
+apt-key add $config_dir/tmp/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.apt-key
 
 # This is the temp torrouter archive pubkey; this should be updated when we
 # freeze this repo and know what we want to do
-apt-key add $config_dir/047E6A24.asc
+apt-key add $config_dir/tmp/047E6A24.asc
 
 # We need to prep apt to understand that we want packages from other repos
-cp $config_dir/sources.list /etc/apt/sources.list
+cp $config_dir/etc/sources.list /etc/apt/sources.list
 
 apt-get -y update
 
diff --git a/packages/torouter-prep/src/torouter_preboot.sh b/packages/torouter-prep/src/torouter_preboot.sh
index 7fd2a17..d179581 100755
--- a/packages/torouter-prep/src/torouter_preboot.sh
+++ b/packages/torouter-prep/src/torouter_preboot.sh
@@ -48,6 +48,9 @@ cp $config_dir/etc/ssh/sshd_config /etc/ssh/sshd_config
 cp $config_dir/etc/tor/torrc /etc/tor/torrc
 cp $config_dir/etc/default/ttdnsd /etc/default/ttdnsd
 
+# install tor firewall helper
+install -o root -g root -m 750 $config_dir/sbin/tor-wireless-firewall.sh /usr/sbin/
+
 # Remove a bunch of stuff
 apt-get -f -y remove --purge polipo minissdpd
 apt-get -y remove exim4-base exim4-config exim4-daemon-light dbus
@@ -66,10 +69,10 @@ useradd -g $ADMINGROUP -G $TORADMINGROUP -s /bin/bash $ADMINUSER
 # TODO: $ADMINUSER passwd?
 
 # Configure arm
-zcat $config_dir/armrc.sample.gz > /home/$ADMINUSER/.armrc
+zcat $config_dir/tmp/armrc.sample.gz > /home/$ADMINUSER/.armrc
 
 ## Add arm startup trick with cron for shared screen run as $ADMINUSER
-crontab -u $ADMINUSER $config_dir/tor-arm-crontab
+crontab -u $ADMINUSER $config_dir/tmp/tor-arm-crontab
 
 ## Touch a stamp to show that we're now a Torouter
 echo "torouter $VERSION" > /etc/torouter