From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id GKO2H+y6aGX4gAEAauVa8A:P1 (envelope-from ) for ; Thu, 30 Nov 2023 17:40:12 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id GKO2H+y6aGX4gAEAauVa8A (envelope-from ) for ; Thu, 30 Nov 2023 17:40:12 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 12A0253716 for ; Thu, 30 Nov 2023 17:40:11 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=pisemsky.com header.s=dkim header.b=b4EtcKxx; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1701362412; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=I6cJVSrIw9cTA7+g/nVIC+2peql2NwHWU8aJKgG9TmU=; b=fNR847AXjHT6A+babMuURkjZwp3WgRW3V7u4V4ydpUa+KrPhpk3TegxBIXh1YdEmcbmB7r Dxou7VfglEim5vo4B2md383GHSX6N4Q5/dtz6fZ0fvJxUbg3EaM29DLT9tSZFbQmEQHhqu BwZj5/QaWbt7AOKIPU/3ejWtjUiK9LAZA1mwoEs5cCYtIJLhPA5CoBRbEa0e0vBJrRY5yC UCZYfZ1vfrpjlXDKsVgTdt3SbYCZ4cgxthVojVtHo8OiJiIFHHn0mJF0aLiHIUWiIYchMJ iyzsqHbXmYzYXJOxFT+aRshtwTtksRMI43DMwBtgkX0dxzFBYk+WmThRZ7qGyw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1701362412; a=rsa-sha256; cv=none; b=Ja8gMxm/wWzjzhShVeALtqROpNSR6hAwyfwitF/fQXZtqnq2zBYgYTQyaJMxHUPwII7FeW Q5eeQtxTs4WQ19L20CNjEabFuLYeMvCSfsBTcO8friLONAPZKJfvtetVFoIOPpLBlmDh4l zhAAgP1a+1dMdYCbk0jIG8WqibVBrW82LLirVKvVtcVlYH5YkNvTTbxBvFq3bBZof9Jp+E ii7ywZsvcKBM8jP9mvq1PRVkmq0BNaRcBFgDEDziuaYgo89eeM2Y/zDBcVBDLSQS6IfyMf xw439bm4P//wGi1rKaP1ktC3xlgVXVXKZWUHUPKbZ70aursBk+2ss1P84CwzeA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=pisemsky.com header.s=dkim header.b=b4EtcKxx; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8k4y-0001EO-O5; Thu, 30 Nov 2023 11:39:56 -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 1r8k4w-0001EA-9y for bug-guix@gnu.org; Thu, 30 Nov 2023 11:39:54 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r8k4w-0008FQ-0T for bug-guix@gnu.org; Thu, 30 Nov 2023 11:39:54 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8k53-0003cw-Rz for bug-guix@gnu.org; Thu, 30 Nov 2023 11:40:01 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#61500: [PATCH] services: cat-http-server: Fix cat-avatar-generator-service. References: <87wn4llz62.fsf@pisemsky.com> In-Reply-To: <87wn4llz62.fsf@pisemsky.com> Resent-From: Evgeny Pisemsky Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 30 Nov 2023 16:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61500 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 61500@debbugs.gnu.org Received: via spool by 61500-submit@debbugs.gnu.org id=B61500.170136235113873 (code B ref 61500); Thu, 30 Nov 2023 16:40:01 +0000 Received: (at 61500) by debbugs.gnu.org; 30 Nov 2023 16:39:11 +0000 Received: from localhost ([127.0.0.1]:54413 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8k4E-0003bg-KT for submit@debbugs.gnu.org; Thu, 30 Nov 2023 11:39:11 -0500 Received: from sofi-shared.hosting.energy ([2001:41d0:602:1f56::]:38888 helo=sofi.hosting.energy) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8k4C-0003bG-Ae for 61500@debbugs.gnu.org; Thu, 30 Nov 2023 11:39:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=pisemsky.com; s=dkim; h=Content-Type:MIME-Version:Message-ID:Date:Subject: To:From:Sender:Reply-To:Cc:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=bXC26CifMpmN2hOAv8qy7XxS+f+/oHaepEp37KjuZSo=; b=b4EtcKxxmO+9Ers9CrxpPYbTiB MWi6aisS3bXz+b39ESH4sZJ2ioL0AQ0YgKCOIRNEoSn32DAHYmjkGrD+DJVSfr/l1dfhPBoWp7tLU nVmS5uErxg755lzUd9kPhYmxoUv1zglwIv1zom+KVVsOrQsb2qpmWjHsFtbPN6eHx1Ng=; Received: from [185.211.158.69] (helo=laptop) by sofi.hosting.energy with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1r8k3w-0002mz-MS for 61500@debbugs.gnu.org; Thu, 30 Nov 2023 19:38:52 +0300 From: Evgeny Pisemsky Date: Thu, 30 Nov 2023 19:38:50 +0300 Message-ID: <8734wnqjqd.fsf@pisemsky.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Scanned-By: ClamAV 0.103.0; Thu, 30 Nov 2023 19:38:52 +0300 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: -5.14 X-Spam-Score: -5.14 X-Migadu-Queue-Id: 12A0253716 X-TUID: 5OQ45pyw7RuT --=-=-= Content-Type: text/plain Here is the simplest patch that changes cache directory to /tmp/ and makes this service work with the recently added monsterid package. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-services-cat-http-server-Fix-cat-avatar-generator-se.patch >From d6778a511cd5c41755a8ba9853d0e9db8dd47997 Mon Sep 17 00:00:00 2001 Message-ID: From: Evgeny Pisemsky Date: Thu, 30 Nov 2023 19:30:50 +0300 Subject: [PATCH] services: cat-http-server: Fix cat-avatar-generator-service. * gnu/services/web.scm (cat-avatar-generator-service): Change default cache directory of the service and make it compatible with the monsterid package. Change-Id: I94b4b2d8b01e8502222e4fd2a6aea247d6480312 --- doc/guix.texi | 3 ++- gnu/services/web.scm | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 1fd2e21608..95a2f05633 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -31752,7 +31752,7 @@ Web Services the hash of a user's email address. @deffn {Procedure} cat-avatar-generator-service @ - [#:cache-dir "/var/cache/cat-avatar-generator"] @ + [#:cache-dir "/tmp/"] @ [#:package cat-avatar-generator] @ [#:configuration (nginx-server-configuration)] Returns an nginx-server-configuration that inherits @code{configuration}. It @@ -31764,6 +31764,7 @@ Web Services A simple setup for cat-avatar-generator can look like this: @lisp (services (cons* (cat-avatar-generator-service + #:package monsterid #:configuration (nginx-server-configuration (server-name '("example.com")))) diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 818226a4f7..47ca1e6968 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -1158,7 +1158,7 @@ (define* (nginx-php-location (define* (cat-avatar-generator-service #:key - (cache-dir "/var/cache/cat-avatar-generator") + (cache-dir "/tmp/") (package cat-avatar-generator) (configuration (nginx-server-configuration))) (simple-service @@ -1175,7 +1175,8 @@ (define* (cat-avatar-generator-service (nginx-location-configuration-body base))))) (nginx-server-configuration-locations configuration))) (root #~(string-append #$package - "/share/web/cat-avatar-generator")))))) + "/share/web/" + #$(package-name package))))))) (define-record-type* base-commit: c12cf2fb63bc2a5b0c5419a372ff6fff76a28a3b -- 2.41.0 --=-=-=--