aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Appelbaum <jacob@appelbaum.net>2011-08-19 01:10:22 +0200
committerJacob Appelbaum <jacob@appelbaum.net>2011-08-19 01:10:22 +0200
commit6e0105a193afc8f94ce6717e574a0e3442f41baa (patch)
tree5cab71c55a8905ade59d823b9a56052135f9a687
parent7e495f7c032c5abc5a0d73eabcc5c468c836cbd8 (diff)
downloadtorouter-6e0105a193afc8f94ce6717e574a0e3442f41baa.tar.gz
torouter-6e0105a193afc8f94ce6717e574a0e3442f41baa.zip
fixup
-rw-r--r--packages/torouter-prep/src/torouter_config.sh10
1 files changed, 4 insertions, 6 deletions
diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh
index cec4606..87df86b 100644
--- a/packages/torouter-prep/src/torouter_config.sh
+++ b/packages/torouter-prep/src/torouter_config.sh
@@ -2,13 +2,11 @@
export VERSION="0.1"
-echo "This program will reconfigure your Debian system into a Torouter"
-exit 0
-echo "This is where we'd take over the entire Torouter system"
+echo "This program will now reconfigure your Debian system into a Torouter"
# For every file we touch, move it to the temp_dir and then tar it up in the end
export temp_dir="`mktemp -d`"
-export config_dir="/usr/share/doc/torouter-prep/example-configs/"
+export config_dir="/usr/share/torouter-prep/example-configs/"
# Add a user to administrate the Torouter later
export ADMINUSER="torouter"
@@ -21,11 +19,11 @@ useradd -g $ADMINGROUP -s /bin/bash $ADMINUSER
# gpg --keyserver keys.gnupg.net --recv 886DDD89
# gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add -
# This is the main Tor repo apt pubkey
-apt-get add $config_dir/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.apt-key
+apt-key add $config_dir/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-get add $config_dir/047E6A24.asc
+apt-key add $config_dir/047E6A24.asc
# Set us to have a default host name and hosts file
cp $config_dir/hostname /etc/hostname