From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthias Fischer To: development@lists.ipfire.org Subject: Re: [PATCH] monit: Modified default install/uninstall script Date: Wed, 04 Aug 2021 19:05:54 +0200 Message-ID: <07de4302-80e4-f5aa-edca-88f370d6d493@ipfire.org> In-Reply-To: <5297BDAC-8E3D-48EE-84F7-E5B7CFC786E9@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5044205386415908196==" List-Id: --===============5044205386415908196== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable On 04.08.2021 16:19, Michael Tremer wrote: > Hello, >=20 >> On 1 Aug 2021, at 17:45, Matthias Fischer = wrote: >>=20 >> This is a proposed patch, altering the install and uninstall script for 'm= onit'. >>=20 >> It alters '/srv/web/ipfire/cgi-bin/logs.cgi/log.dat', so that all 'monit' = log entries >> can be seen through the web gui under "System Logs". >>=20 >> Perhaps a bit rough, if someone has a better/easier solution, feel free to= jump in. >=20 > Yes, I believe it is a bit rough. As I thought... ;-) > Why wouldn=E2=80=99t we add the monit entry to the CGI file as usual? There is no CGI file... ;-) > It is a bit ugly if there are plenty of entries for add-ons, but I suppose = that is better than patching the file like this. Thats why I added a 'sed' string for uninstalling. Had no better idea yet. Best, Matthias > -Michael >=20 >> Signed-off-by: Matthias Fischer >> --- >> src/paks/monit/install.sh | 32 ++++++++++++++++++++++++++++++++ >> src/paks/monit/uninstall.sh | 31 +++++++++++++++++++++++++++++++ >> src/paks/monit/update.sh | 27 +++++++++++++++++++++++++++ >> 3 files changed, 90 insertions(+) >> create mode 100644 src/paks/monit/install.sh >> create mode 100644 src/paks/monit/uninstall.sh >> create mode 100644 src/paks/monit/update.sh >>=20 >> diff --git a/src/paks/monit/install.sh b/src/paks/monit/install.sh >> new file mode 100644 >> index 000000000..8a2823ba5 >> --- /dev/null >> +++ b/src/paks/monit/install.sh >> @@ -0,0 +1,32 @@ >> +#!/bin/bash >> +#########################################################################= ### >> +# = # >> +# This file is part of the IPFire Firewall. = # >> +# = # >> +# IPFire is free software; you can redistribute it and/or modify = # >> +# it under the terms of the GNU General Public License as published by = # >> +# the Free Software Foundation; either version 2 of the License, or = # >> +# (at your option) any later version. = # >> +# = # >> +# IPFire 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 IPFire; if not, write to the Free Software = # >> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US= A # >> +# = # >> +# Copyright (C) 2007 IPFire-Team . = # >> +# = # >> +#########################################################################= ### >> +# >> +. /opt/pakfire/lib/functions.sh >> +extract_files >> +restore_backup ${NAME} >> + >> +# Patch '/srv/web/ipfire/cgi-bin/logs.cgi/log.dat' to show monit entries >> +sed -i "/.*'kernel' =3D> '(kernel: (?!DROP_))',/a \ 'monit' =3D> '= (monit\[.*\]: )'," /srv/web/ipfire/cgi-bin/logs.cgi/log.dat >> +sed -i "/.*'kernel' =3D> \"\$Lang::tr{'kernel'}\",/a \ 'monit' =3D= > 'Monit'," /srv/web/ipfire/cgi-bin/logs.cgi/log.dat >> + >> +start_service --background ${NAME} >> diff --git a/src/paks/monit/uninstall.sh b/src/paks/monit/uninstall.sh >> new file mode 100644 >> index 000000000..8431d4a39 >> --- /dev/null >> +++ b/src/paks/monit/uninstall.sh >> @@ -0,0 +1,31 @@ >> +#!/bin/bash >> +#########################################################################= ### >> +# = # >> +# This file is part of the IPFire Firewall. = # >> +# = # >> +# IPFire is free software; you can redistribute it and/or modify = # >> +# it under the terms of the GNU General Public License as published by = # >> +# the Free Software Foundation; either version 2 of the License, or = # >> +# (at your option) any later version. = # >> +# = # >> +# IPFire 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 IPFire; if not, write to the Free Software = # >> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US= A # >> +# = # >> +# Copyright (C) 2007 IPFire-Team . = # >> +# = # >> +#########################################################################= ### >> +# >> +. /opt/pakfire/lib/functions.sh >> +stop_service ${NAME} >> +make_backup ${NAME} >> + >> +# Remove monit entries from '/srv/web/ipfire/cgi-bin/logs.cgi/log.dat' >> +sed -i "/'monit'/d" /srv/web/ipfire/cgi-bin/logs.cgi/log.dat >> + >> +remove_files >> diff --git a/src/paks/monit/update.sh b/src/paks/monit/update.sh >> new file mode 100644 >> index 000000000..99776659c >> --- /dev/null >> +++ b/src/paks/monit/update.sh >> @@ -0,0 +1,27 @@ >> +#!/bin/bash >> +#########################################################################= ### >> +# = # >> +# This file is part of the IPFire Firewall. = # >> +# = # >> +# IPFire is free software; you can redistribute it and/or modify = # >> +# it under the terms of the GNU General Public License as published by = # >> +# the Free Software Foundation; either version 2 of the License, or = # >> +# (at your option) any later version. = # >> +# = # >> +# IPFire 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 IPFire; if not, write to the Free Software = # >> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US= A # >> +# = # >> +# Copyright (C) 2007-2020 IPFire-Team . = # >> +# = # >> +#########################################################################= ### >> +# >> +. /opt/pakfire/lib/functions.sh >> +extract_backup_includes >> +./uninstall.sh >> +./install.sh >> --=20 >> 2.18.0 >>=20 >=20 --===============5044205386415908196==--