From 2ce6d4beda1ec97d5463e265568b2ac09ba7ae82 Mon Sep 17 00:00:00 2001 From: apexliu Date: Mon, 17 Apr 2017 10:21:47 +0000 Subject: [PATCH] temp. --- build/build.py | 7 +++++++ config.ini.in | 1 + dist/server/script/main.py | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/build/build.py b/build/build.py index 5613ea0..cd45905 100644 --- a/build/build.py +++ b/build/build.py @@ -107,6 +107,13 @@ def clean_everything(): utils.remove(os.path.join(env.root_path, 'external', 'python')) utils.remove(os.path.join(env.root_path, 'external', 'libssh-win-static', 'lib')) utils.remove(os.path.join(env.root_path, 'external', 'libssh-win-static', 'src')) + utils.remove(os.path.join(env.root_path, 'external', 'linux', 'tmp')) + utils.remove(os.path.join(env.root_path, 'external', 'linux', 'release', 'lib', 'libmbedcrypto.a')) + utils.remove(os.path.join(env.root_path, 'external', 'linux', 'release', 'lib', 'libmbedtls.a')) + utils.remove(os.path.join(env.root_path, 'external', 'linux', 'release', 'lib', 'libmbedx509.a')) + utils.remove(os.path.join(env.root_path, 'external', 'linux', 'release', 'lib', 'libsqlite3.a')) + utils.remove(os.path.join(env.root_path, 'external', 'linux', 'release', 'lib', 'libssh.a')) + utils.remove(os.path.join(env.root_path, 'external', 'linux', 'release', 'lib', 'libuv.a')) def do_opt(opt): diff --git a/config.ini.in b/config.ini.in index 7146984..e8de23d 100644 --- a/config.ini.in +++ b/config.ini.in @@ -29,3 +29,4 @@ wget = C:\Program Files (x86)\wget\wget.exe # if not set cmake path, default to '/usr/bin/cmake' cmake = /opt/cmake/bin/cmake + diff --git a/dist/server/script/main.py b/dist/server/script/main.py index 3eac6d5..56c5b1a 100644 --- a/dist/server/script/main.py +++ b/dist/server/script/main.py @@ -517,7 +517,7 @@ class InstallerLinux(InstallerBase): def _fix_path(self): self._config_path = '/etc/teleport' - self._data_path = os.path.join('/var/teleport') + self._data_path = os.path.join('/var/lib/teleport') self._log_path = os.path.join('/var/log/teleport') def _copy_files(self):