From: Bruno Victal <mirai@makinata.eu>
To: Saku Laesvuori <saku@laesvuori.fi>
Cc: "Thomas Ieong" <th.ieong@free.fr>,
"Ludovic Courtès" <ludo@gnu.org>,
"Felix Lechner" <felix.lechner@lease-up.com>,
61740@debbugs.gnu.org
Subject: [bug#61740] [PATCH v4] services: Add rspamd-service-type. (was [bug#61740] [PATCH v3] services: Add rspamd-service-type.)
Date: Mon, 11 Dec 2023 19:19:38 +0000 [thread overview]
Message-ID: <cf2b94ce-b33d-43b7-960a-d01ddfea9014@makinata.eu> (raw)
In-Reply-To: <4xf4fec5gensjq534b7iyxpxlfg4foinwyls3mvwigubs3vagj@sujka7hlplro>
[-- Attachment #1.1: Type: text/plain, Size: 3796 bytes --]
Hi Saku,
On 2023-12-08 08:17, Saku Laesvuori wrote:
> On Wed, Dec 06, 2023 at 02:58:19PM +0000, Bruno Victal wrote:
>> On 2023-09-16 21:10, Saku Laesvuori wrote:
>>> + "--var" (string-append "LOCAL_CONFDIR=" #$local-confdir)
>>
>> Curiously I don't see this listed in the 'rspamd' manpage although
>> it is on the 'rspamadm' one. Can you confirm whether this works
>> and if so, report to upstream that their docs are missing this?
>
> It does work; I've used it since before I submitted this patch. The
> `--var` option is listed on `rspamd --help`. Unfortunately, Rspamd
> tracks their issues on Github and I'd prefer not registering an account
> there.
Forwarded with [1].
>>> + (service-extension profile-service-type
>>> + (compose list rspamd-configuration-package))
>>
>> What's the motivation for adding the rspamd package to the profile?
>
> That was also there when I picked up this patch. I assume it is added to
> the profile so that the `rspamadm` and `rspamc` programs are available
> and compatible with the daemon. I don't have strong feelings about this
> in either direction.
I think it's better to omit this, users who are interested in the tools
can use 'guix shell rspamd'.
> +(define (list-of-symbols? x)
> + (and (list? x)
> + (every symbol? x)))
list-of-symbols? is already defined in (gnu services configuration),
you can omit this.
> + (shepherd-action
> + (name 'reopenlog)
> + (documentation "Reopen log files.")
Missed this in my previous reply, I'd prefer naming this action as
'reopen instead.
> +(define %rspamd-os
> + (simple-operating-system
> + (service dhcp-client-service-type)
[…]
> + (service rspamd-service-type
> + (rspamd-configuration
> + (shepherd-requirements '(networking))
> + (local.d-files `(("worker-controller.inc"
> + ,(plain-file
> + "rspamd-public-web-controller.conf"
> + "bind_socket = \"0.0.0.0:11334\";"))))))))
I wonder if you could remove dhcp-client-service-type and use the
loopback device for this test instead, by binding to '[::1]' or '127.0.0.1'.
(You don't need to add %loopback-static-networking here since it is already
included in %base-services.)
> +(define (run-rspamd-test)
> + "Return a test of an OS running Rspamd service."
> +
> + (define rspamd-ports
> + '((22668 . 11334))) ;; web controller
[…]
> +
> + (define vm
> + (virtual-machine
> + (operating-system (marionette-operating-system
> + %rspamd-os
> + #:imported-modules '((gnu services herd))))
> + (port-forwardings rspamd-ports)))
[…]
> + ;; Check that we can access the web ui
> +
> + (test-equal "http-get"
> + 200
> + (response-code (http-get "http://localhost:22668/"))) ; HEAD is unsupported
Actually I've realized that these port-forwards are unnecessary
and it would be better to instead do:
--8<---------------cut here---------------start------------->8---
;; Note: remove (web client) and (web response) in the imports above
;; i.e. after the #~(begin (use-modules …
(test-equal "http-get"
200
(marionette-eval
'(begin
(use-modules (web client)
(web response))
(response-code (http-head "http://localhost:11334/")))
marionette))
--8<---------------cut here---------------end--------------->8---
[1]: <https://github.com/rspamd/rspamd/issues/4736>
--
Furthermore, I consider that nonfree software must be eradicated.
Cheers,
Bruno.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
next prev parent reply other threads:[~2023-12-11 19:21 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-23 20:16 [bug#61740] [PATCH] services: Add rspamd-service-type Thomas Ieong
2023-02-25 21:33 ` Bruno Victal
2023-08-08 15:34 ` Ludovic Courtès
2023-09-05 19:06 ` Saku Laesvuori via Guix-patches via
2023-09-15 20:47 ` Felix Lechner via Guix-patches via
2023-09-16 20:10 ` Saku Laesvuori via Guix-patches via
2023-12-06 14:58 ` [bug#61740] [PATCH v3] services: Add rspamd-service-type. (was [bug#61740] [PATCH] services: Add rspamd-service-type.) Bruno Victal
2023-12-08 8:17 ` Saku Laesvuori via Guix-patches via
2023-12-11 19:19 ` Bruno Victal [this message]
2023-12-12 6:58 ` [bug#61740] [PATCH v5] services: Add rspamd-service-type (was [PATCH v4] " Saku Laesvuori via Guix-patches via
2023-12-14 22:09 ` bug#61740: " Ludovic Courtès
2023-12-01 3:11 ` [bug#61740] [PATCH] services: Add rspamd-service-type Felix Lechner via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cf2b94ce-b33d-43b7-960a-d01ddfea9014@makinata.eu \
--to=mirai@makinata.eu \
--cc=61740@debbugs.gnu.org \
--cc=felix.lechner@lease-up.com \
--cc=ludo@gnu.org \
--cc=saku@laesvuori.fi \
--cc=th.ieong@free.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.