2023-05-22 Fred Gleason <[email protected]>

* Removed 'conf/firewalld.sh'. Signed-off-by: Fred Gleason <[email protected]>
ElvishArtisan · May 22, 2023 · 3f59bc0 · 3f59bc0
1 parent aa35a6f
commit 3f59bc0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 44 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -24147,3 +24147,5 @@
 	resizeable.
 2023-05-21 Fred Gleason <[email protected]>
 	* Added a 'rivendell' service for firewalld(1).
+2023-05-22 Fred Gleason <[email protected]>
+	* Removed 'conf/firewalld.sh'.
diff --git a/conf/Makefile.am b/conf/Makefile.am
@@ -25,16 +25,13 @@ install-exec-am:
 	cp @RIVENDELL_PAM_FILE@ $(DESTDIR)/etc/pam.d/rivendell
 	mkdir -p $(DESTDIR)/usr/lib/firewalld/services
 	cp rivendell-firewalld.xml $(DESTDIR)/usr/lib/firewalld/services/rivendell.xml
-	./firewalld.sh reload
 
 uninstall:	
 	rm -f $(DESTDIR)/$(sysconfdir)/rd-bin.conf
 	rm -f $(DESTDIR)/etc/pam.d/rivendell
 	rm -f $(DESTDIR)/usr/lib/firewalld/services/rivendell.xml
-	./firewalld.sh reload
 
 EXTRA_DIST = asound.conf-sample\
-             firewalld.sh\
              logrotate-sample\
              rd-bin.conf.in\
              rd.conf-sample\

diff --git a/conf/firewalld.sh b/conf/firewalld.sh