Revert "Disable nether.service temporarily for high memory usage"

This reverts commit 66efb1d04bd6168ccc6b7466643d33fdd7a68efb.

Change-Id: I5fc6143c020ae58db2012d4f00f711bf60c68333

diff --git a/conf/CMakeLists.txt b/conf/CMakeLists.txt
index 8cabec6..26ddd72 100644 (file)
--- a/conf/CMakeLists.txt
+++ b/conf/CMakeLists.txt
@@ -18,10 +18,10 @@
 
 MESSAGE(STATUS "Installing config files")
 
-#CONFIGURE_FILE(systemd/nether.service.in systemd/nether.service)
+CONFIGURE_FILE(systemd/nether.service.in systemd/nether.service)
 
 INSTALL(FILES file.policy DESTINATION ${SYSCONF_INSTALL_DIR}/nether)
 INSTALL(FILES cynara.policy DESTINATION ${SYSCONF_INSTALL_DIR}/nether)
 INSTALL(FILES nether.rules DESTINATION ${SYSCONF_INSTALL_DIR}/nether)
-#INSTALL(FILES systemd/nether.service DESTINATION ${SYSTEMD_UNIT_DIR})
-#INSTALL(FILES systemd/nether.service DESTINATION ${SYSTEMD_UNIT_DIR}/multi-user.target.wants)
+INSTALL(FILES systemd/nether.service DESTINATION ${SYSTEMD_UNIT_DIR})
+INSTALL(FILES systemd/nether.service DESTINATION ${SYSTEMD_UNIT_DIR}/multi-user.target.wants)

diff --git a/packaging/nether.spec b/packaging/nether.spec
index cfaa011..38e1322 100644 (file)
--- a/packaging/nether.spec
+++ b/packaging/nether.spec
@@ -20,8 +20,8 @@ This is a network privilege enforcing service.
 %config %{_sysconfdir}/nether/file.policy
 %config %{_sysconfdir}/nether/nether.rules
 %config %{_sysconfdir}/nether/cynara.policy
-#%{_unitdir}/nether.service
-#%{_unitdir}/multi-user.target.wants/nether.service
+%{_unitdir}/nether.service
+%{_unitdir}/multi-user.target.wants/nether.service
 %prep
 %setup -q
 
@@ -50,19 +50,19 @@ rm -rf %{buildroot}
 %post
 # Refresh systemd services list after installation
 systemctl daemon-reload || :
-#if [ $1 == 1 ]; then
-#      systemctl start nether.service || :
-#fi
-#if [ $1 == 2 ]; then
-#      systemctl restart nether.service || :
-#fi
+if [ $1 == 1 ]; then
+       systemctl start nether.service || :
+fi
+if [ $1 == 2 ]; then
+       systemctl restart nether.service || :
+fi
 
 %preun
 # Stop the service before uninstall
-#if [ $1 == 0 ]; then
-#      systemctl stop nether.service || :
-#fi
+if [ $1 == 0 ]; then
+       systemctl stop nether.service || :
+fi
 
 %postun
 # Refresh systemd services list after uninstall/upgrade
-#systemctl daemon-reload || :
+systemctl daemon-reload || :