From patchwork Tue Aug 18 18:20:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 23673 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 5B51227BBE6; Tue, 18 Aug 2020 19:21:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 0982627BBE5 for ; Tue, 18 Aug 2020 19:21:10 +0100 (BST) Received: from localhost ([::1]:42942 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k86EP-00017E-Ie for patchwork@mira.cbaines.net; Tue, 18 Aug 2020 14:21:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44938) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k86EJ-00014R-0s for guix-patches@gnu.org; Tue, 18 Aug 2020 14:21:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53639) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k86EI-0005fn-Mt for guix-patches@gnu.org; Tue, 18 Aug 2020 14:21:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k86EI-0000d4-J4 for guix-patches@gnu.org; Tue, 18 Aug 2020 14:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42918] [PATCH 1/1] services: fcgiwrap: Create parent directory for unix socket. References: <20200818181706.19536-1-arunisaac@systemreboot.net> In-Reply-To: <20200818181706.19536-1-arunisaac@systemreboot.net> Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Aug 2020 18:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42918 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42918@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 42918-submit@debbugs.gnu.org id=B42918.15977748402359 (code B ref 42918); Tue, 18 Aug 2020 18:21:02 +0000 Received: (at 42918) by debbugs.gnu.org; 18 Aug 2020 18:20:40 +0000 Received: from localhost ([127.0.0.1]:36951 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k86Dw-0000bz-Cj for submit@debbugs.gnu.org; Tue, 18 Aug 2020 14:20:40 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:44378) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k86Dt-0000bk-H9 for 42918@debbugs.gnu.org; Tue, 18 Aug 2020 14:20:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: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=k9Wlh6F9+GBug00IbT1fDpYkDbk8LYkq0wr16Saopno=; b=Gma/QZS85BOTl5+y9S6YbK/NFH rmkOsJPeqd3HiWqJyosV8hGKSkfrxsajk/SJ5Hbd61r0xlfy6jMiEjHNA2kZ4sLYi2vxekYIUKwkb jLi7XQfTo623Tk1XzsLBhKt9ofEDAUGMHf2ogGKR1XB+fjOJftJkznZ0wziM29ffjRf/Wz+4ggorv hCpjj2O7A7/0+ipdwl4sSxwCSEzSqElptLXyfBvigyfcNlvCAEYcRZya3DwO/Z6TQilXDsOPeqoYm hZxI1i2NV6kxSFc8sPVNyHxSUcB4Fi8YF6okJn9jIexPckCt19afA6Fjeh2h5K8vqKeFug6SGQpQL gxFKh75w==; Received: from [192.168.2.1] (helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1k86DW-000BgZ-IP; Tue, 18 Aug 2020 23:50:14 +0530 From: Arun Isaac Date: Tue, 18 Aug 2020 23:50:32 +0530 Message-Id: <20200818182032.19689-1-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 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" X-getmail-retrieved-from-mailbox: Patches * gnu/services/web.scm (fcgiwrap-activation): New function. (fcgiwrap-service-type): Extend activation-service-type with fcgiwrap-activation. --- gnu/services/web.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 3b9f9e40be..d11a1c0545 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2019, 2020 Florian Pelz ;;; Copyright © 2020 Ricardo Wurmus ;;; Copyright © 2020 Tobias Geerinckx-Rice +;;; Copyright © 2020 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -794,13 +795,29 @@ of index files." #:user #$user #:group #$group)) (stop #~(make-kill-destructor))))))) +(define fcgiwrap-activation + (match-lambda + (($ package socket user group) + #~(begin + ;; When listening on a unix socket, create a parent directory for the + ;; socket with the correct permissions. + (when (string-prefix? "unix:" #$socket) + (let ((run-directory + (dirname (substring #$socket (string-length "unix:"))))) + (mkdir-p run-directory) + (chown run-directory + (passwd:uid (getpw #$user)) + (group:gid (getgr #$group))))))))) + (define fcgiwrap-service-type (service-type (name 'fcgiwrap) (extensions (list (service-extension shepherd-root-service-type fcgiwrap-shepherd-service) (service-extension account-service-type - fcgiwrap-accounts))) + fcgiwrap-accounts) + (service-extension activation-service-type + fcgiwrap-activation))) (default-value (fcgiwrap-configuration)))) (define-record-type* php-fpm-configuration