--- Begin Message ---
|
Subject: |
[PATCH]: website: Convert old style sheets into a theme |
|
Date: |
Wed, 13 Mar 2024 20:44:01 +0000 |
|
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.0 |
Hi,
This is a patch for the guix-artwork repository.
NOTE: If this patch is applied, other HTML resources apart from the
website (like HTML versions of the Guix manual) will have to be updated
to use the new location of stylesheets and other assets they depend upon.
Cheers,
--
Luis Felipe López Acevedo
https://luis-felipe.gitlab.io/
0001-website-Convert-old-style-sheets-into-a-theme.patch
Description: Text Data
OpenPGP_0x0AB0D067012F08C3.asc
Description: OpenPGP public key
OpenPGP_signature
Description: OpenPGP digital signature
--- End Message ---
--- Begin Message ---
|
Subject: |
Re: [bug#69783] [PATCH v2 2/2] hydra: nginx: Further adjust to website themes in guix-artwork. |
|
Date: |
Sun, 31 Mar 2024 12:07:52 +0200 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) |
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
--- End Message ---