From 2e0f4dab4a58064f1670ce3b09bbb14c2688eff3 Mon Sep 17 00:00:00 2001
From: Christophe Mehay <cmehay@student.42.fr>
Date: Tue, 27 Sep 2016 18:54:59 +0200
Subject: [PATCH 1/2] Don't build tests and reset confdir to /etc

---
 Dockerfile                     | 7 ++++++-
 assets/onions/onions/Onions.py | 3 +--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5063b0a..b243b8d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,12 @@ RUN     apk add --no-cache git libevent-dev openssl-dev gcc make automake ca-cer
         git clone https://git.torproject.org/tor.git /usr/local/src/tor && \
         cd /usr/local/src/tor && \
         git checkout tor-${TOR_VERSION} && \
-        ./autogen.sh && ./configure --disable-asciidoc && make && make install && \
+        ./autogen.sh && \
+        ./configure \
+            --disable-asciidoc \
+            --sysconfdir=/etc \
+            --disable-unittests && \
+        make && make install && \
         cd .. && \
         rm -rf tor && \
         apk add --no-cache python3 python3-dev && \
diff --git a/assets/onions/onions/Onions.py b/assets/onions/onions/Onions.py
index 8ff789e..fa3c1d2 100644
--- a/assets/onions/onions/Onions.py
+++ b/assets/onions/onions/Onions.py
@@ -22,7 +22,7 @@ from base64 import b32encode
 class Setup(object):
 
     hidden_service_dir = "/var/lib/tor/hidden_service/"
-    torrc = '/usr/local/etc/tor/torrc'
+    torrc = '/etc/tor/torrc'
     torrc_template = '/var/local/tor/torrc.tpl'
 
     def onion_url_gen(self, key):
@@ -37,7 +37,6 @@ class Setup(object):
 
         return '{onion}.onion'.format(onion=onion.decode().lower())
 
-
     def _add_host(self, host):
         if host not in self.setup:
             self.setup[host] = {}

From 2f150def09e8f0da0be42667f22dde85a5b03afc Mon Sep 17 00:00:00 2001
From: Christophe Mehay <cmehay@student.42.fr>
Date: Wed, 28 Sep 2016 00:42:55 +0200
Subject: [PATCH 2/2] Using hostname in torrc

---
 assets/torrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/torrc b/assets/torrc
index c3858a1..4f087a8 100644
--- a/assets/torrc
+++ b/assets/torrc
@@ -2,7 +2,7 @@
 HiddenServiceDir /var/lib/tor/hidden_service/{{service}}
 {% for ports in conf['ports'] %}
 # PORT {{service}} {{ports[0]}}
-HiddenServicePort {{ports[0]}} {{conf['ip']}}:{{ports[1]}}
+HiddenServicePort {{ports[0]}} {{service}}:{{ports[1]}}
 {% endfor %}
 {% endfor %}