From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id a85MCFm3cmDs7wAAgWs5BA (envelope-from ) for ; Sun, 11 Apr 2021 10:46:17 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id yOMbAVm3cmCVdQAAB5/wlQ (envelope-from ) for ; Sun, 11 Apr 2021 08:46:17 +0000 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 E3A4632389 for ; Sun, 11 Apr 2021 10:46:15 +0200 (CEST) Received: from localhost ([::1]:47964 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lVVjS-0005mt-Tg for larch@yhetil.org; Sun, 11 Apr 2021 04:46:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45478) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lVVjG-0005lZ-Em for guix-patches@gnu.org; Sun, 11 Apr 2021 04:46:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42419) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lVVjG-0008LU-6e for guix-patches@gnu.org; Sun, 11 Apr 2021 04:46:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lVVjG-0003j2-4g for guix-patches@gnu.org; Sun, 11 Apr 2021 04:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47704] [PATCH] services: mysql: Add extra-environment as configuration option. Resent-From: david larsson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Apr 2021 08:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47704 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47704@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161813071414245 (code B ref -1); Sun, 11 Apr 2021 08:46:01 +0000 Received: (at submit) by debbugs.gnu.org; 11 Apr 2021 08:45:14 +0000 Received: from localhost ([127.0.0.1]:53962 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lVViN-0003hX-T5 for submit@debbugs.gnu.org; Sun, 11 Apr 2021 04:45:14 -0400 Received: from lists.gnu.org ([209.51.188.17]:48412) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lVViJ-0003hI-O7 for submit@debbugs.gnu.org; Sun, 11 Apr 2021 04:45:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45310) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lVViJ-0005Cj-Gk for guix-patches@gnu.org; Sun, 11 Apr 2021 04:45:03 -0400 Received: from server0.selfhosted.xyz ([217.64.149.7]:51200) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lVViG-0007dI-BN for guix-patches@gnu.org; Sun, 11 Apr 2021 04:45:03 -0400 Received: from server0.selfhosted.xyz (localhost [127.0.0.1]) by server0.selfhosted.xyz (Postfix) with ESMTP id 9773B1D08398 for ; Sun, 11 Apr 2021 10:44:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=selfhosted.xyz; s=dkim; t=1618130689; bh=NvxHACZ+e8H7FjsLRsozdI8CQBzraNkq+U9du13nHi4=; h=Date:From:To:Subject; b=VRyJZl8DLggIar6Nj2heDxnHZeirzGSX+uXJyMTVsbarMGvx//kvhnxrRtJnl2WD7 PRBTFNanZL+4I0deTkqMos8bHUsfd4LJNiKvc3daNv0ZBvVBq+f12T8xWROCwNXit5 JLay3BKeOOqQv8FwT3fz8VG4FdnA1mRBHnw+z344mKMfI6TcMGG88o3lV358Wj06TT 89ArMmx0qy6JpxxS9tEXNi0B8XW0BoGr0p5uRp6Q1GPWT9DDsvooTssR70JaG4ERw3 IncwCQYgErQ/Kmklw8M4Vjzc35xf+ve6IlNZBdOxTv7OVutOq9jitexCjfKYHz8ju9 vdj0EFH0ahS0Q== X-Fuglu-Suspect: 4ccbea31caa04b95a9482c87fb3ed6d5 X-Fuglu-Spamstatus: NO Received: from webmail.selfhosted.xyz (office.selfhosted.xyz [192.168.1.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: mail@selfhosted.xyz) by server0.selfhosted.xyz (Postfix) with ESMTPSA for ; Sun, 11 Apr 2021 10:44:43 +0200 (CEST) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=_e3c828103ebcd526c94d2436e10c1ce5" Date: Sun, 11 Apr 2021 10:44:43 +0200 From: david larsson Message-ID: <91c1726e12b938f7656d7d7862920f69@selfhosted.xyz> X-Sender: david.larsson@selfhosted.xyz Received-SPF: pass client-ip=217.64.149.7; envelope-from=david.larsson@selfhosted.xyz; helo=server0.selfhosted.xyz X-Spam_score_int: -5 X-Spam_score: -0.6 X-Spam_bar: / X-Spam_report: (-0.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FROM_SUSPICIOUS_NTLD=0.499, FROM_SUSPICIOUS_NTLD_FP=1.33, PDS_OTHER_BAD_TLD=1.999, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1618130776; 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:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=NvxHACZ+e8H7FjsLRsozdI8CQBzraNkq+U9du13nHi4=; b=A3+RXiZexEi5CSKZ/G1YSJxItQR5EXEwkdhY6sjy8Ssq8fZre+WSvmUv0H849N3WHpnGPt /Fs3eQC6Z9Wfb+MYWWtM5TkNYp+YHHQJC+0ra6Er5zgY3sgEQCXHAZR75ATyB0ZXfPt1Fn wcbjEe9+dJtvueHWGngJxTT1z8uy/QECl9AwXAeYf+zhO6V3fhGZDMr6/wB5Bd1T+wdXTa 5cudERVklT/NJYCciOmfTawozGdWLFrnJ/Hxo1uvH4m9QSs2/Kabn8JFnHtd2LznvE4YMm IHUbekLXAepCeZdPnb4u0syx25OZLJlrlO30slsIBUaaTHkUJP+mUWYihd1SIA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1618130776; a=rsa-sha256; cv=none; b=phpH3wxPWNxZciyAB0VfhFLZCW/61vqx+EujILJRCkOO+/3thRR+REdXM/k3uWIsGMPOLn tvRsB9noj/vNS5nF9ZfGhRPW1qa3n2naKpEK/OkzVb9/9SLIlrLyX8hgbcFcrxLr58Dl7q GXNVsLK2gVTTohvpY0sWZwU1GBHfeYEiygYvPKTzn6mVZcjXW2I9bidPhk+REUAztltwaB +cAnXl6Lc/ExKcQJ/N4pXfiKHjjcdfb5C5F0Pll9iUxXlfhsdQIQLGOcdzOs07VybtYDZR oQ4xCrYSUupmMGzBT18cjqdmQ/HxIHzn/Ta1kWNafBEfQzHEqdXBrT04uP9Z0A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=selfhosted.xyz header.s=dkim header.b=VRyJZl8D; dmarc=fail reason="SPF not aligned (relaxed)" header.from=selfhosted.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 0.26 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=selfhosted.xyz header.s=dkim header.b=VRyJZl8D; dmarc=fail reason="SPF not aligned (relaxed)" header.from=selfhosted.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: E3A4632389 X-Spam-Score: 0.26 X-Migadu-Scanner: scn0.migadu.com X-TUID: HFxAeeIkUwD5 --=_e3c828103ebcd526c94d2436e10c1ce5 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed Hi! This patch is needed for the Galera add-on to MariaDB, which runs some scripts like for example wsrep_sst_rsync that needs access to additional binaries in PATH. I tested the patch with (and without) below snippets to the mysql-service in my config.scm and successfully connected to a MariaDB/Galera cluster. I ran these commands to test: guix pull --url=/home/user1/src/guix --profile=/tmp/guix.master --disable-authentication --allow-downgrades ; GUIX_PROFILE="/tmp/guix.master" ; . "$GUIX_PROFILE/etc/profile" ; guix system reconfigure config.scm --fallback --allow-downgrades ------------------------------------------------------------------ (extra-environment #~(list (string-append "PATH=/usr/bin:/bin:" #$rsync "/bin:" #$coreutils "/bin:" #$gawk "/bin:" #$grep "/bin:" #$mariadb "/bin:" #$iproute "/sbin:" "/run/setuid-programs:/run/current-system/profile/bin:/run/current-system/profile/sbin" ) (string-append "SHELL=" #$bash) "USER=mysql" "SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt" "SSL_CERT_DIR=/run/current-system/profile/etc/ssl/certs")) (extra-content #~(string-append "log_error=/var/lib/mysql/log_error.log # https://www.percona.com/blog/2017/07/26/what-is-innodb_autoinc_lock_mode-and-why-should-i-care/ binlog_format=ROW default-storage-engine=innodb innodb_autoinc_lock_mode=2 # Galera Provider Configuration wsrep_on=ON wsrep_provider=" #$galera "/lib/libgalera_smm.so # Galera Cluster Configuration wsrep_cluster_name=\"test_cluster\" wsrep_cluster_address=\"gcomm://redacted,redacted\" # according to https://galeracluster.com/library/documentation/mysql-wsrep-options.html # leaving it empty starts a new cluster, so you should immediately reconfigure again after doing this. #wsrep_cluster_address=\"gcomm://\" # Galera Synchronization Configuration wsrep_sst_method=rsync # Galera Node Configuration wsrep_node_address=\"redacted\" wsrep_node_name=\"librem13v3guixsd\"")) )) ------------------------------------------------------------------ Please someone also review [bug#47517] [PATCH] gnu: nginx: Enable stream module which adds support for tcp loadbalancing that can be used to scale a MariaDB/Galera cluster. Best regards, David --=_e3c828103ebcd526c94d2436e10c1ce5 Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name=0001-services-mysql-Add-extra-environment-as-configuratio.patch Content-Disposition: attachment; filename=0001-services-mysql-Add-extra-environment-as-configuratio.patch; size=2954 RnJvbSA5Mjc0NDQ2NTJmNGI3NzQ5MjhkZTc4YzE1NThiNGU5NDJhYmZmMjAzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBtZXRodXNlbGFoLTAgPGRhdmlkLmxhcnNzb25Ac2VsZmhvc3Rl ZC54eXo+CkRhdGU6IFN1biwgMTEgQXByIDIwMjEgMTA6MzA6MDEgKzAyMDAKU3ViamVjdDogW1BB VENIXSBzZXJ2aWNlczogbXlzcWw6IEFkZCBleHRyYS1lbnZpcm9ubWVudCBhcyBjb25maWd1cmF0 aW9uCiBvcHRpb24uCgoqIGdudS9zZXJ2aWNlcy9kYXRhYmFzZXMuc2NtIChteXNxbC1jb25maWd1 cmF0aW9uKTogQWRkIGV4dHJhLWVudmlyb25tZW50CihteXNxbC1zZXJ2aWNlKTogVXNlICM6bG9n LWZpbGUgYW5kICM6ZW52aXJvbm1lbnQtdmFyaWFibGVzCgoqIGRvYy9ndWl4LnRleGk6IERvY3Vt ZW50IGl0LgotLS0KIGRvYy9ndWl4LnRleGkgICAgICAgICAgICAgIHwgMyArKysKIGdudS9zZXJ2 aWNlcy9kYXRhYmFzZXMuc2NtIHwgNyArKysrKystCiAyIGZpbGVzIGNoYW5nZWQsIDkgaW5zZXJ0 aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2RvYy9ndWl4LnRleGkgYi9kb2Mv Z3VpeC50ZXhpCmluZGV4IGMyM2QwNDRmZjUuLjI5ODU4NWE2OTUgMTAwNjQ0Ci0tLSBhL2RvYy9n dWl4LnRleGkKKysrIGIvZG9jL2d1aXgudGV4aQpAQCAtMTk4MDksNiArMTk4MDksOSBAQCBTb2Nr ZXQgZmlsZSB0byB1c2UgZm9yIGxvY2FsIChub24tbmV0d29yaykgY29ubmVjdGlvbnMuCiBAaXRl bSBAY29kZXtleHRyYS1jb250ZW50fSAoZGVmYXVsdDogQGNvZGV7IiJ9KQogQWRkaXRpb25hbCBz ZXR0aW5ncyBmb3IgdGhlIEBmaWxle215LmNuZn0gY29uZmlndXJhdGlvbiBmaWxlLgogCitAaXRl bSBAY29kZXtleHRyYS1lbnZpcm9ubWVudH0gKGRlZmF1bHQ6IEBjb2RleyN+JygpfSkKK0xpc3Qg b2YgZW52aXJvbm1lbnQgdmFyaWFibGVzIHBhc3NlZCB0byB0aGUgQGNvbW1hbmR7bXlzcWxkfSBw cm9jZXNzLgorCiBAaXRlbSBAY29kZXthdXRvLXVwZ3JhZGU/fSAoZGVmYXVsdDogQGNvZGV7I3R9 KQogV2hldGhlciB0byBhdXRvbWF0aWNhbGx5IHJ1biBAY29tbWFuZHtteXNxbF91cGdyYWRlfSBh ZnRlciBzdGFydGluZyB0aGUKIHNlcnZpY2UuICBUaGlzIGlzIG5lY2Vzc2FyeSB0byB1cGdyYWRl IHRoZSBAZGZue3N5c3RlbSBzY2hlbWF9IGFmdGVyCmRpZmYgLS1naXQgYS9nbnUvc2VydmljZXMv ZGF0YWJhc2VzLnNjbSBiL2dudS9zZXJ2aWNlcy9kYXRhYmFzZXMuc2NtCmluZGV4IGE4NDFlN2E1 MGUuLjhkMjY2YzFjYmEgMTAwNjQ0Ci0tLSBhL2dudS9zZXJ2aWNlcy9kYXRhYmFzZXMuc2NtCisr KyBiL2dudS9zZXJ2aWNlcy9kYXRhYmFzZXMuc2NtCkBAIC03LDYgKzcsNyBAQAogOzs7IENvcHly aWdodCDCqSAyMDE4IEp1bGllbiBMZXBpbGxlciA8anVsaWVuQGxlcGlsbGVyLmV1PgogOzs7IENv cHlyaWdodCDCqSAyMDE5IFJvYmVydCBWb2xsbWVydCA8cm9iQHZsbG1ydC5uZXQ+CiA7OzsgQ29w eXJpZ2h0IMKpIDIwMjAgTWFyaXVzIEJha2tlIDxtYXJpdXNAZ251Lm9yZz4KKzs7OyBDb3B5cmln aHQgwqkgMjAyMSBEYXZpZCBMYXJzc29uIDxkYXZpZC5sYXJzc29uQHNlbGZob3N0ZWQueHl6Pgog Ozs7CiA7OzsgVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05VIEd1aXguCiA7OzsKQEAgLTUyNyw2ICs1 MjgsNyBAQCBjcmVhdGVkIGFmdGVyIHRoZSBQb3N0Z3JlU1FMIGRhdGFiYXNlIGlzIHN0YXJ0ZWQu IikpKQogICAocG9ydCBteXNxbC1jb25maWd1cmF0aW9uLXBvcnQgKGRlZmF1bHQgMzMwNikpCiAg IChzb2NrZXQgbXlzcWwtY29uZmlndXJhdGlvbi1zb2NrZXQgKGRlZmF1bHQgIi9ydW4vbXlzcWxk L215c3FsZC5zb2NrIikpCiAgIChleHRyYS1jb250ZW50IG15c3FsLWNvbmZpZ3VyYXRpb24tZXh0 cmEtY29udGVudCAoZGVmYXVsdCAiIikpCisgIChleHRyYS1lbnZpcm9ubWVudCBteXNxbC1jb25m aWd1cmF0aW9uLWV4dHJhLWVudmlyb25tZW50IChkZWZhdWx0ICN+JygpKSkKICAgKGF1dG8tdXBn cmFkZT8gbXlzcWwtY29uZmlndXJhdGlvbi1hdXRvLXVwZ3JhZGU/IChkZWZhdWx0ICN0KSkpCiAK IChkZWZpbmUgJW15c3FsLWFjY291bnRzCkBAIC02MTEsMTEgKzYxMywxNCBAQCBGTFVTSCBQUklW SUxFR0VTOwogICAgICAgICAgKHByb3Zpc2lvbiAnKG15c3FsKSkKICAgICAgICAgIChkb2N1bWVu dGF0aW9uICJSdW4gdGhlIE15U1FMIHNlcnZlci4iKQogICAgICAgICAgKHN0YXJ0IChsZXQgKCht eXNxbCAgKG15c3FsLWNvbmZpZ3VyYXRpb24tbXlzcWwgY29uZmlnKSkKKyAgICAgICAgICAgICAg ICAgICAgICAoZXh0cmEtZW52IChteXNxbC1jb25maWd1cmF0aW9uLWV4dHJhLWVudmlyb25tZW50 IGNvbmZpZykpCiAgICAgICAgICAgICAgICAgICAgICAgKG15LmNuZiAobXlzcWwtY29uZmlndXJh dGlvbi1maWxlIGNvbmZpZykpKQogICAgICAgICAgICAgICAgICAgI34obWFrZS1mb3JrZXhlYy1j b25zdHJ1Y3RvcgogICAgICAgICAgICAgICAgICAgICAgKGxpc3QgKHN0cmluZy1hcHBlbmQgIyRt eXNxbCAiL2Jpbi9teXNxbGQiKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgKHN0cmluZy1h cHBlbmQgIi0tZGVmYXVsdHMtZmlsZT0iICMkbXkuY25mKSkKLSAgICAgICAgICAgICAgICAgICAg ICM6dXNlciAibXlzcWwiICM6Z3JvdXAgIm15c3FsIikpKQorICAgICAgICAgICAgICAgICAgICAg ICAgICAgIzp1c2VyICJteXNxbCIgIzpncm91cCAibXlzcWwiCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAjOmxvZy1maWxlICIvdmFyL2xvZy9teXNxbGQubG9nIgorICAgICAgICAgICAgICAg ICAgICAgICAgICAgIzplbnZpcm9ubWVudC12YXJpYWJsZXMgIyRleHRyYS1lbnYpKSkKICAgICAg ICAgIChzdG9wICN+KG1ha2Uta2lsbC1kZXN0cnVjdG9yKSkpKSkKIAogKGRlZmluZSAobXlzcWwt dXBncmFkZS13cmFwcGVyIG15c3FsIHNvY2tldC1maWxlKQotLSAKMi4zMC4yCgo= --=_e3c828103ebcd526c94d2436e10c1ce5--