From 3f59bc06e5b576e8f45ca09070759038ebe8cb60 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Mon, 22 May 2023 10:21:41 -0400 Subject: [PATCH] 2023-05-22 Fred Gleason * Removed 'conf/firewalld.sh'. Signed-off-by: Fred Gleason --- ChangeLog | 2 ++ conf/Makefile.am | 3 --- conf/firewalld.sh | 41 ----------------------------------------- 3 files changed, 2 insertions(+), 44 deletions(-) delete mode 100755 conf/firewalld.sh diff --git a/ChangeLog b/ChangeLog index 50fdd873e..acdd340e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24147,3 +24147,5 @@ resizeable. 2023-05-21 Fred Gleason * Added a 'rivendell' service for firewalld(1). +2023-05-22 Fred Gleason + * Removed 'conf/firewalld.sh'. diff --git a/conf/Makefile.am b/conf/Makefile.am index 54d01369b..4a6041643 100644 --- 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 deleted file mode 100755 index 437a42521..000000000 --- a/conf/firewalld.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -# firewalld.sh -# -# Control firewalld -# -# (C) Copyright 2023 Fred Gleason -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# - -OPERATION=$1 - -if test $UID -eq 0 ; then - if test -z $FAKEROOTKEY ; then - if test $OPERATION = "reload" ; then - /bin/systemctl reload firewalld - fi - if test $OPERATION = "add" ; then - /bin/firewall-cmd --zone=public --add-service=rivendell --permanent - /bin/firewall-cmd --zone=work --add-service=rivendell --permanent - /bin/firewall-cmd --zone=home --add-service=rivendell --permanent - fi - if test $OPERATION = "remove" ; then - /bin/firewall-cmd --zone=public --remove-service=rivendell --permanent - /bin/firewall-cmd --zone=work --remove-service=rivendell --permanent - /bin/firewall-cmd --zone=home --remove-service=rivendell --permanent - fi - fi -fi