From 6dd45ced78a8a3cd07885af21def407ab54d19f7 Mon Sep 17 00:00:00 2001 From: Alon Bar-Lev Date: Tue, 1 Jan 2019 00:07:49 +0200 Subject: net-firewall/firehol: rename initd/confd files Signed-off-by: Alon Bar-Lev Package-Manager: Portage-2.3.51, Repoman-2.3.11 --- net-firewall/firehol/files/firehol.conf.d | 2 - net-firewall/firehol/files/firehol.confd | 2 + net-firewall/firehol/files/firehol.initd | 66 ++++++++++++++++++++++++++++ net-firewall/firehol/files/firehol.initrd | 66 ---------------------------- net-firewall/firehol/files/fireqos.conf.d | 2 - net-firewall/firehol/files/fireqos.confd | 2 + net-firewall/firehol/files/fireqos.initd | 44 +++++++++++++++++++ net-firewall/firehol/files/fireqos.initrd | 44 ------------------- net-firewall/firehol/firehol-3.1.3-r1.ebuild | 10 ++--- net-firewall/firehol/firehol-3.1.3.ebuild | 10 ++--- net-firewall/firehol/firehol-3.1.4.ebuild | 8 ++-- net-firewall/firehol/firehol-3.1.6.ebuild | 8 ++-- 12 files changed, 132 insertions(+), 132 deletions(-) delete mode 100644 net-firewall/firehol/files/firehol.conf.d create mode 100644 net-firewall/firehol/files/firehol.confd create mode 100644 net-firewall/firehol/files/firehol.initd delete mode 100644 net-firewall/firehol/files/firehol.initrd delete mode 100644 net-firewall/firehol/files/fireqos.conf.d create mode 100644 net-firewall/firehol/files/fireqos.confd create mode 100644 net-firewall/firehol/files/fireqos.initd delete mode 100644 net-firewall/firehol/files/fireqos.initrd diff --git a/net-firewall/firehol/files/firehol.conf.d b/net-firewall/firehol/files/firehol.conf.d deleted file mode 100644 index c8b06e0eaf09..000000000000 --- a/net-firewall/firehol/files/firehol.conf.d +++ /dev/null @@ -1,2 +0,0 @@ -#Locate of FireHOL conf file -FIREHOL_CONF="/etc/firehol/firehol.conf" diff --git a/net-firewall/firehol/files/firehol.confd b/net-firewall/firehol/files/firehol.confd new file mode 100644 index 000000000000..c8b06e0eaf09 --- /dev/null +++ b/net-firewall/firehol/files/firehol.confd @@ -0,0 +1,2 @@ +#Locate of FireHOL conf file +FIREHOL_CONF="/etc/firehol/firehol.conf" diff --git a/net-firewall/firehol/files/firehol.initd b/net-firewall/firehol/files/firehol.initd new file mode 100644 index 000000000000..719f336c46f1 --- /dev/null +++ b/net-firewall/firehol/files/firehol.initd @@ -0,0 +1,66 @@ +#!/sbin/openrc-run +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +extra_commands="save panic try" +extra_started_commands="reload" + +depend() { + need localmount + after bootmisc + before net + provide firewall +} + +checkrules() { + if [ ! -f ${FIREHOL_CONF} ]; then + eerror "Not starting FireHOL. Create ${FIREHOL_CONF}" + eerror "and fill it with some rules." + eerror "man firehol.conf for more info." + return 1 + fi +} + +start() { + checkrules || return 1 + ebegin "Starting FireHOL" + /usr/sbin/firehol ${FIREHOL_CONF} start > /dev/null + eend $? +} + +stop() { + ebegin "Stopping FireHOL" + /usr/sbin/firehol stop > /dev/null + eend $? +} + +restart() { + ebegin "Restarting Firewall" + svc_stop; + svc_start; + eend $? +} + +try() { + ebegin "Trying FireHOL configuration" + /usr/sbin/firehol ${FIREHOL_CONF} try + eend $? +} + +status() { + ebegin "Showing FireHOL status" + /usr/sbin/firehol status + eend $? +} + +panic() { + ebegin "FireHOL PANIC" + /usr/sbin/firehol panic + eend $? +} + +save() { + ebegin "Saving FireHOL configuration" + /usr/sbin/firehol save + eend $? +} diff --git a/net-firewall/firehol/files/firehol.initrd b/net-firewall/firehol/files/firehol.initrd deleted file mode 100644 index 05fc3a2f11c0..000000000000 --- a/net-firewall/firehol/files/firehol.initrd +++ /dev/null @@ -1,66 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_commands="save panic try" -extra_started_commands="reload" - -depend() { - need localmount - after bootmisc - before net - provide firewall -} - -checkrules() { - if [ ! -f ${FIREHOL_CONF} ]; then - eerror "Not starting FireHOL. Create ${FIREHOL_CONF}" - eerror "and fill it with some rules." - eerror "man firehol.conf for more info." - return 1 - fi -} - -start() { - checkrules || return 1 - ebegin "Starting FireHOL" - /usr/sbin/firehol ${FIREHOL_CONF} start > /dev/null - eend $? -} - -stop() { - ebegin "Stopping FireHOL" - /usr/sbin/firehol stop > /dev/null - eend $? -} - -restart() { - ebegin "Restarting Firewall" - svc_stop; - svc_start; - eend $? -} - -try() { - ebegin "Trying FireHOL configuration" - /usr/sbin/firehol ${FIREHOL_CONF} try - eend $? -} - -status() { - ebegin "Showing FireHOL status" - /usr/sbin/firehol status - eend $? -} - -panic() { - ebegin "FireHOL PANIC" - /usr/sbin/firehol panic - eend $? -} - -save() { - ebegin "Saving FireHOL configuration" - /usr/sbin/firehol save - eend $? -} diff --git a/net-firewall/firehol/files/fireqos.conf.d b/net-firewall/firehol/files/fireqos.conf.d deleted file mode 100644 index 55fa2e037e01..000000000000 --- a/net-firewall/firehol/files/fireqos.conf.d +++ /dev/null @@ -1,2 +0,0 @@ -#Locate of FireQOS conf file -FIREQOS="/etc/firehol/fireqos.conf" diff --git a/net-firewall/firehol/files/fireqos.confd b/net-firewall/firehol/files/fireqos.confd new file mode 100644 index 000000000000..55fa2e037e01 --- /dev/null +++ b/net-firewall/firehol/files/fireqos.confd @@ -0,0 +1,2 @@ +#Locate of FireQOS conf file +FIREQOS="/etc/firehol/fireqos.conf" diff --git a/net-firewall/firehol/files/fireqos.initd b/net-firewall/firehol/files/fireqos.initd new file mode 100644 index 000000000000..de94ce9840e5 --- /dev/null +++ b/net-firewall/firehol/files/fireqos.initd @@ -0,0 +1,44 @@ +#!/sbin/openrc-run +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +depend() { + need localmount + after bootmisc + before net +} + +checkrules() { + if [ ! -f ${FIREQOS_CONF} ]; then + eerror "Not starting FireQOS. Create ${FIREQOS_CONF}" + eerror "and fill it with some rules." + eerror "man fireqos.conf for more info." + return 1 + fi +} + +start() { + checkrules || return 1 + ebegin "Starting FireQOS" + /usr/sbin/fireqos start ${FIREQOS_CONF} -- ${FIREQOS_EXTRA_ARGS} > /dev/null + eend $? +} + +stop() { + ebegin "Stopping FireQOS" + /usr/sbin/fireqos stop > /dev/null + eend $? +} + +restart() { + ebegin "Restarting FireQOS" + svc_stop; + svc_start; + eend $? +} + +status() { + ebegin "Showing FireQOS status" + /usr/sbin/fireqos status + eend $? +} diff --git a/net-firewall/firehol/files/fireqos.initrd b/net-firewall/firehol/files/fireqos.initrd deleted file mode 100644 index 628cc9d3c4a1..000000000000 --- a/net-firewall/firehol/files/fireqos.initrd +++ /dev/null @@ -1,44 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need localmount - after bootmisc - before net -} - -checkrules() { - if [ ! -f ${FIREQOS_CONF} ]; then - eerror "Not starting FireQOS. Create ${FIREQOS_CONF}" - eerror "and fill it with some rules." - eerror "man fireqos.conf for more info." - return 1 - fi -} - -start() { - checkrules || return 1 - ebegin "Starting FireQOS" - /usr/sbin/fireqos start ${FIREQOS_CONF} -- ${FIREQOS_EXTRA_ARGS} > /dev/null - eend $? -} - -stop() { - ebegin "Stopping FireQOS" - /usr/sbin/fireqos stop > /dev/null - eend $? -} - -restart() { - ebegin "Restarting FireQOS" - svc_stop; - svc_start; - eend $? -} - -status() { - ebegin "Showing FireQOS status" - /usr/sbin/fireqos status - eend $? -} diff --git a/net-firewall/firehol/firehol-3.1.3-r1.ebuild b/net-firewall/firehol/firehol-3.1.3-r1.ebuild index 866cded9cb60..db92d61855d5 100644 --- a/net-firewall/firehol/firehol-3.1.3-r1.ebuild +++ b/net-firewall/firehol/firehol-3.1.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -57,8 +57,8 @@ src_configure() { src_install() { default - newconfd "${FILESDIR}"/firehol.conf.d firehol - newinitd "${FILESDIR}"/firehol.initrd firehol - newconfd "${FILESDIR}"/fireqos.conf.d fireqos - newinitd "${FILESDIR}"/fireqos.initrd fireqos + newconfd "${FILESDIR}"/firehol.confd firehol + newinitd "${FILESDIR}"/firehol.initd firehol + newconfd "${FILESDIR}"/fireqos.confd fireqos + newinitd "${FILESDIR}"/fireqos.initd fireqos } diff --git a/net-firewall/firehol/firehol-3.1.3.ebuild b/net-firewall/firehol/firehol-3.1.3.ebuild index b153a88c3196..11a79fd5b628 100644 --- a/net-firewall/firehol/firehol-3.1.3.ebuild +++ b/net-firewall/firehol/firehol-3.1.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -54,8 +54,8 @@ src_configure() { src_install() { default - newconfd "${FILESDIR}"/firehol.conf.d firehol - newinitd "${FILESDIR}"/firehol.initrd firehol - newconfd "${FILESDIR}"/fireqos.conf.d fireqos - newinitd "${FILESDIR}"/fireqos.initrd fireqos + newconfd "${FILESDIR}"/firehol.confd firehol + newinitd "${FILESDIR}"/firehol.initd firehol + newconfd "${FILESDIR}"/fireqos.confd fireqos + newinitd "${FILESDIR}"/fireqos.initd fireqos } diff --git a/net-firewall/firehol/firehol-3.1.4.ebuild b/net-firewall/firehol/firehol-3.1.4.ebuild index 67745a1203cb..d9c5fb2ca8de 100644 --- a/net-firewall/firehol/firehol-3.1.4.ebuild +++ b/net-firewall/firehol/firehol-3.1.4.ebuild @@ -57,8 +57,8 @@ src_configure() { src_install() { default - newconfd "${FILESDIR}"/firehol.conf.d firehol - newinitd "${FILESDIR}"/firehol.initrd firehol - newconfd "${FILESDIR}"/fireqos.conf.d fireqos - newinitd "${FILESDIR}"/fireqos.initrd fireqos + newconfd "${FILESDIR}"/firehol.confd firehol + newinitd "${FILESDIR}"/firehol.initd firehol + newconfd "${FILESDIR}"/fireqos.confd fireqos + newinitd "${FILESDIR}"/fireqos.initd fireqos } diff --git a/net-firewall/firehol/firehol-3.1.6.ebuild b/net-firewall/firehol/firehol-3.1.6.ebuild index 626180343e17..8bddf14115b7 100644 --- a/net-firewall/firehol/firehol-3.1.6.ebuild +++ b/net-firewall/firehol/firehol-3.1.6.ebuild @@ -60,8 +60,8 @@ src_configure() { src_install() { default - newconfd "${FILESDIR}"/firehol.conf.d firehol - newinitd "${FILESDIR}"/firehol.initrd firehol - newconfd "${FILESDIR}"/fireqos.conf.d fireqos - newinitd "${FILESDIR}"/fireqos.initrd fireqos + newconfd "${FILESDIR}"/firehol.confd firehol + newinitd "${FILESDIR}"/firehol.initd firehol + newconfd "${FILESDIR}"/fireqos.confd fireqos + newinitd "${FILESDIR}"/fireqos.initd fireqos } -- cgit v1.2.3-65-gdbad