From beb1fd51c9ecb7094c9509ebd9de5c148ad5f13d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Loipf=C3=BChrer?= <michael.loipfuehrer@stusta.de>
Date: Sun, 15 Mar 2020 20:57:44 +0100
Subject: [PATCH] fix manifest again
---
MANIFEST.in | 3 +--
lustmolch/lustmolch.py | 2 +-
.../templates}/container/80-container-host0.network | 0
{templates => lustmolch/templates}/container/bootstrap.sh | 0
{templates => lustmolch/templates}/container/sshd_config | 0
.../templates}/host/80-container-ve.network | 0
{templates => lustmolch/templates}/host/nginx | 0
{templates => lustmolch/templates}/host/nspawn | 0
setup.py | 2 +-
9 files changed, 3 insertions(+), 4 deletions(-)
rename {templates => lustmolch/templates}/container/80-container-host0.network (100%)
rename {templates => lustmolch/templates}/container/bootstrap.sh (100%)
rename {templates => lustmolch/templates}/container/sshd_config (100%)
rename {templates => lustmolch/templates}/host/80-container-ve.network (100%)
rename {templates => lustmolch/templates}/host/nginx (100%)
rename {templates => lustmolch/templates}/host/nspawn (100%)
diff --git a/MANIFEST.in b/MANIFEST.in
index aa7779b..0334d08 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,2 @@
include README.md
-recursive-include templates/host *
-recursive-include templates/container *
+recursive-include lustmolch/templates *
diff --git a/lustmolch/lustmolch.py b/lustmolch/lustmolch.py
index 76f8a48..881faef 100755
--- a/lustmolch/lustmolch.py
+++ b/lustmolch/lustmolch.py
@@ -12,7 +12,7 @@ from .config import config, DEFAULT_TEMPLATE_DIR
logging.basicConfig(format='%(levelname)s:%(message)s', level=config['log_level'])
-env = Environment(loader=PackageLoader('lustmolch', str(Path(__file__).parent.parent / 'templates')))
+env = Environment(loader=PackageLoader('lustmolch', str(Path(__file__).parent / 'templates')))
cfg_template = namedtuple('cfg_template', ['source', 'path', 'filename'])
template_files_host = [
diff --git a/templates/container/80-container-host0.network b/lustmolch/templates/container/80-container-host0.network
similarity index 100%
rename from templates/container/80-container-host0.network
rename to lustmolch/templates/container/80-container-host0.network
diff --git a/templates/container/bootstrap.sh b/lustmolch/templates/container/bootstrap.sh
similarity index 100%
rename from templates/container/bootstrap.sh
rename to lustmolch/templates/container/bootstrap.sh
diff --git a/templates/container/sshd_config b/lustmolch/templates/container/sshd_config
similarity index 100%
rename from templates/container/sshd_config
rename to lustmolch/templates/container/sshd_config
diff --git a/templates/host/80-container-ve.network b/lustmolch/templates/host/80-container-ve.network
similarity index 100%
rename from templates/host/80-container-ve.network
rename to lustmolch/templates/host/80-container-ve.network
diff --git a/templates/host/nginx b/lustmolch/templates/host/nginx
similarity index 100%
rename from templates/host/nginx
rename to lustmolch/templates/host/nginx
diff --git a/templates/host/nspawn b/lustmolch/templates/host/nspawn
similarity index 100%
rename from templates/host/nspawn
rename to lustmolch/templates/host/nspawn
diff --git a/setup.py b/setup.py
index d1d5267..fd3a027 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
from setuptools import setup
-VERSION = '1.0.3'
+VERSION = '1.0.4'
AUTHOR = 'Michael Loipführer'
--
GitLab