aboutsummaryrefslogtreecommitdiffstats
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
parentd435505bea5b9d735447f4900d7e502cae11412f (diff)
parent24b92ab9b034d6c957631a034a717ba41809a335 (diff)
downloadtorouter-525766e515148f9da5e78d39d1905264a4d14bad.tar.gz
torouter-525766e515148f9da5e78d39d1905264a4d14bad.zip
Merge branch 'master' of ssh://git-rw.torproject.org/torouter
-rw-r--r--packages/Makefile9
-rw-r--r--packages/torouter-prep/configs/hostname1
-rw-r--r--packages/torouter-prep/configs/hosts1
-rw-r--r--packages/torouter-prep/debian/changelog2
-rw-r--r--packages/torouter-prep/debian/control2
-rw-r--r--packages/torouter-prep/debian/files2
-rw-r--r--packages/torouter-prep/src/torouter_config.sh3
7 files changed, 16 insertions, 4 deletions
diff --git a/packages/Makefile b/packages/Makefile
new file mode 100644
index 0000000..6166493
--- /dev/null
+++ b/packages/Makefile
@@ -0,0 +1,9 @@
+debs: webdeb prepdeb
+
+webdeb:
+ # By default we will but not sign for now
+ cd torouter-web && debuild --no-tgz-check -us -uc
+prepdeb:
+ # By default we will but not sign for now
+ cd torouter-prep && debuild --no-tgz-check -us -uc
+
diff --git a/packages/torouter-prep/configs/hostname b/packages/torouter-prep/configs/hostname
new file mode 100644
index 0000000..a4a2962
--- /dev/null
+++ b/packages/torouter-prep/configs/hostname
@@ -0,0 +1 @@
+torouter
diff --git a/packages/torouter-prep/configs/hosts b/packages/torouter-prep/configs/hosts
new file mode 100644
index 0000000..64f3fc1
--- /dev/null
+++ b/packages/torouter-prep/configs/hosts
@@ -0,0 +1 @@
+ 127.0.0.1 localhost
diff --git a/packages/torouter-prep/debian/changelog b/packages/torouter-prep/debian/changelog
index f62a4bb..14ff45a 100644
--- a/packages/torouter-prep/debian/changelog
+++ b/packages/torouter-prep/debian/changelog
@@ -1,4 +1,4 @@
-torouter (0.0.1-1) unstable; urgency=low
+torouter-prep (0.0.1-1) unstable; urgency=low
* Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP>
diff --git a/packages/torouter-prep/debian/control b/packages/torouter-prep/debian/control
index f9930d6..545c9f9 100644
--- a/packages/torouter-prep/debian/control
+++ b/packages/torouter-prep/debian/control
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 7.0.50~)
Standards-Version: 3.9.1
Homepage: <https://www.torproject.org/>
-Package: torouter
+Package: torouter-prep
Architecture: all
Depends: ${misc:Depends}, apt-utils, openssh-server, isc-dhcp-client, cron-apt
Description: Torouter meta-package to take over the DreamPlug
diff --git a/packages/torouter-prep/debian/files b/packages/torouter-prep/debian/files
index 894b9ed..298935e 100644
--- a/packages/torouter-prep/debian/files
+++ b/packages/torouter-prep/debian/files
@@ -1 +1 @@
-torouter_0.0.1-1_all.deb unknown extra
+torouter-prep_0.0.1-1_all.deb unknown extra
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