aboutsummaryrefslogtreecommitdiffstats
path: root/packages/torouter-prep/src
diff options
context:
space:
mode:
authorArturo FilastoĢ€ <hellais@torproject.org>2011-08-17 18:16:55 +0200
committerArturo FilastoĢ€ <hellais@torproject.org>2011-08-17 18:16:55 +0200
commit525766e515148f9da5e78d39d1905264a4d14bad (patch)
treed7c8406d2c4da1785bb95ddca4e57b8669cce463 /packages/torouter-prep/src
parentd435505bea5b9d735447f4900d7e502cae11412f (diff)
parent24b92ab9b034d6c957631a034a717ba41809a335 (diff)
downloadtorouter-525766e515148f9da5e78d39d1905264a4d14bad.tar.gz
torouter-525766e515148f9da5e78d39d1905264a4d14bad.zip
Merge branch 'master' of ssh://git-rw.torproject.org/torouter
Diffstat (limited to 'packages/torouter-prep/src')
-rw-r--r--packages/torouter-prep/src/torouter_config.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh
index 7a6a581..7c79862 100644
--- a/packages/torouter-prep/src/torouter_config.sh
+++ b/packages/torouter-prep/src/torouter_config.sh
@@ -6,6 +6,7 @@ echo "This is where we'd take over the entire Torouter system"
# For every file we touch, move it to the temp_dir and then tar it up in the end
temp_dir="`mktemp -d`"
+config_dir="/usr/share/doc/torouter-prep/example-configs/"
# Add a user
ADMINUSER="toradmin"
@@ -23,7 +24,7 @@ EOF
cp /etc/hostname $temp_dir/
# Set us to have a default host name
-echo "torouter" > /etc/hostname
+cp /usr/share/doc/
# We need to prep apt to understand that we want packages from other repos
# We append to the current package list