From 973e663eb096abca1ddb931a5723f815b0e8196b Mon Sep 17 00:00:00 2001
From: mycognosist <gnomad@cryptolab.net>
Date: Wed, 16 Dec 2020 12:43:05 +0000
Subject: [PATCH] Move conf files to template dir root

---
 conf/templates/{debian_repo => }/freight.conf      | 0
 conf/templates/{debian_repo => }/nginx_debian.conf | 0
 scripts/setup_debian_repo.py                       | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename conf/templates/{debian_repo => }/freight.conf (100%)
 rename conf/templates/{debian_repo => }/nginx_debian.conf (100%)

diff --git a/conf/templates/debian_repo/freight.conf b/conf/templates/freight.conf
similarity index 100%
rename from conf/templates/debian_repo/freight.conf
rename to conf/templates/freight.conf
diff --git a/conf/templates/debian_repo/nginx_debian.conf b/conf/templates/nginx_debian.conf
similarity index 100%
rename from conf/templates/debian_repo/nginx_debian.conf
rename to conf/templates/nginx_debian.conf
diff --git a/scripts/setup_debian_repo.py b/scripts/setup_debian_repo.py
index ffef7c3..c5a94ab 100644
--- a/scripts/setup_debian_repo.py
+++ b/scripts/setup_debian_repo.py
@@ -78,7 +78,7 @@ if args.initialize:
     print("[ CONFIGURING FREIGHT ]")
     freight_conf_tmp_path = os.path.join(USER_PATH, "freight.conf")
     render_template(
-        src="debian_repo/freight.conf",
+        src="freight.conf",
         dest=freight_conf_tmp_path,
         template_vars={
             "freight_lib_path": FREIGHT_LIB,
@@ -104,7 +104,7 @@ if args.initialize:
     print("[ COPYING NGINX CONFIG ]")
     nginx_conf_tmp_path = os.path.join(USER_PATH, "apt.peachcloud.org")
     render_template(
-        src="debian_repo/nginx_debian.conf",
+        src="nginx_debian.conf",
         dest=nginx_conf_tmp_path,
         template_vars = {
             "apt_dir": FREIGHT_CACHE