From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id QHqCDl42CWZUjwAAe85BDQ:P1 (envelope-from ) for ; Sun, 31 Mar 2024 12:09:34 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id QHqCDl42CWZUjwAAe85BDQ (envelope-from ) for ; Sun, 31 Mar 2024 12:09:34 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=pelzflorian.de header.s=key2 header.b=ZKQjaIZP; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1711879774; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-to: 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=1pcC2JiDPVpF+de/92sJTm0o0CYb2YlKg0diC733mZQ=; b=MqbOiejddFvO1e4owu2F0aLegFQqjESwgpX9tRYX2A4nYhDsj+ARYaxHX01ppLoQbyWaEM JjH+HyqnCe7SjEolCbquVCPdlhd3xib0VTImshJz74aoS913DNcTHCeeg2uZsvRoEX88nG TaIW7dls1FF/Qi6Iy9WRvh9DpljKkqLIXZTSr4WO8G8y6Ge9TH92LvUxwFhZf5WGkB9Oa9 G8KHah6Qoo+QAhChn/W53ElqzthI7la0NvfFNFLAI8ZNRyEs8hjFDInYTIeFu0m0gaFi+x /cvNdeoLq1P3PDzm89DYQq0A5vBtCCqxcASY7ycAreshLoSrUrXrHbWJfzX2Dw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=pelzflorian.de header.s=key2 header.b=ZKQjaIZP; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1711879774; a=rsa-sha256; cv=none; b=Vy9L9dfy/23d32JyyjCK3lh8fvhdbXIdPfI3QaISd4bdD3mSC3fxageTx1pfHTvAZWa4gK 51iPkcbnE7637yxFnALrrsdBj6ra+ORE5cJSTzucTP71YgYjN7tkIgDowT+J7nHsTWYC/I IQDFkZ6YGDwPAOJEiyFbZRnF7B6ch3aGuCBf03Ev6EnX743NeD6UjYCyyIwYKdRdX0DoqN zM7tP4oMNopaEfsO2e/om+i1t/kd9eRxHzZcXiX4Fr8RkOscw/AZp3+rrqCQFnX4/Z5/Cg fS2a8HDvvWnSgxLjxE9yJrnnm2EtYsBsh8Z5I3N4Jk86PywUwOv+PqlL0PTVeA== 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 BBF2256522 for ; Sun, 31 Mar 2024 12:09:33 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqs7Z-00067p-UH; Sun, 31 Mar 2024 06:09:01 -0400 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 1rqs7Y-00067Q-Ed for guix-patches@gnu.org; Sun, 31 Mar 2024 06:09:00 -0400 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 1rqs7Y-0001Ss-6c for guix-patches@gnu.org; Sun, 31 Mar 2024 06:09:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rqs7a-0001zs-GJ for guix-patches@gnu.org; Sun, 31 Mar 2024 06:09:02 -0400 Subject: bug#69783: [PATCH v2 2/2] hydra: nginx: Further adjust to website themes in guix-artwork. Resent-From: "pelzflorian (Florian Pelz)" Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Sun, 31 Mar 2024 10:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 69783 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 69783-done@debbugs.gnu.org, Luis Felipe Mail-Followup-To: 69783@debbugs.gnu.org, pelzflorian@pelzflorian.de, sirgazil@zoho.com Received: via spool by 69783-done@debbugs.gnu.org id=D69783.17118796907556 (code D ref 69783); Sun, 31 Mar 2024 10:09:02 +0000 Received: (at 69783-done) by debbugs.gnu.org; 31 Mar 2024 10:08:10 +0000 Received: from localhost ([127.0.0.1]:46661 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqs6j-0001xn-EX for submit@debbugs.gnu.org; Sun, 31 Mar 2024 06:08:09 -0400 Received: from relay.yourmailgateway.de ([188.68.61.107]:48187) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqs6e-0001x2-W9 for 69783-done@debbugs.gnu.org; Sun, 31 Mar 2024 06:08:08 -0400 Received: from mors-relay-8405.netcup.net (localhost [127.0.0.1]) by mors-relay-8405.netcup.net (Postfix) with ESMTPS id 4V6qb51FZ2z6yXW; Sun, 31 Mar 2024 12:08:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de; s=key2; t=1711879681; bh=gwIuTBts9Mbhri2dhtj3c4eg2PQxJoeBysMBThmxIU4=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=ZKQjaIZP/jEj2BjVMbS41G73V3Qu7XbmnSn+5MyCCleC+bFbuy0ShFhibQcIAywwf 2/r7tAkRJ6qF9m15EEQyiIFHv1BHa5K9Kc7JqZcVSYSYeg6rjgNG6MthJxnGlvVK15 scoWdeCRtRIoaohHSVwLck3WeLtaWWoTNZ7WFKALSR2tiW+mNBnUwCTrzGjBydg7En 60CRyzy3YdOfugSoQ6Qqy1/YN+bda8HaZxYGsEhReopuPL6oflVFU9tmEn3zNhSTac zlI4Mx14i7qCBwtin3Mi9+7G4CEN/oQTI9QDgOSRHlmDnUR1iHoz90j15eJAzUAPO2 zstRhOkJALKKg== Received: from policy02-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-8405.netcup.net (Postfix) with ESMTPS id 4V6qb50VqRz6yFL; Sun, 31 Mar 2024 12:08:01 +0200 (CEST) Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy02-mors.netcup.net (Postfix) with ESMTPS id 4V6qb45Llcz8sWg; Sun, 31 Mar 2024 12:08:00 +0200 (CEST) Received: from florianrock64 (ip92344de0.dynamic.kabel-deutschland.de [146.52.77.224]) by mxe217.netcup.net (Postfix) with ESMTPSA id 243EA81E37; Sun, 31 Mar 2024 12:07:54 +0200 (CEST) From: "pelzflorian (Florian Pelz)" In-Reply-To: <87a5mgf0hh.fsf@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Sat, 30 Mar 2024 12:00:26 +0100") References: <9cac9566-3716-1079-1d53-215cb7fa547b@zoho.com> <20240324182012.5026-2-pelzflorian@pelzflorian.de> <87a5mgf0hh.fsf@gnu.org> Date: Sun, 31 Mar 2024 12:07:52 +0200 Message-ID: <87plvabton.fsf@pelzflorian.de> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 243EA81E37 X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: jJRA+JjBcIIrGdcyazjr1ZBp0eA+d4pAmVxnY9nKKEuTGKhqGvhs/7AA 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -2.35 X-Migadu-Queue-Id: BBF2256522 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -2.35 X-TUID: v75f2+8byZ+Q Thank you Ludo. Ludovic Court=C3=A8s writes: > Florian Pelz skribis: >=20 > > * hydra/modules/sysadmin/nginx.scm (guix.gnu.org-redirect-locations): > > Redirect /static to the new /themes location to fix the 1.4.0 manual. >=20 > Good catch. Pushed, thanks! I deployed it on bayfront just now. It was Luis=E2=80=99 catch. > I guess we can close now? Yes, closing. > Hi Florian, > > Florian Pelz skribis: > >> * hydra/nginx/berlin.scm: Use /static cache settings for /themes. > > I hadn=E2=80=99t noticed your message and did this: > > https://git.savannah.gnu.org/cgit/guix/maintenance.git/commit/?id=3Def0= e3bf584a66ac14ff230da54c7d25d0fdf0129 > >> diff --git a/hydra/nginx/berlin.scm b/hydra/nginx/berlin.scm >> index 5ba15d1..2f8cd60 100644 >> --- a/hydra/nginx/berlin.scm >> +++ b/hydra/nginx/berlin.scm >> @@ -174,6 +174,16 @@ PUBLISH-URL." >> "proxy_cache_valid any 10m;" >> "proxy_ignore_client_abort on;"))) >>=20=20 >> + (nginx-location-configuration >> + (uri "/themes") ;like "/static" above >> + (body > > If I=E2=80=99m not mistaken, I think this is the wrong place: =E2=80=98be= rlin-locations=E2=80=99 > returns locations for ci.guix.gnu.org (Cuirass), not for the web site. > There=E2=80=99s no /themes in Cuirass. Am I right? Of course you are absolutely right. I lost touch and had not known about the separation of CI (which like Luis=E2=80=99 separation of themes in guix-artwork is a good thing): commit 4cf3743e0daddac99ff71a151a5fd37cbe874493 Author: Ludovic Court=C3=A8s Date: Tue Dec 21 23:34:35 2021 +0100 hydra: Add (sysadmin nginx) module. =20=20=20=20 This factorizes the guix.gnu.org web site configuration. The nginx.conf derivation for berlin.scm is left unchanged. =20=20=20=20 * hydra/nginx/berlin.scm (le, redirect, %tls-settings) (guix.gnu.org-redirect-locations, languages-to-accept) (guix.gnu.org-redirects-for-each-language) (guix.gnu.org-other-locations, accept-languages): Move to... * hydra/modules/sysadmin/nginx.scm: ... here. * hydra/nginx/berlin.scm (%berlin-servers): Use GUIX.GNU.ORG-NGINX-SERVER instead of the inline copy. and did not know the purpose of bayfront. > Thanks, > Ludo=E2=80=99. > > PS: The private guix-sysadmin@gnu.org mailing list is probably a better > contact point for these things (if you wish to subscribe, feel free > to do so!). I should have known. I do not wish to subscribe, though. Regards, Florian