From patchwork Sun Dec 18 23:01:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 45420 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C144627BBED; Sun, 18 Dec 2022 23:03:29 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9AE6827BBEB for ; Sun, 18 Dec 2022 23:03:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p72gT-00057j-TZ; Sun, 18 Dec 2022 18:03:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p72gR-00054h-58 for guix-patches@gnu.org; Sun, 18 Dec 2022 18:03:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p72gQ-0004Fz-T5 for guix-patches@gnu.org; Sun, 18 Dec 2022 18:03:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p72gQ-00008u-7v for guix-patches@gnu.org; Sun, 18 Dec 2022 18:03:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60184] [PATCH] gnu: Add nginx-module-vts. Resent-From: mirai@makinata.eu Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Dec 2022 23:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60184 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60184@debbugs.gnu.org Cc: Bruno Victal X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.1671404535536 (code B ref -1); Sun, 18 Dec 2022 23:03:02 +0000 Received: (at submit) by debbugs.gnu.org; 18 Dec 2022 23:02:15 +0000 Received: from localhost ([127.0.0.1]:36406 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p72fe-00008a-QH for submit@debbugs.gnu.org; Sun, 18 Dec 2022 18:02:15 -0500 Received: from lists.gnu.org ([209.51.188.17]:48208) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p72fc-00008U-3v for submit@debbugs.gnu.org; Sun, 18 Dec 2022 18:02:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p72fb-0004i1-US for guix-patches@gnu.org; Sun, 18 Dec 2022 18:02:11 -0500 Received: from smtpm5.myservices.hosting ([185.26.105.236]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p72fZ-0004Cz-Sz for guix-patches@gnu.org; Sun, 18 Dec 2022 18:02:11 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.172]) by smtpm5.myservices.hosting (Postfix) with ESMTP id 34D5F20BEF for ; Mon, 19 Dec 2022 00:01:56 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id E2B298009E; Mon, 19 Dec 2022 00:01:56 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-1.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id Do6CanGs4Ezh; Mon, 19 Dec 2022 00:01:55 +0100 (CET) Received: from guix-nuc.home.arpa (bl12-93-156.dsl.telepac.pt [85.245.93.156]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id B9B378009D; Mon, 19 Dec 2022 00:01:54 +0100 (CET) From: mirai@makinata.eu Date: Sun, 18 Dec 2022 23:01:41 +0000 Message-Id: X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Received-SPF: pass client-ip=185.26.105.236; envelope-from=mirai@makinata.eu; helo=smtpm5.myservices.hosting X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Bruno Victal Depends on nginx http_stub_status_module. * gnu/packages/web.scm (nginx-module-vts): New variable. (nginx)[arguments]: Add "--with-http_stub_status_module" to #:configure-flags. --- gnu/packages/web.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) base-commit: d083809c8048a64f71a40f0657c217c9dd230428 diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index dcb7b3872a..2ad53c7627 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -59,6 +59,7 @@ ;;; Copyright © 2022 Pradana Aumars ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2022 jgart +;;; Copyright © 2022 Bruno Victal ;;; ;;; This file is part of GNU Guix. ;;; @@ -410,6 +411,7 @@ (define-public nginx "--with-debug" "--with-stream" "--with-stream_ssl_module" + "--with-http_stub_status_module" ;; Even when not cross-building, we pass the ;; --crossbuild option to avoid customizing for the ;; kernel version on the build machine. @@ -834,6 +836,57 @@ (define-public nginx-rtmp-module stream. Remote control of the module is possible over HTTP.") (license license:bsd-2))) +(define-public nginx-module-vts + (package + (inherit nginx) + (name "nginx-module-vts") + (version "0.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vozlt/nginx-module-vts") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "017298vpp1ra16xyfdbsczdrz0b0y67x6adkzcc98y6gb3kg52n7")))) + (build-system gnu-build-system) + (inputs + `(("nginx-sources" ,(package-source nginx)) + ,@(package-inputs nginx))) + (arguments + (substitute-keyword-arguments + `(#:make-flags '("modules") ;Only build this module not all of nginx. + ,@(package-arguments nginx)) + ((#:configure-flags flags) + #~(cons "--add-dynamic-module=." #$flags)) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'unpack 'unpack-nginx-sources + (lambda _ + (begin + ;; The nginx source code is part of the module’s source. + (format #t "decompressing nginx source code~%") + (invoke "tar" "xvf" #$(this-package-input "nginx-sources") + ;; This package's LICENSE file would be + ;; overwritten with the one from nginx when + ;; unpacking the nginx source, so rename the nginx + ;; one when unpacking. + "--transform=s,/LICENSE$,/LICENSE.nginx," + "--strip-components=1")))) + (replace 'install + (lambda _ + (let ((modules-dir (string-append #$output + "/etc/nginx/modules"))) + (install-file "objs/ngx_http_vhost_traffic_status_module.so" modules-dir)))) + (delete 'fix-root-dirs) + (delete 'install-man-page))))) + (home-page "https://github.com/vozlt/nginx-module-vts") + (synopsis "NGINX module for monitoring virtual host traffic status") + (description "This NGINX module provides access to virtual host status information, +similar to live activity monitoring provided with NGINX plus.") + (license license:bsd-2))) + (define-public lighttpd (package (name "lighttpd")