all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: "Clément Lassieur" <clement@lassieur.org>
To: guix-devel@gnu.org
Subject: [PATCH 3/3] gnu: prosody: Make config and data files visible to 'prosodyctl'.
Date: Sun,  8 Jan 2017 20:08:16 +0100	[thread overview]
Message-ID: <20170108190816.25185-3-clement@lassieur.org> (raw)
In-Reply-To: <20170108190816.25185-1-clement@lassieur.org>

* gnu/packages/messaging.scm (prosody)[arguments]: Add a 'fix-makefile' phase.
---
 gnu/packages/messaging.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 86ff61538..6f1025d36 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -536,6 +536,14 @@ end-to-end encryption support; XML console.")
              (substitute* "configure"
                (("exit 1") ""))
              #t))
+         (add-after 'unpack 'fix-makefile
+           (lambda _
+             (substitute* "Makefile"
+               ;; prosodyctl needs to read the configuration file.
+               (("^INSTALLEDCONFIG =.*") "INSTALLEDCONFIG = /etc/prosody\n")
+               ;; prosodyctl needs a place to put auto-generated certificates.
+               (("^INSTALLEDDATA =.*") "INSTALLEDDATA = /var/lib/prosody\n"))
+             #t))
          (add-after 'install 'wrap-programs
            (lambda* (#:key inputs outputs #:allow-other-keys)
              ;; Make sure all executables in "bin" find the required Lua
-- 
2.11.0

  parent reply	other threads:[~2017-01-08 19:08 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-04 21:55 [PATCH] gnu: Add Prosody service Clément Lassieur
2017-01-05 10:34 ` Hartmut Goebel
2017-01-05 10:50   ` ng0
2017-01-07 22:10     ` Clément Lassieur
2017-01-07 21:14   ` Clément Lassieur
2017-01-07 21:29 ` Ludovic Courtès
2017-01-08 19:06   ` Clément Lassieur
2017-01-08 19:08     ` [PATCH 1/3] " Clément Lassieur
2017-01-08 19:08       ` [PATCH 2/3] gnu: prosody: Fix inputs Clément Lassieur
2017-01-08 22:38         ` Ludovic Courtès
2017-01-08 19:08       ` Clément Lassieur [this message]
2017-01-08 22:38         ` [PATCH 3/3] gnu: prosody: Make config and data files visible to 'prosodyctl' Ludovic Courtès
2017-01-08 22:40       ` [PATCH 1/3] gnu: Add Prosody service Ludovic Courtès

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=20170108190816.25185-3-clement@lassieur.org \
    --to=clement@lassieur.org \
    --cc=guix-devel@gnu.org \
    /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.