diff mbox series

[bug#69783,v2,2/2] hydra: nginx: Further adjust to website themes in guix-artwork.

Message ID 20240324182012.5026-2-pelzflorian@pelzflorian.de
State New
Headers
Series [bug#69783] : website: Convert old style sheets into a theme |

Commit Message

pelzflorian (Florian Pelz) March 24, 2024, 6:19 p.m. UTC 
* hydra/nginx/berlin.scm: Use /static cache settings for /themes.
---
 hydra/nginx/berlin.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

Comments

Ludovic Courtès March 30, 2024, 11 a.m. UTC | #1 
Hi Florian,

Florian Pelz <pelzflorian@pelzflorian.de> skribis:

> * hydra/nginx/berlin.scm: Use /static cache settings for /themes.

I hadn’t noticed your message and did this:

  https://git.savannah.gnu.org/cgit/guix/maintenance.git/commit/?id=ef0e3bf584a66ac14ff230da54c7d25d0fdf0129

> 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;")))
>  
> +           (nginx-location-configuration
> +            (uri "/themes") ;like "/static" above
> +            (body

If I’m not mistaken, I think this is the wrong place: ‘berlin-locations’
returns locations for ci.guix.gnu.org (Cuirass), not for the web site.
There’s no /themes in Cuirass.  Am I right?

Thanks,
Ludo’.

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!).
pelzflorian (Florian Pelz) March 31, 2024, 10:07 a.m. UTC | #2 
Thank you Ludo.

Ludovic Courtès <ludo@gnu.org> writes:
> Florian Pelz <pelzflorian@pelzflorian.de> skribis:
> 
> > * hydra/modules/sysadmin/nginx.scm (guix.gnu.org-redirect-locations):
> > Redirect /static to the new /themes location to fix the 1.4.0 manual.
> 
> Good catch.  Pushed, thanks!  I deployed it on bayfront just now.

It was Luis’ catch.


> I guess we can close now?

Yes, closing.



> Hi Florian,
>
> Florian Pelz <pelzflorian@pelzflorian.de> skribis:
>
>> * hydra/nginx/berlin.scm: Use /static cache settings for /themes.
>
> I hadn’t noticed your message and did this:
>
>   https://git.savannah.gnu.org/cgit/guix/maintenance.git/commit/?id=ef0e3bf584a66ac14ff230da54c7d25d0fdf0129
>
>> 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;")))
>>  
>> +           (nginx-location-configuration
>> +            (uri "/themes") ;like "/static" above
>> +            (body
>
> If I’m not mistaken, I think this is the wrong place: ‘berlin-locations’
> returns locations for ci.guix.gnu.org (Cuirass), not for the web site.
> There’s 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’ separation of themes in
guix-artwork is a good thing):

commit 4cf3743e0daddac99ff71a151a5fd37cbe874493
Author: Ludovic Courtès <ludo@gnu.org>
Date:   Tue Dec 21 23:34:35 2021 +0100

    hydra: Add (sysadmin nginx) module.
    
    This factorizes the guix.gnu.org web site configuration.
    The nginx.conf derivation for berlin.scm is left unchanged.
    
    * 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’.
>
> 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
diff mbox series

Patch

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;")))
 
+           (nginx-location-configuration
+            (uri "/themes") ;like "/static" above
+            (body
+             (list
+              "proxy_pass http://localhost:8081;"
+              "proxy_cache static;"
+              "proxy_cache_valid 200 2d;"
+              "proxy_cache_valid any 10m;"
+              "proxy_ignore_client_abort on;")))
+
            (nginx-location-configuration
             (uri "/download")                     ;Cuirass "build products"
             (body