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: Thu, 05 Aug 2021 18:58:07 +0200 Message-ID: In-Reply-To: <540369A2-F0E8-4A96-BB10-1C9DC2FD4E4B@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2215007006791587935==" List-Id: --===============2215007006791587935== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi, On 05.08.2021 11:23, Michael Tremer wrote: >=20 >=20 >> On 4 Aug 2021, at 19:05, Matthias Fischer = wrote: >>=20 >> 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 = 'monit'. >>>>=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. >>=20 >> As I thought... ;-) >>=20 >>> Why wouldn=E2=80=99t we add the monit entry to the CGI file as usual? >>=20 >> There is no CGI file... ;-) >=20 > log.dat is a CGI file with just a funny name. Yep. I realized this about two minutes after answering... ;-) I'll make it that way. >>> It is a bit ugly if there are plenty of entries for add-ons, but I suppos= e that is better than patching the file like this. >>=20 >> Thats why I added a 'sed' string for uninstalling. Had no better idea yet. >=20 > This would remove anything that matches. It isn=E2=80=99t guaranteed that t= he file is correct. I thought that searching for the 'monit' string would avoid any inconveniences. There is nothing else that matches. Yet. But it's no problem for me - I can add the 'monit' strings to 'log.dat'. I just need some time, we had a lot of water around here these days, infrastructure is "on its knees" and days are short... >> Best, >> Matthias >>=20 >>> -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 = USA # >>>> +# = # >>>> +# 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 = USA # >>>> +# = # >>>> +# 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 = USA # >>>> +# = # >>>> +# Copyright (C) 2007-2020 IPFire-Team . = # >>>> +# = # >>>> +#######################################################################= ##### >>>> +# >>>> +. /opt/pakfire/lib/functions.sh >>>> +extract_backup_includes >>>> +./uninstall.sh >>>> +./install.sh >>>> --=20 >>>> 2.18.0 >>>>=20 >>>=20 >>=20 >=20 --===============2215007006791587935==--