From c2f08642c0544e52664d21b67e24a36edb154f53 Mon Sep 17 00:00:00 2001
From: Hamish Coleman <hamish@zot.org>
Date: Mon, 28 Aug 2023 13:25:53 +0100
Subject: [PATCH] Remove unneeded templating of systemd units

---
 .gitignore                                                    | 4 ----
 packages/debian/configure.in                                  | 4 ----
 .../system/{edge-ntopng@.service.in => edge-ntopng@.service}  | 0
 packages/etc/systemd/system/{edge.service.in => edge.service} | 0
 .../etc/systemd/system/{edge@.service.in => edge@.service}    | 0
 .../system/{supernode.service.in => supernode.service}        | 0
 packages/rpm/configure.in                                     | 4 ----
 7 files changed, 12 deletions(-)
 rename packages/etc/systemd/system/{edge-ntopng@.service.in => edge-ntopng@.service} (100%)
 rename packages/etc/systemd/system/{edge.service.in => edge.service} (100%)
 rename packages/etc/systemd/system/{edge@.service.in => edge@.service} (100%)
 rename packages/etc/systemd/system/{supernode.service.in => supernode.service} (100%)

diff --git a/.gitignore b/.gitignore
index 4e4832a..d2eade0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,10 +26,6 @@ build
 .vs
 packages/debian/debian/control
 packages/debian/debian/files
-packages/etc/systemd/system/edge-ntopng@.service
-packages/etc/systemd/system/edge.service
-packages/etc/systemd/system/edge@.service
-packages/etc/systemd/system/supernode.service
 *dSYM*
 
 __pycache__
diff --git a/packages/debian/configure.in b/packages/debian/configure.in
index 7086093..1dbfef5 100644
--- a/packages/debian/configure.in
+++ b/packages/debian/configure.in
@@ -37,9 +37,5 @@ AC_SUBST(EXTN)
 
 AC_CONFIG_FILES(debian/files)
 AC_CONFIG_FILES(debian/control)
-AC_CONFIG_FILES(../etc/systemd/system/edge.service)
-AC_CONFIG_FILES(../etc/systemd/system/edge@.service)
-AC_CONFIG_FILES(../etc/systemd/system/edge-ntopng@.service)
-AC_CONFIG_FILES(../etc/systemd/system/supernode.service)
 AC_CONFIG_FILES(Makefile)
 AC_OUTPUT
diff --git a/packages/etc/systemd/system/edge-ntopng@.service.in b/packages/etc/systemd/system/edge-ntopng@.service
similarity index 100%
rename from packages/etc/systemd/system/edge-ntopng@.service.in
rename to packages/etc/systemd/system/edge-ntopng@.service
diff --git a/packages/etc/systemd/system/edge.service.in b/packages/etc/systemd/system/edge.service
similarity index 100%
rename from packages/etc/systemd/system/edge.service.in
rename to packages/etc/systemd/system/edge.service
diff --git a/packages/etc/systemd/system/edge@.service.in b/packages/etc/systemd/system/edge@.service
similarity index 100%
rename from packages/etc/systemd/system/edge@.service.in
rename to packages/etc/systemd/system/edge@.service
diff --git a/packages/etc/systemd/system/supernode.service.in b/packages/etc/systemd/system/supernode.service
similarity index 100%
rename from packages/etc/systemd/system/supernode.service.in
rename to packages/etc/systemd/system/supernode.service
diff --git a/packages/rpm/configure.in b/packages/rpm/configure.in
index e65d3c0..a10a389 100644
--- a/packages/rpm/configure.in
+++ b/packages/rpm/configure.in
@@ -48,9 +48,5 @@ AC_SUBST(DATE)
 AC_SUBST(RPM_SIGN_CMD)
 
 AC_CONFIG_FILES(n2n.spec)
-AC_CONFIG_FILES(../etc/systemd/system/edge.service)
-AC_CONFIG_FILES(../etc/systemd/system/edge@.service)
-AC_CONFIG_FILES(../etc/systemd/system/edge-ntopng@.service)
-AC_CONFIG_FILES(../etc/systemd/system/supernode.service)
 AC_CONFIG_FILES(Makefile)
 AC_OUTPUT