From unknown Fri Jun 13 11:26:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#33836] [PATCH 0/2] location in define-configuration Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Dec 2018 20:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33836 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33836@debbugs.gnu.org Cc: Oleg Pykhalov X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154551117511907 (code B ref -1); Sat, 22 Dec 2018 20:40:02 +0000 Received: (at submit) by debbugs.gnu.org; 22 Dec 2018 20:39:35 +0000 Received: from localhost ([127.0.0.1]:60242 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gao3b-00035z-Kp for submit@debbugs.gnu.org; Sat, 22 Dec 2018 15:39:35 -0500 Received: from eggs.gnu.org ([208.118.235.92]:39962) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gao3Z-00035n-Sc for submit@debbugs.gnu.org; Sat, 22 Dec 2018 15:39:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gao3S-00020a-If for submit@debbugs.gnu.org; Sat, 22 Dec 2018 15:39:28 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_20,FREEMAIL_FROM autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:42392) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gao3S-00020T-Er for submit@debbugs.gnu.org; Sat, 22 Dec 2018 15:39:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45797) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gao3R-0001e1-Nr for guix-patches@gnu.org; Sat, 22 Dec 2018 15:39:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gao3M-0001vB-QY for guix-patches@gnu.org; Sat, 22 Dec 2018 15:39:25 -0500 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]:35736) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gao3M-0001tT-KR for guix-patches@gnu.org; Sat, 22 Dec 2018 15:39:20 -0500 Received: by mail-pl1-x644.google.com with SMTP id p8so4041242plo.2 for ; Sat, 22 Dec 2018 12:39:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=FE8DBn+i4NPZLhf6T6f/DO0B3y090GzlEzPtpDr0VVA=; b=PnHYqrNM4E1HWon7vIX7/lPP9wUBUt5D1wLl8uf1sdxCet7SOqPVdletC5qZd4QG0W xu6rEd4oX1Ut9A9AB8du7OuAqc9XrkU5Cv1oDJO2WHMFcd00zF2LdoAYVQ7kPFW5CP0E qRr+rTgLAGFv0PvnxAKkphxsityr3bmMxTUj15+K7cg54LSUb0PltJ/AXyuRkB840QYR rpeyeWCZxhYqMCWNm445Y64E4IVwhFk9u1LbrcZyrYEO3N8Z902d9RCh9Dgn6BtptFaq T5AQZd4Rv7ZzouME1SKfvekwvUqZt/qaYULQwCJm/vUz8ojQizA/iHtDznsZsQj5Qo8x qajQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=FE8DBn+i4NPZLhf6T6f/DO0B3y090GzlEzPtpDr0VVA=; b=B8zu/TxCCs7T6kvr8qZSbTluLAVgiwzteaIoJIeKQh+r+Hrz58ZB3fX/ashgx0xOOg +5TfLgoHIDqxF/tEcajfCMgOUN3CHywp44WD05D0knsDw0XvE5E2BudGdas4dmDdpmuc LiJqsO0KTreAQhI/l8SsCGtG0MH5sIOXfpRpUNAGhd+rqHpencQWaXVy6vCAmK4/gJXT KBh4WBbkzEG22XwYCMK4MhQzgjMkcYAoVU317EMBeBbxPAu+8OXW+ydAZCZFgJEuH6d1 QfU6OeoBXF9Y4hHEmvYfWVj95A6SVVyOhfa7a7UZ8UD6omDo1oKlMBdGEZAJ/2D4qJlk cWxA== X-Gm-Message-State: AJcUukcIL0gdeA6kmhGg3UgZd1Tio9qI+mBwpcNc58rRaGQtiVdR72Ub 9vFrmXnuiz+gklX671ET8vxHRN3p X-Google-Smtp-Source: ALg8bN6gKid6UFLL6X9YwpMn4foXNtQaW80UA3F8ypObcF+BoBOqkTIrSsTFkbEaWg91uf8wX7Hndw== X-Received: by 2002:a17:902:9887:: with SMTP id s7mr7480285plp.199.1545511159243; Sat, 22 Dec 2018 12:39:19 -0800 (PST) Received: from localhost.localdomain (95-55-5-90.dynamic.avangarddsl.ru. [95.55.5.90]) by smtp.gmail.com with ESMTPSA id r130sm52393391pfr.48.2018.12.22.12.39.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Dec 2018 12:39:18 -0800 (PST) From: Oleg Pykhalov Date: Sat, 22 Dec 2018 23:38:57 +0300 Message-Id: <20181222203857.26964-1-go.wigust@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) This patch series follow up Ludovic's suggestions in #33549 bug report to implement a ‘location’ record field for ‘define-configuration’ procedure. Oleg Pykhalov (2): services: configuration: Add location. services: zabbix-front-end: Show location in messages. gnu/services/configuration.scm | 5 +++++ gnu/services/monitoring.scm | 26 +++++++++++++++++--------- 2 files changed, 22 insertions(+), 9 deletions(-) -- 2.20.1 From unknown Fri Jun 13 11:26:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#33836] [PATCH 1/2] services: configuration: Add location. References: <20181222203857.26964-1-go.wigust@gmail.com> In-Reply-To: <20181222203857.26964-1-go.wigust@gmail.com> Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Dec 2018 20:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33836 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33836@debbugs.gnu.org Cc: Oleg Pykhalov Received: via spool by 33836-submit@debbugs.gnu.org id=B33836.154551134512230 (code B ref 33836); Sat, 22 Dec 2018 20:43:01 +0000 Received: (at 33836) by debbugs.gnu.org; 22 Dec 2018 20:42:25 +0000 Received: from localhost ([127.0.0.1]:60247 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gao6L-0003BC-3H for submit@debbugs.gnu.org; Sat, 22 Dec 2018 15:42:25 -0500 Received: from mail-pf1-f170.google.com ([209.85.210.170]:41895) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gao6J-0003Av-UL for 33836@debbugs.gnu.org; Sat, 22 Dec 2018 15:42:24 -0500 Received: by mail-pf1-f170.google.com with SMTP id b7so4172408pfi.8 for <33836@debbugs.gnu.org>; Sat, 22 Dec 2018 12:42:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZRctzFIjvQ4SEXHt49msc+Ryk1k1BlLNfkjkShq/YRw=; b=hoO+ose0obk5tvAJZGIwAepetwIztcjQ70ykQuRhNrGco/M/8SennUlJRaOqg32M9f PcOM47GyQ3/38MlGMaD9ESsaUcjyOkDv28cRClFiP29f/8Ibf/atgo+CdLHQTNohyEeu JMRV4+m0shLALUH5BLBrzhK8JO4fKO+nQ30E2C5KXgYCz9vMNqlllY3I7y+SgSKPX8qn /QYgVcKw+C4Tdz++yvkz6BHbtM4ZQ4yMNhCkkuMaM5Bw+BFw3hi8hhuqajSfxk1FE4Ld /eaebSY2U4PRYP8Hj/otziT/14cCOKHvktmo7y1dSFAstRZPONAfw8t2ujpdU6Yfq/13 bAoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZRctzFIjvQ4SEXHt49msc+Ryk1k1BlLNfkjkShq/YRw=; b=OmRY007fQUle1SGSqoOT25aaaP6tZDPQbjrifVM4kjRAIFpCQerjtPAEhvJgpOMnyR 7fjc5Y5dNNaKVXbzq/RYJksXY13I0cYSQohnKR/VYCuY0LqTPhVZXWZ+zzXHwyIwbQ0V 2AXRL22C4PtYGPBqab6KJ+XTfAar/iiTuksS8+mZs33wfDuXkcz4R3ZPbRrtAWPAvsbs 1Cv0HXs5iUeM2HXd0FaJol3hNY4MrTxAfzZhELkGvExasAERvQfmnfwZuY8vrkA94Dwv fml2Y1vsSNlrD/38VmWxbo+CO0nzuhdd6+acU+BrywuqdX6t55/hy/yy9vW7+7Eubegj dy1w== X-Gm-Message-State: AJcUukeK6lJBgp2LBI/HqB91bVs7yijk/9HUQ9enGfjCbPfcp/a6MGCA T3adKCReB5brAffn3mDlZQwQ0Nrv X-Google-Smtp-Source: ALg8bN71dPznor5CXfPX0olgyiInsZ+ffMQM1ZYUDuLWohgyP52GCtITRFg/u8hr25sAzio/918deg== X-Received: by 2002:a62:6503:: with SMTP id z3mr7506720pfb.169.1545511337920; Sat, 22 Dec 2018 12:42:17 -0800 (PST) Received: from localhost.localdomain (95-55-5-90.dynamic.avangarddsl.ru. [95.55.5.90]) by smtp.gmail.com with ESMTPSA id p77sm59682173pfi.85.2018.12.22.12.42.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Dec 2018 12:42:17 -0800 (PST) From: Oleg Pykhalov Date: Sat, 22 Dec 2018 23:42:06 +0300 Message-Id: <20181222204207.28505-1-go.wigust@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/services/configuration.scm (define-configuration): Add location. --- gnu/services/configuration.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/services/configuration.scm b/gnu/services/configuration.scm index 707944cbe..9775f91ff 100644 --- a/gnu/services/configuration.scm +++ b/gnu/services/configuration.scm @@ -22,6 +22,7 @@ #:use-module (guix packages) #:use-module (guix records) #:use-module (guix gexp) + #:use-module ((guix utils) #:select (source-properties->location)) #:autoload (texinfo) (texi-fragment->stexi) #:autoload (texinfo serialize) (stexi->texi) #:use-module (ice-9 match) @@ -129,6 +130,10 @@ #,(id #'stem #'% #'stem) #,(id #'stem #'make- #'stem) #,(id #'stem #'stem #'?) + (location configuration-location + (default (and=> (current-source-location) + source-properties->location)) + (innate)) (field field-getter (default def)) ...) (define #,(id #'stem #'stem #'-fields) -- 2.20.1 From unknown Fri Jun 13 11:26:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#33836] [PATCH 2/2] services: zabbix-front-end: Show location in messages. Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Dec 2018 20:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33836 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33836@debbugs.gnu.org Cc: Oleg Pykhalov Received: via spool by 33836-submit@debbugs.gnu.org id=B33836.154551134812245 (code B ref 33836); Sat, 22 Dec 2018 20:43:02 +0000 Received: (at 33836) by debbugs.gnu.org; 22 Dec 2018 20:42:28 +0000 Received: from localhost ([127.0.0.1]:60250 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gao6O-0003BR-BW for submit@debbugs.gnu.org; Sat, 22 Dec 2018 15:42:28 -0500 Received: from mail-pg1-f182.google.com ([209.85.215.182]:34527) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gao6M-0003B0-Rc for 33836@debbugs.gnu.org; Sat, 22 Dec 2018 15:42:27 -0500 Received: by mail-pg1-f182.google.com with SMTP id j10so4041290pga.1 for <33836@debbugs.gnu.org>; Sat, 22 Dec 2018 12:42:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HPzAejQUIP73AhQ8kvQptwbEEK3UWZC5kZjigi7jzUo=; b=WKEtC7+6mmeTFmd99VVIsSCVgk4NGDcMO74sHrNsqc+PGfDvRTwQIpemdohZsi+yng fUk2q0YLuMmyNMAYLzMscmBj6hswOlQWDEOpM4cDaZ13A/iTDU9qYfGVP7BNF0y6Ci6P mNYt9uRq8Ons8IjEOeZmZtco56DHgEsVjdF2fc9jO5JTtmcw2/KNiIvo4OaU8+Ib0rQ2 N3k370vBpNs/2njMBun7QURhYaZdO4VFoyl6HeULHQIEx+gRxUE4Mwnn7nQvghWE9sxt jK3rQDX3pg2hf6GgAO66qdIiyIcRIbUKvx32BmxumMm+YLWJ86CPZ0U71g5CkQ1+owlr 35tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HPzAejQUIP73AhQ8kvQptwbEEK3UWZC5kZjigi7jzUo=; b=mst8j4Hz7nwVN5SYzzGkLSPohBAyw70/72I4oYy7qKG0TqvDTxGwQY2UxhVx2aBeet NZuG2FjvyXvCoeIui0UqAA7Kr6FgmTSKq98HN8G7RB0xy4Bt66Uh6ozjgsCb7GOju/H+ ZedIxewD55T4tXOsdqwUX6O74NFWV3XdjWSoQ6CygdgSsrS6NZtuYOeLyLUPDXkbb1QR DYco72e/ts5ce94hkhuqTUAgV3/wX8uv/niAc2RuBKSEAu0VcKb+29ibmlJwpq9Pm85+ aC5zmlGeRb10hX3lglSole5scuYE+LJrYzdbtWHxEYgg6iiCEnsVZpoNLCNgTXJ/4kkp icHQ== X-Gm-Message-State: AJcUukcNafzxEcovbxrv0RmPnq3dZL8VB28IzltWv1H7hWZH4DP+1YIn TDaQ1LiEHxTo2uUNfNWq2wbUGAi5 X-Google-Smtp-Source: ALg8bN4b28fs/AOBCcVS6pVC+VUidu9k2gLhZj9P5K/XezHmGt3wx3KM6yLoxd4/ScMdnvhcE1sIZQ== X-Received: by 2002:a63:b649:: with SMTP id v9mr7311595pgt.436.1545511340950; Sat, 22 Dec 2018 12:42:20 -0800 (PST) Received: from localhost.localdomain (95-55-5-90.dynamic.avangarddsl.ru. [95.55.5.90]) by smtp.gmail.com with ESMTPSA id p77sm59682173pfi.85.2018.12.22.12.42.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Dec 2018 12:42:20 -0800 (PST) From: Oleg Pykhalov Date: Sat, 22 Dec 2018 23:42:07 +0300 Message-Id: <20181222204207.28505-2-go.wigust@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181222204207.28505-1-go.wigust@gmail.com> References: <20181222204207.28505-1-go.wigust@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/services/monitoring.scm (zabbix-front-end-config): Show location in messages. --- gnu/services/monitoring.scm | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/gnu/services/monitoring.scm b/gnu/services/monitoring.scm index 685641f11..90eda6561 100644 --- a/gnu/services/monitoring.scm +++ b/gnu/services/monitoring.scm @@ -29,6 +29,7 @@ #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix records) + #:use-module (guix utils) #:use-module ((guix ui) #:select (display-hint)) #:use-module (ice-9 match) #:use-module (ice-9 rdelim) @@ -512,7 +513,7 @@ create it manually.") (define zabbix-front-end-config (match-lambda (($ - _ db-host db-port db-name db-user db-password db-secret-file + location _ db-host db-port db-name db-user db-password db-secret-file zabbix-host zabbix-port) (mixed-text-file "zabbix.conf.php" "\ @@ -527,18 +528,25 @@ $DB['DATABASE'] = '" db-name "'; $DB['USER'] = '" db-user "'; $DB['PASSWORD'] = '" (if (string-null? db-password) (if (string-null? db-secret-file) - (raise (condition - (&message - (message "\ -you must provide either 'db-secret-file' or 'db-password'")))) + (raise (make-compound-condition + (condition + (&message + (message "\ +you must provide either 'db-secret-file' or 'db-password'"))) + (condition + (&error-location (location location))))) (string-trim-both (with-input-from-file db-secret-file read-string))) (begin - (display-hint "\ -Consider using @code{db-secret-file} instead of @code{db-password} and unset -@code{db-password} for security in @code{zabbix-front-end-configuration}.") - db-password)) "'; + (display-hint (format #f + "~{~a: ~}Consider using +@code{db-secret-file} instead of @code{db-password} and unset +@code{db-password} for security in @code{zabbix-front-end-configuration}." + (list (location-file location) + (location-line location) + (location-column location)))) +db-password)) "'; // Schema name. Used for IBM DB2 and PostgreSQL. $DB['SCHEMA'] = ''; -- 2.20.1 From unknown Fri Jun 13 11:26:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#33836] [PATCH 1/2] services: configuration: Add location. Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Dec 2018 14:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33836 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33836@debbugs.gnu.org Received: via spool by 33836-submit@debbugs.gnu.org id=B33836.15455748835983 (code B ref 33836); Sun, 23 Dec 2018 14:22:02 +0000 Received: (at 33836) by debbugs.gnu.org; 23 Dec 2018 14:21:23 +0000 Received: from localhost ([127.0.0.1]:60623 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gb4d9-0001YP-46 for submit@debbugs.gnu.org; Sun, 23 Dec 2018 09:21:23 -0500 Received: from mail-pf1-f193.google.com ([209.85.210.193]:42070) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gb4d6-0001YA-Mb for 33836@debbugs.gnu.org; Sun, 23 Dec 2018 09:21:21 -0500 Received: by mail-pf1-f193.google.com with SMTP id 64so4786430pfr.9 for <33836@debbugs.gnu.org>; Sun, 23 Dec 2018 06:21:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:references:date:in-reply-to:message-id:user-agent :mime-version; bh=2BE5S1LtvlHIsFE5u2JCXhME8jbyDD9x8G4mk0h0rps=; b=s0HCAhybqxB7/TLPMasTLqmSIROg3p/8Atr94cIUFY0acYfHfW42ZMmgvGvY6MZuPo qCushPOOcSNMqBj9drKCGVBQI0WLwgiy7ayliDYiynbU9m5Z5cd0Fi3+UWiXXOCs33RQ r5BybvIOOFCPAKwIHIQd6156uPcyIPT2pXojBfXMFj1XIC45fqyJs3hSM605PAvEXKXJ UEYDOG/Zm/hgn5jbVNoI81UITEkW/hz7jpLWmCyFR54+9cCXXYADmS37ecD6Sn/gCHvv npEA9kVQfXpaW5PMoUOOAPB0MlI9W7SbnndGhL3KW/Uf7zokfg0S9/dedPwev9g1C+8k fzXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=2BE5S1LtvlHIsFE5u2JCXhME8jbyDD9x8G4mk0h0rps=; b=tYZUNXonsnmyrjSZvWCDRua/iIgHRQVVXbXZFrYZT8D7zIVoQHN+PBRtJxHixygVnz 7/e2xdd0P2aOz837p41mErKJzOFiHKUedlbWzVsRrm88p6rlQiMRgQjoOqWSzC9EzpYR A6ibDGT+oa/bogRLjzcOXzB/kjDgIUTqsDiKW43HP6a11OB3I5oygaVu3+ngy6IoJVXt 5m0nwSPswYPR6Ntj9mEgdD5BbuHsBQ1NSoH+lKWxWduRGgW6Tjq0QlZxmYZX5kcOoeIR a+jyGmGEzGUKrSIrFRzlPveAIEFmxoWrVI6Ga1Bdrt8zEoIEFE7C0o336i7bkoskLEKx 9srQ== X-Gm-Message-State: AJcUukd3abUn+d1RLQXuWDMmkEgu8ZhOChGeOb2Moxv6/7Jo/ohNaLE3 ah0zk2ZNscB/Hs+GfRn6BUhHQ7bc X-Google-Smtp-Source: ALg8bN6Mr3A1OsVj6gTOEKGI3A5H3Sk/nzqzl0alMQq6quJAhkgNtpqLSm3kGwmfBf1bG+ZJG/rxqQ== X-Received: by 2002:a63:2946:: with SMTP id p67mr9388359pgp.317.1545574874411; Sun, 23 Dec 2018 06:21:14 -0800 (PST) Received: from magnolia (95-55-5-90.dynamic.avangarddsl.ru. [95.55.5.90]) by smtp.gmail.com with ESMTPSA id s79sm45553335pgs.50.2018.12.23.06.21.11 for <33836@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 23 Dec 2018 06:21:13 -0800 (PST) From: Oleg Pykhalov References: <20181222203857.26964-1-go.wigust@gmail.com> <20181222204207.28505-1-go.wigust@gmail.com> Date: Sun, 23 Dec 2018 17:21:04 +0300 In-Reply-To: <20181222204207.28505-1-go.wigust@gmail.com> (Oleg Pykhalov's message of "Sat, 22 Dec 2018 23:42:06 +0300") Message-ID: <874lb45nov.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Oleg Pykhalov writes: > * gnu/services/configuration.scm (define-configuration): Add location. > --- > gnu/services/configuration.scm | 5 +++++ > 1 file changed, 5 insertions(+) [=E2=80=A6] After =E2=80=98make clean-go=E2=80=99, the =E2=80=98make=E2=80=99 command o= utputs in Guix Git repo: =2D-8<---------------cut here---------------start------------->8--- Backtrace: In ice-9/boot-9.scm: 2994:20 19 (_) 2312:4 18 (save-module-excursion #) 3014:26 17 (_) In unknown file: 16 (primitive-load-path "gnu/tests/mail" #) In ice-9/eval.scm: 626:19 15 (_ #) 293:34 14 (_ #) 163:9 13 (_ #) 159:9 12 (_ #) 293:34 11 (_ #) 214:21 10 (_ #(#(#(#(#(# ?) ?) ?) ?) ?)) 217:50 9 (lp (# ?)) 217:50 8 (lp (# ?)) 217:50 7 (lp (# ?)) 217:50 6 (lp (# ?)) 217:50 5 (lp (# ?)) 217:50 4 (lp (# ?)) 217:33 3 (lp (# ?)) 155:9 2 (_ #(#(#(#(#(# ?) ?) ?) ?) ?)) 619:8 1 (_ #(#(#(#(#(#(# ?) ?) ?) ?) ?) ?)) In ice-9/boot-9.scm: 260:13 0 (for-each # ?) ice-9/boot-9.scm:260:13: In procedure for-each: Throw to key `srfi-34' with args `(#)'. Some deprecated features have been used. Set the environment variable GUILE_WARN_DEPRECATED to "detailed" and rerun the program to get more information. Set it to "no" to suppress this message. make[2]: *** [Makefile:5576: make-go] Error 1 make[2]: Leaving directory '/home/natsu/src/guix' make[1]: *** [Makefile:4657: all-recursive] Error 1 make[1]: Leaving directory '/home/natsu/src/guix' make: *** [Makefile:3273: all] Error 2 =2D-8<---------------cut here---------------end--------------->8--- Also my GuixSD fails to build. Will try to fix =E2=80=98gnu/services/mail.= scm=E2=80=99. Oleg. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEcjhxI46s62NFSFhXFn+OpQAa+pwFAlwfmdAACgkQFn+OpQAa +pwrpw//ZItpp9I3QDCLDAHomByJzAViMNh+8FGF8IeBwf0OG3qxVN5xlGoKIivM e977bxYPWbiNjDspnQ1TFfsbxCBcgny1nK4L8M7G4LliIZVizGZec80h5N/MQAMz ixLNZ3HL0/qSI0XMpvNYqqHKe2fpSKvXY8sMJ37t5Q3A9Eq1MZNzgBjZIrJAZnBd SaSf1IZmQ+uuAieNCJP9hephBzFqVGqiYOCxQzPfWJIZtyvvk6qwVeGSiiOOXcwn IbjAR1CndztFot1pGh7gv0nkeh3mZzDCDDtqrCpneZUROqmot8CQtutSLEs88988 nTLiNnVTq6M5ceAwtesRgJLCbCt75eqstcTZ0LZS9SJS0iG7kI0cBslRA8cTiP4Y yMF4kzfJxrahA6W0BN7QoruZKgC4k/+ABZg9znofNHKGmXSnIbVZX4jf+GlO0hsN L75NUDVJcB+uOnndYYfeYpmepZRbUsxFp5MbAJCS2zLx1jS1gP2ubdbRrHKwhNny 13G4OhwNAS8O1gdxQRUd55oajyHr/o+3Uv5xBHyFR0jnTmeRvzRvzy/aSZ6stoNG O5c2+A0Geb+x4m302I2A48v39Q+9AQq0XKQ86WQzhPAqhgWjr16dzzlqwWAdhBIz J7HEz6HAtE+NzfDbKeFRl/95tVU/MeQoaW0uPvwWCYuiCP+HrG0= =q19n -----END PGP SIGNATURE----- --=-=-=-- From unknown Fri Jun 13 11:26:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#33836] [PATCH] services: zabbix-front-end: Show location in messages. Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Dec 2018 15:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33836 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33836@debbugs.gnu.org Cc: Oleg Pykhalov Received: via spool by 33836-submit@debbugs.gnu.org id=B33836.154557942714160 (code B ref 33836); Sun, 23 Dec 2018 15:38:02 +0000 Received: (at 33836) by debbugs.gnu.org; 23 Dec 2018 15:37:07 +0000 Received: from localhost ([127.0.0.1]:33901 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gb5oR-0003gK-67 for submit@debbugs.gnu.org; Sun, 23 Dec 2018 10:37:07 -0500 Received: from mail-pl1-f176.google.com ([209.85.214.176]:46187) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gb5oO-0003fq-SC for 33836@debbugs.gnu.org; Sun, 23 Dec 2018 10:37:05 -0500 Received: by mail-pl1-f176.google.com with SMTP id t13so4656900ply.13 for <33836@debbugs.gnu.org>; Sun, 23 Dec 2018 07:37:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HPzAejQUIP73AhQ8kvQptwbEEK3UWZC5kZjigi7jzUo=; b=H5oXp3nj2lDCqETA9By7Rx4BK8S8DKCO1uGSpkGp0zuFSyejpu0RRWWzW4U8CdDE7A aZYVseSrQ7ok47Vux1ZaLKbiSiusA0VClN4d5tnrLrgiLsHelTmhVCxO62x6g0pUKx27 yUULAKbIpR5wMzGfUNBS3qrR5lKNoOnsX2Jc5aLQsUNeDRuhSOO2YJAJJYRbCrVgvs5m zW48ig5T4e4xh9FzPB5zMkZ9z6Jw9XD5as4qa6KHk+d3I3s9HV8GDnCwOrnn5ksKF9FF 2aKKECKSYSf+oXkc5WArtU/NGAawpFN+ebXs9dihEPmPS6Nrcm2HSBeIdaTou2DtiOrH od0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HPzAejQUIP73AhQ8kvQptwbEEK3UWZC5kZjigi7jzUo=; b=sQ+5hxS+MnKRXjvid4o0uLly0WgnY9EEndihjSvG7HTHN9OvitgEeVhcLW2jVQsuME PbY1Kjyuw/b9ZOPNiladGrQ0dMmquF5Jf5tHDkx4sS8dvxn4Hzmvo5iyyUO74J0oF7UV vGHmNzp2BjQfHJ/gNrWk8xA5JXQGomnbAQM6ZVSq2VDoJiHl8E2W8ylRCqT3tumURJG2 MuL+QIZ14K1jwF1kjQDUBGnyh4VIEip35IFUF1WkqTqkkObIQ/hmup2BCvMhmyZTEYeb 1YYBJ309texlqPdX7GulaVFFXjQFhXRSML4SwMUCADf/Cr40SI32OhZPDwfQgbJ1yKSg fqIw== X-Gm-Message-State: AJcUukf6OZ2aDhwiBuu2CsrIpRvkagYN6U+H2f0lj90hAySk9+0Bj8/y K7fc9GmhZ4jGNPhALpb8KXWUm/Hv X-Google-Smtp-Source: ALg8bN6lfIylTzgnbGk9jVcEQ4wd06m7VFdzafQCV4MfcAyJU54bSw3gwyW4tW1vqsdIC/iIyf1wGQ== X-Received: by 2002:a17:902:7d82:: with SMTP id a2mr10029995plm.163.1545579418778; Sun, 23 Dec 2018 07:36:58 -0800 (PST) Received: from localhost.localdomain ([178.67.254.124]) by smtp.gmail.com with ESMTPSA id t21sm40877183pgg.24.2018.12.23.07.36.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Dec 2018 07:36:58 -0800 (PST) From: Oleg Pykhalov Date: Sun, 23 Dec 2018 18:36:33 +0300 Message-Id: <20181223153633.13009-1-go.wigust@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <874lb45nov.fsf@gmail.com> References: <874lb45nov.fsf@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/services/monitoring.scm (zabbix-front-end-config): Show location in messages. --- gnu/services/monitoring.scm | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/gnu/services/monitoring.scm b/gnu/services/monitoring.scm index 685641f11..90eda6561 100644 --- a/gnu/services/monitoring.scm +++ b/gnu/services/monitoring.scm @@ -29,6 +29,7 @@ #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix records) + #:use-module (guix utils) #:use-module ((guix ui) #:select (display-hint)) #:use-module (ice-9 match) #:use-module (ice-9 rdelim) @@ -512,7 +513,7 @@ create it manually.") (define zabbix-front-end-config (match-lambda (($ - _ db-host db-port db-name db-user db-password db-secret-file + location _ db-host db-port db-name db-user db-password db-secret-file zabbix-host zabbix-port) (mixed-text-file "zabbix.conf.php" "\ @@ -527,18 +528,25 @@ $DB['DATABASE'] = '" db-name "'; $DB['USER'] = '" db-user "'; $DB['PASSWORD'] = '" (if (string-null? db-password) (if (string-null? db-secret-file) - (raise (condition - (&message - (message "\ -you must provide either 'db-secret-file' or 'db-password'")))) + (raise (make-compound-condition + (condition + (&message + (message "\ +you must provide either 'db-secret-file' or 'db-password'"))) + (condition + (&error-location (location location))))) (string-trim-both (with-input-from-file db-secret-file read-string))) (begin - (display-hint "\ -Consider using @code{db-secret-file} instead of @code{db-password} and unset -@code{db-password} for security in @code{zabbix-front-end-configuration}.") - db-password)) "'; + (display-hint (format #f + "~{~a: ~}Consider using +@code{db-secret-file} instead of @code{db-password} and unset +@code{db-password} for security in @code{zabbix-front-end-configuration}." + (list (location-file location) + (location-line location) + (location-column location)))) +db-password)) "'; // Schema name. Used for IBM DB2 and PostgreSQL. $DB['SCHEMA'] = ''; -- 2.20.1 From unknown Fri Jun 13 11:26:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#33836] [PATCH 1/2] services: configuration: Add location. Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Dec 2018 15:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33836 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33836@debbugs.gnu.org Cc: Oleg Pykhalov Received: via spool by 33836-submit@debbugs.gnu.org id=B33836.154557965114524 (code B ref 33836); Sun, 23 Dec 2018 15:41:01 +0000 Received: (at 33836) by debbugs.gnu.org; 23 Dec 2018 15:40:51 +0000 Received: from localhost ([127.0.0.1]:33910 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gb5s3-0003mC-5o for submit@debbugs.gnu.org; Sun, 23 Dec 2018 10:40:51 -0500 Received: from mail-pf1-f180.google.com ([209.85.210.180]:46353) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gb5s2-0003m0-An for 33836@debbugs.gnu.org; Sun, 23 Dec 2018 10:40:50 -0500 Received: by mail-pf1-f180.google.com with SMTP id c73so4823638pfe.13 for <33836@debbugs.gnu.org>; Sun, 23 Dec 2018 07:40:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DFv7WcYOhDBxExpkXJdbL1IsZDfYo8o7zJQ+YsPoMEc=; b=oCuqF512ac9QHfBTlivfqn1bv3jpm0OxhkLHkTNs5yjyan6EBjMhIicvj/+ATuQ2n8 ON4qX5AawoNLrqeW4/tEW/sBd9vkp/u9Y19d/3KYxRGXLRTI4nGgiX8HpTfXtThm0ZUU zO6QpnLFuYq463lx/5uzs5X4+DAdq30KTWFOKvgwYEiUiuyXtj0/SbPrEKIlSdpA5SCr CQ8BhU+v6l+WohEipRyi1qgWTzyCPBiZ3Mz0Bk5UVjheAnK8fIrjvUhW2+PZI/EG7+MM WUUN4rcGQlDHRDzRZkB2yLA+IETL0vigd4zCSBtCHb86sFbJYepBrjhaPepbjh8EI5nw LZrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DFv7WcYOhDBxExpkXJdbL1IsZDfYo8o7zJQ+YsPoMEc=; b=DxQQNBucLNOcbRbwq5eRWW8l7aV+fvGxQETt/Dv1Ujbqm3rcuAZVUDGVyy8hXwVTmz NW/iRCRP1JommdtRsYwmgVBUI2HunzctNR+8cNe6TuuPHI62qbHjX67jmI8mUMU1T/By 9XmpYdQbX0480FehTq5YAaTesgvbZrwv+aCeIhUGjPXbCgKeWIm52saYZ+RlZXcn9dtt g8qb2xZrkv33dKRhChLhAJcDe/RlufCSxgZzf6nTamUFfXugKDefUkcJWaFf08ukyGRT Xeeg+2lDwQksLWLLWFlulVPMMQKlgU40KldL0MtCai0T2c5bXIiuxvq1WcoIPrXR6O0g Q2UA== X-Gm-Message-State: AA+aEWb7pTxh3oaNZnUXD5I4N0Ru+wI56HrCXWKfGzTzHY6IpvAsvQ4F PLiYG+Z6WO8NaUWM7HiQ2S+HBk3b X-Google-Smtp-Source: AFSGD/WzioMvlNJTRxD1mPU5uTzhpPlQtmAdWPOszg4oERZM5UmlP34ufbFjCtmKSrYX8mCNNRwoRg== X-Received: by 2002:a62:644:: with SMTP id 65mr10086655pfg.161.1545579644395; Sun, 23 Dec 2018 07:40:44 -0800 (PST) Received: from localhost.localdomain ([178.67.254.124]) by smtp.gmail.com with ESMTPSA id c13sm65002556pfe.93.2018.12.23.07.40.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Dec 2018 07:40:43 -0800 (PST) From: Oleg Pykhalov Date: Sun, 23 Dec 2018 18:40:20 +0300 Message-Id: <20181223154021.14287-1-go.wigust@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <874lb45nov.fsf@gmail.com> References: <874lb45nov.fsf@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/services/configuration.scm (define-configuration): Add location. * gnu/services/mail.scm (namespace-configuration)[location]: Rename to 'mailbox-location'. (uglify-field-name): Handle this. * doc/guix.texi (Mail Services): Document this. --- doc/guix.texi | 2 +- gnu/services/configuration.scm | 5 +++++ gnu/services/mail.scm | 11 +++++++---- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index e254b3859..a6db2461d 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -14665,7 +14665,7 @@ different for all namespaces. For example @samp{Public/}. Defaults to @samp{""}. @end deftypevr -@deftypevr {@code{namespace-configuration} parameter} string location +@deftypevr {@code{namespace-configuration} parameter} string mailbox-location Physical location of the mailbox. This is in the same format as mail_location, which is also the default for it. Defaults to @samp{""}. diff --git a/gnu/services/configuration.scm b/gnu/services/configuration.scm index 707944cbe..9775f91ff 100644 --- a/gnu/services/configuration.scm +++ b/gnu/services/configuration.scm @@ -22,6 +22,7 @@ #:use-module (guix packages) #:use-module (guix records) #:use-module (guix gexp) + #:use-module ((guix utils) #:select (source-properties->location)) #:autoload (texinfo) (texi-fragment->stexi) #:autoload (texinfo serialize) (stexi->texi) #:use-module (ice-9 match) @@ -129,6 +130,10 @@ #,(id #'stem #'% #'stem) #,(id #'stem #'make- #'stem) #,(id #'stem #'stem #'?) + (location configuration-location + (default (and=> (current-source-location) + source-properties->location)) + (innate)) (field field-getter (default def)) ...) (define #,(id #'stem #'stem #'-fields) diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index fcaedd038..a8121e5d1 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -75,9 +75,12 @@ (define (uglify-field-name field-name) (let ((str (symbol->string field-name))) - (string-join (string-split (if (string-suffix? "?" str) - (substring str 0 (1- (string-length str))) - str) + (string-join (string-split (cond + ((string-suffix? "?" str) + (substring str 0 (1- (string-length str)))) + ((string=? str "mailbox-location") + "location") + (else str)) #\-) "_"))) @@ -413,7 +416,7 @@ format.") "Prefix required to access this namespace. This needs to be different for all namespaces. For example @samp{Public/}.") - (location + (mailbox-location (string "") "Physical location of the mailbox. This is in same format as mail_location, which is also the default for it.") -- 2.20.1 From unknown Fri Jun 13 11:26:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#33836] [PATCH 1/2] services: configuration: Add location. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Dec 2018 17:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33836 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Oleg Pykhalov Cc: 33836@debbugs.gnu.org Received: via spool by 33836-submit@debbugs.gnu.org id=B33836.154584541619902 (code B ref 33836); Wed, 26 Dec 2018 17:31:01 +0000 Received: (at 33836) by debbugs.gnu.org; 26 Dec 2018 17:30:16 +0000 Received: from localhost ([127.0.0.1]:37911 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gcD0Z-0005Av-Oj for submit@debbugs.gnu.org; Wed, 26 Dec 2018 12:30:15 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:44714) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gcD0V-0005Al-Lr for 33836@debbugs.gnu.org; Wed, 26 Dec 2018 12:30:12 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 223D71813; Wed, 26 Dec 2018 18:30:11 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4FZyxBnGlQau; Wed, 26 Dec 2018 18:30:10 +0100 (CET) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id F30251811; Wed, 26 Dec 2018 18:30:09 +0100 (CET) From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <874lb45nov.fsf@gmail.com> <20181223154021.14287-1-go.wigust@gmail.com> Date: Wed, 26 Dec 2018 18:30:09 +0100 In-Reply-To: <20181223154021.14287-1-go.wigust@gmail.com> (Oleg Pykhalov's message of "Sun, 23 Dec 2018 18:40:20 +0300") Message-ID: <87d0poci1q.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Hello, Oleg Pykhalov skribis: > * gnu/services/configuration.scm (define-configuration): Add location. > * gnu/services/mail.scm (namespace-configuration)[location]: Rename to > 'mailbox-location'. > (uglify-field-name): Handle this. > * doc/guix.texi (Mail Services): Document this. Nice! > --- a/gnu/services/configuration.scm > +++ b/gnu/services/configuration.scm > @@ -22,6 +22,7 @@ > #:use-module (guix packages) > #:use-module (guix records) > #:use-module (guix gexp) > + #:use-module ((guix utils) #:select (source-properties->location)) > #:autoload (texinfo) (texi-fragment->stexi) > #:autoload (texinfo serialize) (stexi->texi) > #:use-module (ice-9 match) > @@ -129,6 +130,10 @@ > #,(id #'stem #'% #'stem) > #,(id #'stem #'make- #'stem) > #,(id #'stem #'stem #'?) > + (location configuration-location > + (default (and=3D> (current-source-location) > + source-properties->location)) > + (innate)) What about calling the field =E2=80=98%location=E2=80=99 instead? That wou= ld avoid the collision with the other =E2=80=98location=E2=80=99 field and it should be = fine because it=E2=80=99s not a field we manually set anyway. Also, instead of =E2=80=98configuration-location=E2=80=99, shouldn=E2=80=99= t it be (id #'stem #'-location) ? That will avoid ending up with one =E2=80=98configuration-location=E2=80= =99 binding for each record type. Thanks, Ludo=E2=80=99. From unknown Fri Jun 13 11:26:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#33836] [PATCH] services: zabbix-front-end: Show location in messages. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Dec 2018 17:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33836 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Oleg Pykhalov Cc: 33836@debbugs.gnu.org Received: via spool by 33836-submit@debbugs.gnu.org id=B33836.154584549720037 (code B ref 33836); Wed, 26 Dec 2018 17:32:02 +0000 Received: (at 33836) by debbugs.gnu.org; 26 Dec 2018 17:31:37 +0000 Received: from localhost ([127.0.0.1]:37914 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gcD1t-0005D7-47 for submit@debbugs.gnu.org; Wed, 26 Dec 2018 12:31:37 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:44752) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gcD1r-0005Cx-0L for 33836@debbugs.gnu.org; Wed, 26 Dec 2018 12:31:35 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 899171813; Wed, 26 Dec 2018 18:31:34 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GLADBFzG2sTF; Wed, 26 Dec 2018 18:31:34 +0100 (CET) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id CF58A11AB; Wed, 26 Dec 2018 18:31:33 +0100 (CET) From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <874lb45nov.fsf@gmail.com> <20181223153633.13009-1-go.wigust@gmail.com> Date: Wed, 26 Dec 2018 18:31:33 +0100 In-Reply-To: <20181223153633.13009-1-go.wigust@gmail.com> (Oleg Pykhalov's message of "Sun, 23 Dec 2018 18:36:33 +0300") Message-ID: <878t0cchze.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Oleg Pykhalov skribis: > * gnu/services/monitoring.scm (zabbix-front-end-config): Show location in > messages. [...] > (define zabbix-front-end-config > (match-lambda > (($ > - _ db-host db-port db-name db-user db-password db-secret-file > + location _ db-host db-port db-name db-user db-password db-secret= -file > zabbix-host zabbix-port) Could you instead use =E2=80=98match-record=E2=80=99 here? That way you co= uld avoid maching the =E2=80=98location=E2=80=99 field altogether. Are there other users of =E2=80=98define-configuration=E2=80=99 that match = raw records? Thanks, Ludo=E2=80=99. From unknown Fri Jun 13 11:26:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#33836] [PATCH 1/2] services: configuration: Add location. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 15 Feb 2019 22:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33836 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Oleg Pykhalov Cc: 33836@debbugs.gnu.org Received: via spool by 33836-submit@debbugs.gnu.org id=B33836.155026949725510 (code B ref 33836); Fri, 15 Feb 2019 22:25:02 +0000 Received: (at 33836) by debbugs.gnu.org; 15 Feb 2019 22:24:57 +0000 Received: from localhost ([127.0.0.1]:49887 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gului-0006dN-GH for submit@debbugs.gnu.org; Fri, 15 Feb 2019 17:24:57 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:47802) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gulug-0006dF-Le for 33836@debbugs.gnu.org; Fri, 15 Feb 2019 17:24:55 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 284CE10300; Fri, 15 Feb 2019 23:24:54 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0mdiWg4FN3aE; Fri, 15 Feb 2019 23:24:52 +0100 (CET) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id A41B2102C2; Fri, 15 Feb 2019 23:24:52 +0100 (CET) From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <874lb45nov.fsf@gmail.com> <20181223154021.14287-1-go.wigust@gmail.com> <87d0poci1q.fsf@gnu.org> Date: Fri, 15 Feb 2019 23:24:52 +0100 In-Reply-To: <87d0poci1q.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Wed, 26 Dec 2018 18:30:09 +0100") Message-ID: <87k1i0itaj.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Hi Oleg, A friendly ping! :-) Ludo=E2=80=99. Ludovic Court=C3=A8s skribis: > Hello, > > Oleg Pykhalov skribis: > >> * gnu/services/configuration.scm (define-configuration): Add location. >> * gnu/services/mail.scm (namespace-configuration)[location]: Rename to >> 'mailbox-location'. >> (uglify-field-name): Handle this. >> * doc/guix.texi (Mail Services): Document this. > > Nice! > >> --- a/gnu/services/configuration.scm >> +++ b/gnu/services/configuration.scm >> @@ -22,6 +22,7 @@ >> #:use-module (guix packages) >> #:use-module (guix records) >> #:use-module (guix gexp) >> + #:use-module ((guix utils) #:select (source-properties->location)) >> #:autoload (texinfo) (texi-fragment->stexi) >> #:autoload (texinfo serialize) (stexi->texi) >> #:use-module (ice-9 match) >> @@ -129,6 +130,10 @@ >> #,(id #'stem #'% #'stem) >> #,(id #'stem #'make- #'stem) >> #,(id #'stem #'stem #'?) >> + (location configuration-location >> + (default (and=3D> (current-source-location) >> + source-properties->location)) >> + (innate)) > > What about calling the field =E2=80=98%location=E2=80=99 instead? That w= ould avoid the > collision with the other =E2=80=98location=E2=80=99 field and it should b= e fine because > it=E2=80=99s not a field we manually set anyway. > > Also, instead of =E2=80=98configuration-location=E2=80=99, shouldn=E2=80= =99t it be > > (id #'stem #'-location) > > ? That will avoid ending up with one =E2=80=98configuration-location=E2= =80=99 binding > for each record type. > > Thanks, > Ludo=E2=80=99. From unknown Fri Jun 13 11:26:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#33836] [PATCH 0/2] Apply suggestions. Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Feb 2019 22:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33836 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33836@debbugs.gnu.org Cc: Oleg Pykhalov Received: via spool by 33836-submit@debbugs.gnu.org id=B33836.155139366010228 (code B ref 33836); Thu, 28 Feb 2019 22:41:02 +0000 Received: (at 33836) by debbugs.gnu.org; 28 Feb 2019 22:41:00 +0000 Received: from localhost ([127.0.0.1]:55611 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gzUMN-0002et-OG for submit@debbugs.gnu.org; Thu, 28 Feb 2019 17:40:59 -0500 Received: from mail-lj1-f174.google.com ([209.85.208.174]:38274) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gzUML-0002ef-Mk for 33836@debbugs.gnu.org; Thu, 28 Feb 2019 17:40:58 -0500 Received: by mail-lj1-f174.google.com with SMTP id j19so18656925ljg.5 for <33836@debbugs.gnu.org>; Thu, 28 Feb 2019 14:40:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=w2kvaXpjRFKtaCh3C++lKh/w+D+LXVPDb7Ip7GH0wes=; b=qQRqTUIbWH+I3bEALSW5Hoe3ovqlAVTQdYCSzC165RPh+om10ZrMcACiwQyr7TeXiy ixXxrtv+gNyHO5UToo2N9vLYXBH3ZH7yWOSNHW4zgAhIvc+Z+c4uGqEUb9mOS8VEoVoM yMoErITZJ+vjOxZ7jPcb5kaGVafk1a/NLYObrOYtl5EgMF91pADzc7JMOLJYgCQ4Yo8s 63Ad0VQ9sAAoEdk6RIaw53A0PnfXlD4lIf4TBJ/i4RrevcB8u6mBxF/ymB394ThzK3rY qMQduxbIKraGQqZEYzUdf5vFk9f31LpvkdNdbS1wZDdvCWCY79KtAxA5OCWkB78iMMsT 8lrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=w2kvaXpjRFKtaCh3C++lKh/w+D+LXVPDb7Ip7GH0wes=; b=jK7ughQPZ2Z6KhEuP5/ZuDtcVFpaZVGdyXYHN2gpQVWh14/qHMWMzi/37dpd9YBsdu vYGe6G47RMFY2swlnonmLQOxeJbQryGJvIsAeYZ9tiWdUAj1QN16Yws+lAWmzQChUUXG yzxfK4lBijsGnLtMcURP7dc7xkVf0/ug+jDei/XG0911rxLgpDplkj3+4F0G5c9347DH 54ZnQnvl/fchidzAtKupouCg9Mt/U69thDOlPmgy5WluRjPMV2UmH7W1EWyqcI6sC02t 3lJt88ZOsJ/1ILCDpR+IorqJG2E97Bzae2qOdqQbmdZp9EhmWvA9XoJyVxQURFkKCKFv Ruvg== X-Gm-Message-State: APjAAAUojziqT29YOddabxIhxYjKu9mV60ZsW5gCeTm+XLoh/Bjdv55J ay6cdxEnbEPwzSkghVVHqdjjlKPQ X-Google-Smtp-Source: APXvYqw7dVoakO4hNYF/qlCBfex7bfRPk4o3w34aTnBj0782w94P/rKdokQLT2b2R9FFogo5abfSUA== X-Received: by 2002:a2e:b001:: with SMTP id y1mr740657ljk.130.1551393651259; Thu, 28 Feb 2019 14:40:51 -0800 (PST) Received: from localhost.localdomain (pppoe.95-55-181-170.dynamic.avangarddsl.ru. [95.55.181.170]) by smtp.gmail.com with ESMTPSA id w6sm1109204lfl.14.2019.02.28.14.40.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Feb 2019 14:40:50 -0800 (PST) From: Oleg Pykhalov Date: Fri, 1 Mar 2019 01:39:59 +0300 Message-Id: <20190228224001.27182-1-go.wigust@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <87k1i0itaj.fsf@gnu.org> References: <87k1i0itaj.fsf@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello Ludovic, Apologies for a big delay. I applied all your suggestions and improved (I hope) text in error and hint. Oleg Pykhalov (2): services: configuration: Add '%location'. services: zabbix-front-end: Show location in messages. gnu/services/configuration.scm | 5 +++ gnu/services/monitoring.scm | 57 ++++++++++++++++++++-------------- 2 files changed, 38 insertions(+), 24 deletions(-) -- 2.20.1 From unknown Fri Jun 13 11:26:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#33836] [PATCH 1/2] services: configuration: Add '%location'. Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Feb 2019 22:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33836 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33836@debbugs.gnu.org Cc: Oleg Pykhalov Received: via spool by 33836-submit@debbugs.gnu.org id=B33836.155139368510298 (code B ref 33836); Thu, 28 Feb 2019 22:42:02 +0000 Received: (at 33836) by debbugs.gnu.org; 28 Feb 2019 22:41:25 +0000 Received: from localhost ([127.0.0.1]:55615 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gzUMn-0002g2-1X for submit@debbugs.gnu.org; Thu, 28 Feb 2019 17:41:25 -0500 Received: from mail-lj1-f181.google.com ([209.85.208.181]:43997) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gzUMl-0002fo-Cm for 33836@debbugs.gnu.org; Thu, 28 Feb 2019 17:41:23 -0500 Received: by mail-lj1-f181.google.com with SMTP id z20so18630250ljj.10 for <33836@debbugs.gnu.org>; Thu, 28 Feb 2019 14:41:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xj/HP3pP1mdjp/3EGOTdnnu6TsANx3mkRI5/jOgmtK4=; b=rozFrlhDmZs40xdAxyMdd7lnS9f1zBGq1+GlwC2wtVe+AloFU5/RLt/untFFxSHPi7 mq3XhBeE6Ad9NTzwo+n5NXx5KF7vvR79Fx/tJHnpeBn1WTOwf9izETJooq8GMcLfyKqS lLjbHKu3OL9FMmZEHO0BUm0EIwYd/xKlxYXJzfxw/wg6G5YgEouI0pn1glyEFdk+ogLq uQEbcFwVzOAxd3b7wN1S7Y+X6u3WMf1Ct36W3oimVX0ndGuU6T8tS35OMNoW/PjRN5Kh d83DzkTZnJdKFGi+f3dhXF0dqHlHnbX/hz+sBZgyjOQIO+OTRwykLU+EHDTUb62w4Nmp kfFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xj/HP3pP1mdjp/3EGOTdnnu6TsANx3mkRI5/jOgmtK4=; b=SbhCyj6lBVJXlRvCXmzceVEPteOzYfWt71TXbsxMaJJ64w1mOW94ljlTrtdkqEGrMt jywzOFtUZMECA5r199aYpOQfMDWaVXwrjze8ISlvarXizTOYPH0v2pgn1bYdIcvdAwLw 41uw3M6F3oCefxs0d6choSGkr8fbgUYHmE7UZ7qHaBqP+bg6v370u7WCd3W7PzudwduN izWZWTMWvoacHvtqF1iEkAnymaBPnT3fmT83aXBaCR1vVvbf0hN+tr52XaNI6/2C0Gm/ jgB785Flyi221IONOdVldIjLeFMyWOIJRUGXIZKyRg4WqyKvg1yIENEKME7AAW+nWCNu Jnew== X-Gm-Message-State: APjAAAXmYl5DdXY/WpSUzHWDoZ8XXsMHQBrd21DYv/GriRY+2BrElhn5 PdTFanQI4jeRDQGJDDroRRBd08jl X-Google-Smtp-Source: APXvYqwUE86z+rfcxP0jtDzJl6vq/Rv8o6XfMgdFtxz6XyNkqLsNb7qhQjj3my8Qwivzd00dvMdhkQ== X-Received: by 2002:a2e:719:: with SMTP id 25mr768156ljh.122.1551393677158; Thu, 28 Feb 2019 14:41:17 -0800 (PST) Received: from localhost.localdomain (pppoe.95-55-181-170.dynamic.avangarddsl.ru. [95.55.181.170]) by smtp.gmail.com with ESMTPSA id w6sm1109204lfl.14.2019.02.28.14.41.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Feb 2019 14:41:16 -0800 (PST) From: Oleg Pykhalov Date: Fri, 1 Mar 2019 01:40:00 +0300 Message-Id: <20190228224001.27182-2-go.wigust@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190228224001.27182-1-go.wigust@gmail.com> References: <87k1i0itaj.fsf@gnu.org> <20190228224001.27182-1-go.wigust@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/services/configuration.scm (define-configuration): Add '%location'. --- gnu/services/configuration.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/services/configuration.scm b/gnu/services/configuration.scm index 707944cbe0..90f12a8d39 100644 --- a/gnu/services/configuration.scm +++ b/gnu/services/configuration.scm @@ -22,6 +22,7 @@ #:use-module (guix packages) #:use-module (guix records) #:use-module (guix gexp) + #:use-module ((guix utils) #:select (source-properties->location)) #:autoload (texinfo) (texi-fragment->stexi) #:autoload (texinfo serialize) (stexi->texi) #:use-module (ice-9 match) @@ -129,6 +130,10 @@ #,(id #'stem #'% #'stem) #,(id #'stem #'make- #'stem) #,(id #'stem #'stem #'?) + (%location #,(id #'stem #'-location) + (default (and=> (current-source-location) + source-properties->location)) + (innate)) (field field-getter (default def)) ...) (define #,(id #'stem #'stem #'-fields) -- 2.20.1 From unknown Fri Jun 13 11:26:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#33836] [PATCH 2/2] services: zabbix-front-end: Show location in messages. Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Feb 2019 22:42:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33836 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33836@debbugs.gnu.org Cc: Oleg Pykhalov Received: via spool by 33836-submit@debbugs.gnu.org id=B33836.155139368910315 (code B ref 33836); Thu, 28 Feb 2019 22:42:03 +0000 Received: (at 33836) by debbugs.gnu.org; 28 Feb 2019 22:41:29 +0000 Received: from localhost ([127.0.0.1]:55618 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gzUMr-0002gJ-Cm for submit@debbugs.gnu.org; Thu, 28 Feb 2019 17:41:29 -0500 Received: from mail-lj1-f176.google.com ([209.85.208.176]:42760) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gzUMp-0002ft-Da for 33836@debbugs.gnu.org; Thu, 28 Feb 2019 17:41:28 -0500 Received: by mail-lj1-f176.google.com with SMTP id d14so18629045ljl.9 for <33836@debbugs.gnu.org>; Thu, 28 Feb 2019 14:41:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3qBsgnDlGfXnFXEL45CJHBHC3aP3+5UxLzrsyB+M+ZQ=; b=sRa21eT1TJEhlCy89Ya/EkNPRNEdfVwDvHkPPLzM8Wta3kNwzqEISzTOoM6MqoulIk qt4FNy+5fsMNovlvYKzFtDcMdLHfb5R8og3dO7xOFdeCVpqYqq0tCqD/E/NAAN3Y5bV8 n27AEGz2lj7cK/RsiCdZiLlTZjjryGc33V55QALOkKNecRisbKQVnp+UQLQkxsMOFWlB GFKkeaULu13no+DOYvCtlCDdWqnDVqt99qePVLgAcKhi0XJY/z1bGGuiFkqzKwzj4D3C 82TgFCCcpRStFIio7QdPX2n34lgsuFdZUnUlMXeDO9xpvmMIlNaJwcBp5n3RGWv3sOSx hfMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3qBsgnDlGfXnFXEL45CJHBHC3aP3+5UxLzrsyB+M+ZQ=; b=sC2F2pHHfV3ZCMi80dOrdlfwhKsNT3YzwgSVDrXFW9EmVhmn+yEFPaQauF+JXnRhyJ erDy/z1/nGRgXgj2efVehvy+uzGRDrEkXESQLU521FHvvGAjfvMtb07hCbP1ph8o4o33 +XKD0vn+nKnP08i8S7J1SYP3IWoebua8x1UDWgyhVY9IWdSJgdCewCD4/C2qYqcOd3BW KX0kgMepy53lxrnmdn+ijQG8Lzq8AIijb5MNIC6yUKMV9H4Vypkrr0KEThgh2WtSVp6c FfM+NHOAlYRb0bTa8pQMMju0Cg8MjVVCEJbUMen04JLV4hIgmbU0oT1ZOU35Hl2OcnRF WZ9g== X-Gm-Message-State: APjAAAUtt54VPPj0fp8yufb1NGZCbAY0IjfVaTp4l0gMneMnyEETydIM eHHgxS/d/5L7Kr2xNzD5uzfbrNKS X-Google-Smtp-Source: APXvYqzzO778UqPZ/0l18HGXMv3KD5aqlPG2YJh94pxVJMpQdEzYaBrlp6f4VracSmx6jFHph6natQ== X-Received: by 2002:a2e:54f:: with SMTP id 76mr783060ljf.20.1551393680304; Thu, 28 Feb 2019 14:41:20 -0800 (PST) Received: from localhost.localdomain (pppoe.95-55-181-170.dynamic.avangarddsl.ru. [95.55.181.170]) by smtp.gmail.com with ESMTPSA id w6sm1109204lfl.14.2019.02.28.14.41.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Feb 2019 14:41:19 -0800 (PST) From: Oleg Pykhalov Date: Fri, 1 Mar 2019 01:40:01 +0300 Message-Id: <20190228224001.27182-3-go.wigust@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190228224001.27182-1-go.wigust@gmail.com> References: <87k1i0itaj.fsf@gnu.org> <20190228224001.27182-1-go.wigust@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/services/monitoring.scm (zabbix-front-end-config): Show location in messages. --- gnu/services/monitoring.scm | 57 +++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/gnu/services/monitoring.scm b/gnu/services/monitoring.scm index 685641f110..101222bf2e 100644 --- a/gnu/services/monitoring.scm +++ b/gnu/services/monitoring.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Sou Bunnbu ;;; Copyright © 2018 Gábor Boskovits -;;; Copyright © 2018 Oleg Pykhalov +;;; Copyright © 2018, 2019 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,7 +29,8 @@ #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix records) - #:use-module ((guix ui) #:select (display-hint)) + #:use-module (guix utils) + #:use-module ((guix ui) #:select (display-hint G_)) #:use-module (ice-9 match) #:use-module (ice-9 rdelim) #:use-module (srfi srfi-26) @@ -509,13 +510,12 @@ create it manually.") (number 10051) "Zabbix server port.")) -(define zabbix-front-end-config - (match-lambda - (($ - _ db-host db-port db-name db-user db-password db-secret-file - zabbix-host zabbix-port) - (mixed-text-file "zabbix.conf.php" - "\ +(define (zabbix-front-end-config config) + (match-record config + (%location db-host db-port db-name db-user db-password db-secret-file + zabbix-host zabbix-port) + (mixed-text-file "zabbix.conf.php" + "\ string db-port) "'; $DB['DATABASE'] = '" db-name "'; $DB['USER'] = '" db-user "'; -$DB['PASSWORD'] = '" (if (string-null? db-password) - (if (string-null? db-secret-file) - (raise (condition - (&message - (message "\ -you must provide either 'db-secret-file' or 'db-password'")))) - (string-trim-both - (with-input-from-file db-secret-file - read-string))) - (begin - (display-hint "\ -Consider using @code{db-secret-file} instead of @code{db-password} and unset -@code{db-password} for security in @code{zabbix-front-end-configuration}.") - db-password)) "'; +$DB['PASSWORD'] = '" (let ((file (location-file %location)) + (line (location-line %location)) + (column (location-column %location))) + (if (string-null? db-password) + (if (string-null? db-secret-file) + (raise (make-compound-condition + (condition + (&message + (message + (format #f "no '~A' or '~A' field in your '~A' record" + 'db-secret-file 'db-password + 'zabbix-front-end-configuration)))) + (condition + (&error-location + (location %location))))) + (string-trim-both + (with-input-from-file db-secret-file + read-string))) + (begin + (display-hint (format #f (G_ "~a:~a:~a: ~a: +Consider using @code{db-secret-file} instead of @code{db-password} for better +security.") file line column 'zabbix-front-end-configuration)) + db-password))) "'; // Schema name. Used for IBM DB2 and PostgreSQL. $DB['SCHEMA'] = ''; @@ -548,7 +557,7 @@ $ZBX_SERVER_PORT = '" (number->string zabbix-port) "'; $ZBX_SERVER_NAME = ''; $IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG; -")))) +"))) (define %maintenance.inc.php ;; Empty php file to allow us move zabbix-frontend configs to ‘/etc/zabbix’ -- 2.20.1 From unknown Fri Jun 13 11:26:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#33836] [PATCH 0/2] Apply suggestions. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Mar 2019 17:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33836 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Oleg Pykhalov Cc: 33836@debbugs.gnu.org Received: via spool by 33836-submit@debbugs.gnu.org id=B33836.155223853313010 (code B ref 33836); Sun, 10 Mar 2019 17:23:01 +0000 Received: (at 33836) by debbugs.gnu.org; 10 Mar 2019 17:22:13 +0000 Received: from localhost ([127.0.0.1]:38263 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h329N-0003Nm-9N for submit@debbugs.gnu.org; Sun, 10 Mar 2019 13:22:13 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h329L-0003NX-DC for 33836@debbugs.gnu.org; Sun, 10 Mar 2019 13:22:11 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:50533) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3298-0008WR-3t; Sun, 10 Mar 2019 13:22:00 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=41250 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1h3296-0005dU-H7; Sun, 10 Mar 2019 13:21:57 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87k1i0itaj.fsf@gnu.org> <20190228224001.27182-1-go.wigust@gmail.com> Date: Sun, 10 Mar 2019 18:21:55 +0100 In-Reply-To: <20190228224001.27182-1-go.wigust@gmail.com> (Oleg Pykhalov's message of "Fri, 1 Mar 2019 01:39:59 +0300") Message-ID: <87imwq3arw.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Oleg, Oleg Pykhalov skribis: > Apologies for a big delay. > > I applied all your suggestions and improved (I hope) text in error and hi= nt. > > Oleg Pykhalov (2): > services: configuration: Add '%location'. > services: zabbix-front-end: Show location in messages. LGTM, thank you! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 10 15:52:24 2019 Received: (at control) by debbugs.gnu.org; 10 Mar 2019 19:52:24 +0000 Received: from localhost ([127.0.0.1]:38436 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h34Ug-0000jz-1E for submit@debbugs.gnu.org; Sun, 10 Mar 2019 15:52:22 -0400 Received: from mail-lf1-f53.google.com ([209.85.167.53]:34275) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h34Ud-0000jk-Qv for control@debbugs.gnu.org; Sun, 10 Mar 2019 15:52:20 -0400 Received: by mail-lf1-f53.google.com with SMTP id y18so1854593lfe.1 for ; Sun, 10 Mar 2019 12:52:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:to:from:subject; bh=ayxUgG9x4b5wkAs94eM2Nv6DtXWhT1pt4xshyNtkKsU=; b=Zu7zwa+2IUZpPxN4m1RKW0rBORQ5y5Bfzl3fephC7apyjn8vgIuPZ+THcqk71lCiz4 m5o7O61+LVVBr7rmOD7ab+xsvxUz4PnUiM3/pBwcg7KFpRE3VjnDFYFO5ZCaT9oqOy/T 9FS+o11uzkecRnEZPoXO+ex46HIjny+seCLc2QGSO+cc8pCzSAAL1WHG9OUVW4TLGMwd ALArDYXQFRWN+Y1Bwbq5itv4PGNtnBwBRGFnVtnsRlCS5LycinMJZGg08pn2ICAUZCcJ iF63s3nAJd24tNHqxhmtFUutyngYvDklYj4a0uz8Sx9cDHrPsmNomCi1eawSJtrXEERj zejw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:to:from:subject; bh=ayxUgG9x4b5wkAs94eM2Nv6DtXWhT1pt4xshyNtkKsU=; b=JV+YgYe9UgS9uKEMXqWZkMOF8aWV5nYg3t9cxdHzSbFRHa3xROlRCG8lmbQx1R9250 w1V2zn/KuVSRl51UXav2yRqkbIoo5mmyLuM7lyMhIBUyNoxjNQObWaSevTDkwsd4IBB5 am97Y/L99pw/pJFq7YupejKcrMu7rDXKVDf45BwCHswXleEQKEuLqMAZ5+2Qmp1nMdrj 6pm+bKvhTBPm7dLxZ9sB0pgQ1Hfzq3vuroJzKIqzuK/EEqDNCV5izmg0SVcs75Y4kPye FKtVUjL78ouJThGBRpIv0VmO+ZQ+dZ2YFV9ax1cBLP7TG+aNfsqIXZOidcEobonkls5I NGWg== X-Gm-Message-State: APjAAAUYuQxZQ5Mb929jAm3xZhyTmwvq6Vd/PVTuKS5iFrmkqjtLQxi/ PkhFEIyS2yxSLr+T3QRb5moCClvp X-Google-Smtp-Source: APXvYqyvqtegDOo94NBRwn/jKiDcZvycDsZoE8SNEc+dRrbkb11PKiN5ZWTB9YuljCQ3Xl04n0zXlg== X-Received: by 2002:a19:238f:: with SMTP id j137mr3490894lfj.79.1552247533230; Sun, 10 Mar 2019 12:52:13 -0700 (PDT) Received: from guixsd (95-55-10-33.dynamic.avangarddsl.ru. [95.55.10.33]) by smtp.gmail.com with ESMTPSA id u2sm472363lfm.10.2019.03.10.12.52.12 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 10 Mar 2019 12:52:12 -0700 (PDT) Date: Sun, 10 Mar 2019 22:51:33 +0300 Message-Id: <878sxmy0ca.fsf@gmail.com> To: control@debbugs.gnu.org From: Oleg Pykhalov Subject: control message for bug #33836 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) tags 33836 fixed close 33836