clean up configs directory

11 files changed, 13 insertions, 29 deletions

diff --git a/freedom-maker/multistrap-configs/torouter-base.conf b/freedom-maker/multistrap-configs/torouter-base.conf
index cda5bba..697a375 100644
--- a/freedom-maker/multistrap-configs/torouter-base.conf
+++ b/freedom-maker/multistrap-configs/torouter-base.conf
@@ -14,7 +14,7 @@ components=main
 omitdebsrc=false
 
 [torproject]
-packages=tor tor-geoipdb libnatpmp-dev libnatpmp1 libminiupnpc-dev libminiupnpc5 tor-arm
+packages=tor tor-geoipdb libnatpmp-dev libnatpmp1 libminiupnpc-dev libminiupnpc5 tor-arm python-torctl
 source=http://deb.torproject.org/torproject.org/
 keyring=deb.torproject.org-keyring
 suite=wheezy
diff --git a/packages/torouter-prep/configs/047E6A24.asc b/packages/torouter-prep/configs/047E6A24.asc
deleted file mode 100644
index e2a8303..0000000
--- a/packages/torouter-prep/configs/047E6A24.asc
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-mQENBE5MF30BCACy2Ywqme78KCxY0qEXxm0vpBYe9X2kTdaJMS65tLfjbuHJ+WO4
-OKCJ5AJc7NMvZGpVucn4JPTRN34oReXzYWrlm0yfmqnRHm9sEJhDqNbSV6RML+9E
-oikxj6w6uboVEnrbLPzsWEcSze28dLcqVzDMm3aHO0erjBMlUEN4a7rrU0MDf+SH
-4rz0kkEaBj8gzX+cJQEU5uIdlcINFtL34cNIZPAB3O2ZOjvrDbWJcI6wG/ZfefDk
-2z98eSzhJfTWKsjnPmSsp7QTu+lj+mJN7BBoLILLJ+xq1XPJfigiuQucK3k2xMBv
-eYEpK+11af6/bt5+yQec8dyH7+feYnpY2gW9ABEBAAG0H3RvcnJvdXRlciBhcmNo
-aXZlIGtleSAoMjAxMS0wOCmJAT4EEwECACgFAk5MF30CGwMFCQDtTgAGCwkIBwMC
-BhUIAgkKCwQWAgMBAh4BAheAAAoJEJGCGDUEfmokfYEH/RzFD2x5j1kJ+1+F2pTN
-bTochEBvT4gsKCcuT+i7Q4FaorVCePoAyjcW3HBGBNf6G0a37KmtPoQBqXZ2wxVN
-7SDFFG4nH27z+OdkrZkUmwnjr3O5QskMuiOfkvpD0aRKvmB/MznxjBW9brJr63Gx
-IGkdvvZad2V4+jEwTWiOAodWbYGX9A5CgWUL+SHFhsLe3B3ZMrvgbReJqbOGRBTR
-nGWYjLH5K0lNLPNb8spKOxT/h5gKib9p5680hQG672n9EJGixfmvrCQF/3cqy2SG
-CmfX5Tt7+l/C6LfyaHWHsQsjqVtCmwPjfQ1sRa1S9UPXjrZb/54kDUHfpUByB/ab
-kGU=
-=ZXbM
------END PGP PUBLIC KEY BLOCK-----
diff --git a/packages/torouter-prep/configs/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.apt-key b/packages/torouter-prep/configs/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.apt-key
deleted file mode 100644
index 5b6a4d3..0000000
--- a/packages/torouter-prep/configs/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.apt-key
+++ /dev/null
diff --git a/packages/torouter-prep/configs/armrc.sample.gz b/packages/torouter-prep/configs/armrc.sample.gz
deleted file mode 100644
index c86b6f1..0000000
--- a/packages/torouter-prep/configs/armrc.sample.gz
+++ /dev/null
diff --git a/packages/torouter-prep/configs/etc/network/interfaces b/packages/torouter-prep/configs/etc/network/interfaces
index 255075f..e2f5741 100644
--- a/packages/torouter-prep/configs/etc/network/interfaces
+++ b/packages/torouter-prep/configs/etc/network/interfaces
@@ -35,5 +35,5 @@ iface uap0 inet static
 	post-up /etc/init.d/ttdnsd restart
 	post-up /usr/bin/uaputl sys_cfg_ssid "torproject" || true
 	post-up /usr/bin/uaputl bss_start || true
-	post-up /usr/share/torouter-prep/example-configs/tor-wireless-firewall.sh || true
+	post-up /usr/sbin/tor-wireless-firewall.sh || true
 	pre-down /usr/bin/uaputl bss_stop || true
diff --git a/packages/torouter-prep/configs/etc/tor/torrc b/packages/torouter-prep/configs/etc/tor/torrc
index 5023d57..063dde8 100644
--- a/packages/torouter-prep/configs/etc/tor/torrc
+++ b/packages/torouter-prep/configs/etc/tor/torrc
@@ -178,3 +178,6 @@ ControlPort 9051
 ControlListenAddress 127.0.0.1:9051
 CookieAuthentication 1
 
+# On torouter, tor daemon should always be running, but defaults to disabled
+# until user enables it specifically through the web interface
+DisableNetwork 1
diff --git a/packages/torouter-prep/configs/udhcpd.conf b/packages/torouter-prep/configs/etc/udhcpd.conf
index 04160aa..04160aa 100644
--- a/packages/torouter-prep/configs/udhcpd.conf
+++ b/packages/torouter-prep/configs/etc/udhcpd.conf
diff --git a/packages/torouter-prep/configs/tor-wireless-firewall.sh b/packages/torouter-prep/configs/sbin/tor-wireless-firewall.sh
index 4310e7b..4310e7b 100755
--- a/packages/torouter-prep/configs/tor-wireless-firewall.sh
+++ b/packages/torouter-prep/configs/sbin/tor-wireless-firewall.sh
diff --git a/packages/torouter-prep/configs/tor-arm-crontab b/packages/torouter-prep/configs/tor-arm-crontab
deleted file mode 100644
index b662b22..0000000
--- a/packages/torouter-prep/configs/tor-arm-crontab
+++ /dev/null
@@ -1,3 +0,0 @@
-# Now anyone using the torouter can attach to a long term screen with arm
-# This will run at boot time and it should run forever
-@reboot screen -d -m -S tor-arm /usr/bin/arm
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