From f26c027f1db489018c724a192309b93a8d8357c0 Mon Sep 17 00:00:00 2001
From: Victor Shyba <victor1984@riseup.net>
Date: Fri, 25 Aug 2017 05:13:00 -0300
Subject: [pkg] move server.tac to server src folder

This way the file gets copied during package install.

-- Related: #8867
---
 pkg/server.tac                     | 35 -----------------------------------
 src/leap/soledad/server/server.tac | 35 +++++++++++++++++++++++++++++++++++
 testing/tests/server/test_tac.py   |  4 ++--
 3 files changed, 37 insertions(+), 37 deletions(-)
 delete mode 100644 pkg/server.tac
 create mode 100644 src/leap/soledad/server/server.tac

diff --git a/pkg/server.tac b/pkg/server.tac
deleted file mode 100644
index 1bc3dc69..00000000
--- a/pkg/server.tac
+++ /dev/null
@@ -1,35 +0,0 @@
-import os
-
-from twisted.application import service, strports
-from twisted.web import server
-
-from leap.soledad.server import entrypoint
-
-application = service.Application('soledad-server')
-
-# local entrypoint
-local_description = 'tcp:2323:interface=127.0.0.1'
-local_site = server.Site(entrypoint.LocalServicesEntrypoint())
-
-local_server = strports.service(local_description, local_site)
-local_server.setServiceParent(application)
-
-# public entrypoint
-port = os.getenv('HTTPS_PORT', None)
-if port:
-    privateKey = os.getenv('PRIVKEY_PATH', '/etc/soledad/soledad-server.key')
-    certKey = os.getenv('CERT_PATH', '/etc/soledad/soledad-server.pem')
-    sslmethod = os.getenv('SSL_METHOD', 'SSLv23_METHOD')
-
-    public_description = ':'.join([
-        'ssl',
-        'port=' + str(port),
-        'privateKey=' + privateKey,
-        'certKey=' + certKey,
-        'sslmethod=' + sslmethod])
-else:
-    public_description = 'tcp:port=2424:interface=0.0.0.0'
-public_site = server.Site(entrypoint.SoledadEntrypoint())
-
-public_server = strports.service(public_description, public_site)
-public_server.setServiceParent(application)
diff --git a/src/leap/soledad/server/server.tac b/src/leap/soledad/server/server.tac
new file mode 100644
index 00000000..1bc3dc69
--- /dev/null
+++ b/src/leap/soledad/server/server.tac
@@ -0,0 +1,35 @@
+import os
+
+from twisted.application import service, strports
+from twisted.web import server
+
+from leap.soledad.server import entrypoint
+
+application = service.Application('soledad-server')
+
+# local entrypoint
+local_description = 'tcp:2323:interface=127.0.0.1'
+local_site = server.Site(entrypoint.LocalServicesEntrypoint())
+
+local_server = strports.service(local_description, local_site)
+local_server.setServiceParent(application)
+
+# public entrypoint
+port = os.getenv('HTTPS_PORT', None)
+if port:
+    privateKey = os.getenv('PRIVKEY_PATH', '/etc/soledad/soledad-server.key')
+    certKey = os.getenv('CERT_PATH', '/etc/soledad/soledad-server.pem')
+    sslmethod = os.getenv('SSL_METHOD', 'SSLv23_METHOD')
+
+    public_description = ':'.join([
+        'ssl',
+        'port=' + str(port),
+        'privateKey=' + privateKey,
+        'certKey=' + certKey,
+        'sslmethod=' + sslmethod])
+else:
+    public_description = 'tcp:port=2424:interface=0.0.0.0'
+public_site = server.Site(entrypoint.SoledadEntrypoint())
+
+public_server = strports.service(public_description, public_site)
+public_server.setServiceParent(application)
diff --git a/testing/tests/server/test_tac.py b/testing/tests/server/test_tac.py
index 3fa4e064..e825a9ce 100644
--- a/testing/tests/server/test_tac.py
+++ b/testing/tests/server/test_tac.py
@@ -26,14 +26,14 @@ import socket
 import pytest
 import treq
 
+from pkg_resources import resource_filename
 from twisted.trial import unittest
 from twisted.internet import defer, reactor
 from twisted.internet.protocol import ProcessProtocol
 from twisted.web.client import Agent
 
 
-TAC_FILE_PATH = ('..', '..', '..', '..', 'pkg', 'server.tac')
-TAC_FILE_PATH = os.path.abspath(os.path.join(__file__, *TAC_FILE_PATH))
+TAC_FILE_PATH = resource_filename('leap.soledad.server', 'server.tac')
 
 
 class TacServerTestCase(unittest.TestCase):
-- 
cgit v1.2.3