[PATCH]: website: Convert old style sheets into a theme

  • Done
  • quality assurance status badge
Details
4 participants
  • Giovanni Biscuolo
  • Ludovic Courtès
  • pelzflorian (Florian Pelz)
  • Luis Felipe
Owner
unassigned
Submitted by
Luis Felipe
Severity
normal
L
L
Luis Felipe wrote on 13 Mar 21:44 +0100
(address . guix-patches@gnu.org)
9cac9566-3716-1079-1d53-215cb7fa547b@zoho.com
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
Attachment: 0001-website-Convert-old-style-sheets-into-a-theme.patch
Attachment: OpenPGP_0x0AB0D067012F08C3.asc
Attachment: OpenPGP_signature
P
P
pelzflorian (Florian Pelz) wrote on 14 Mar 17:56 +0100
(name . Luis Felipe)(address . sirgazil@zoho.com)(address . 69783@debbugs.gnu.org)
87le6k69cu.fsf@pelzflorian.de
Hi sirgazil,

the patch looks good, although I will not push it as I do not know where
the CSS file for manuals is set (guix repo? maintenance?). And,

* themes is a name clash with haunt themes
which may be OK nonetheless. But theme could also be named style or
something. Or not. The name themes is quite fitting.

* I wonder, why are static/base/img/icon and scientific-mark.svg created
and not moved?

Regards,
Florian
L
L
Luis Felipe wrote on 14 Mar 21:16 +0100
(name . pelzflorian (Florian Pelz))(address . pelzflorian@pelzflorian.de)(address . 69783@debbugs.gnu.org)
9fdc8464-bd8e-26a4-e14d-d71209b02df5@zoho.com
Hi Florian, thank you very much for reviewing.
El 14/03/24 a las 16:56, pelzflorian (Florian Pelz) escribió:
Toggle quote (2 lines)
> the patch looks good, although I will not push it as I do not know where
> the CSS file for manuals is set (guix repo? maintenance?). And,
It seems the stylesheets for the manuals are set in
Toggle quote (4 lines)
> * themes is a name clash with haunt themes
> <https://files.dthompson.us/docs/haunt/latest/Blog.html#index-theme>,
> which may be OK nonetheless. But theme could also be named style or
> something. Or not. The name themes is quite fitting.
Yeah, personally, I don't mind using the |themes| concept for both the
SXML components and the CSS stylesheets because of their relation. But I
wouldn't mind using |styles| if necessary. So, if you prefer the latter,
let me know and I'll update the patch.
Toggle quote (2 lines)
> * I wonder, why are static/base/img/icon and scientific-mark.svg created
> and not moved?
Right, they are leftovers. I can provide an updated patch to fix that.
Attachment: OpenPGP_0x0AB0D067012F08C3.asc
Attachment: OpenPGP_signature
P
P
pelzflorian (Florian Pelz) wrote on 15 Mar 11:19 +0100
(name . Luis Felipe)(address . sirgazil@zoho.com)(address . 69783@debbugs.gnu.org)
8734sr4x1b.fsf@pelzflorian.de
Luis Felipe <sirgazil@zoho.com> writes:
Toggle quote (9 lines)
> Hi Florian, thank you very much for reviewing.
>
> El 14/03/24 a las 16:56, pelzflorian (Florian Pelz) escribió:
>> the patch looks good, although I will not push it as I do not know where
>> the CSS file for manuals is set (guix repo? maintenance?). And,
>
> It seems the stylesheets for the manuals are set in
> https://git.savannah.gnu.org/cgit/guix.git/tree/doc/build.scm.

Thank you, yes. Someone with access to maintenance / berlin might have
to kickstart the manual build, which is another reason I was hesitant to
push. I can push later today and the worst that can happen is that CSS
will be missing for those who do not have cached the CSS file.

Toggle quote (11 lines)
>> * themes is a name clash with haunt themes
>> <https://files.dthompson.us/docs/haunt/latest/Blog.html#index-theme>,
>> which may be OK nonetheless. But theme could also be named style or
>> something. Or not. The name themes is quite fitting.
>
> Yeah, personally, I don't mind using the |themes| concept for both the
> SXML components and the CSS stylesheets because of their relation. But
> I wouldn't mind using |styles| if necessary. So, if you prefer the
> latter, let me know and I'll update the patch.
>

No, I believe the name clash is okay, because themes is such a fitting
name.

Toggle quote (4 lines)
>> * I wonder, why are static/base/img/icon and scientific-mark.svg created
>> and not moved?
> Right, they are leftovers. I can provide an updated patch to fix that.

Thank you for confirming they are the same.

Regards,
Florian
S
S
sirgazil wrote on 15 Mar 16:33 +0100
[PATCH v2] website: Convert old style sheets into a theme.
(address . 69783@debbugs.gnu.org)(name . Luis Felipe)(address . sirgazil@zoho.com)
20240315153337.5713-1-sirgazil@zoho.com
From: Luis Felipe <sirgazil@zoho.com>

This change introduces the concept of website themes to separate the
look and feel of the website from unrelated static files and make it
easier to update themes, create new ones or switch between them.

* website/themes/initial: New theme.
* website/haunt.scm (site): Include the "themes" directory.
* website/apps/base/utils.scm (guix-website-theme): New variable.
(theme-url): New URL shorthand procedure.

The following template files were updated to use the new theme URL
shorthand:

* website/apps/base/templates/about.scm
* website/apps/base/templates/components.scm
* website/apps/base/templates/contact.scm
* website/apps/base/templates/contribute.scm
* website/apps/base/templates/cuirass.scm
* website/apps/base/templates/donate.scm
* website/apps/base/templates/graphics.scm
* website/apps/base/templates/help.scm
* website/apps/base/templates/home.scm
* website/apps/base/templates/irc.scm
* website/apps/base/templates/menu.scm
* website/apps/base/templates/security.scm
* website/apps/base/templates/theme.scm
* website/apps/blog/templates/feed.scm
* website/apps/blog/templates/post-list.scm
* website/apps/blog/templates/post.scm
* website/apps/blog/templates/tag.scm
* website/apps/download/templates/download-latest.scm
* website/apps/download/templates/download.scm
* website/apps/media/templates/components.scm
* website/apps/media/templates/publication-list.scm
* website/apps/media/templates/screenshot.scm
* website/apps/media/templates/screenshots-overview.scm
* website/apps/media/templates/video-list.scm
* website/apps/media/templates/video.scm

The following files were moved to the "initial" theme:

* website/static/base/css/breadcrumbs.css -> website/themes/initial/css/breadcrumbs.css
* website/static/base/css/buttons.css -> website/themes/initial/css/buttons.css
* website/static/base/css/code.css -> website/themes/initial/css/code.css
* website/static/base/css/common.css -> website/themes/initial/css/common.css
* website/static/base/css/contact.css -> website/themes/initial/css/contact.css
* website/static/base/css/download.css -> website/themes/initial/css/download.css
* website/static/base/css/elements.css -> website/themes/initial/css/elements.css
* website/static/base/css/footer.css -> website/themes/initial/css/footer.css
* website/static/base/css/index.css -> website/themes/initial/css/index.css
* website/static/base/css/item-preview.css -> website/themes/initial/css/item-preview.css
* website/static/base/css/manual.css -> website/themes/initial/css/manual.css
* website/static/base/css/menu.css -> website/themes/initial/css/menu.css
* website/static/base/css/messages.css -> website/themes/initial/css/messages.css
* website/static/base/css/navbar.css -> website/themes/initial/css/navbar.css
* website/static/base/css/page.css -> website/themes/initial/css/page.css
* website/static/blog/css/post.css -> website/themes/initial/css/post.css
* website/static/base/css/sidebar.css -> website/themes/initial/css/sidebar.css
* website/static/base/img/Guix-logo.png -> website/themes/initial/img/Guix-logo.png
* website/static/base/img/Guix.png -> website/themes/initial/img/Guix.png
* website/static/base/img/back-btn-bg.png -> website/themes/initial/img/back-btn-bg.png
* website/static/base/img/breadcrumbs-bg.png -> website/themes/initial/img/breadcrumbs-bg.png
* website/static/base/img/chat-icon.png -> website/themes/initial/img/chat-icon.png
* website/static/base/img/checkerboard-bg.png -> website/themes/initial/img/checkerboard-bg.png
* website/static/base/img/cookbook-icon.png -> website/themes/initial/img/cookbook-icon.png
* website/static/base/img/depression-shadow-top.png -> website/themes/initial/img/depression-shadow-top.png
* website/static/base/img/dropdown-bg.png -> website/themes/initial/img/dropdown-bg.png
* website/static/base/img/email-icon.png -> website/themes/initial/img/email-icon.png
* website/static/base/img/featured-box-bg.png -> website/themes/initial/img/featured-box-bg.png
* website/static/base/img/feed-bg-white.png -> website/themes/initial/img/feed-bg-white.png
* website/static/base/img/feed.png -> website/themes/initial/img/feed.png
* website/static/base/img/feed.svg -> website/themes/initial/img/feed.svg
* website/static/base/img/h-separator-dark.png -> website/themes/initial/img/h-separator-dark.png
* website/static/base/img/h-separator.png -> website/themes/initial/img/h-separator.png
* website/static/base/img/icon.png -> website/themes/initial/img/icon.png
* website/static/base/img/icon.svg -> website/themes/initial/img/icon.svg
* website/static/base/img/icon-set.svg -> website/themes/initial/img/icon-set.svg
* website/static/base/img/language-picker.svg -> website/themes/initial/img/language-picker.svg
* website/static/base/img/library-icon.png -> website/themes/initial/img/library-icon.png
* website/static/base/img/link-arrow-shaper.svg -> website/themes/initial/img/link-arrow-shaper.svg
* website/static/base/img/link-arrow.png -> website/themes/initial/img/link-arrow.png
* website/static/base/img/manual-icon.png -> website/themes/initial/img/manual-icon.png
* website/static/base/img/manual-latest-icon.png -> website/themes/initial/img/manual-latest-icon.png
* website/static/base/img/menu-btn-bg.png -> website/themes/initial/img/menu-btn-bg.png
* website/static/base/img/menu-item-active-bg.png -> website/themes/initial/img/menu-item-active-bg.png
* website/static/base/img/more-info-bg.png -> website/themes/initial/img/more-info-bg.png
* website/static/base/img/noise-bg.png -> website/themes/initial/img/noise-bg.png
* website/static/base/img/videos-icon.png -> website/themes/initial/img/videos-icon.png
* website/static/base/img/white-star.png -> website/themes/initial/img/white-star.png
* website/static/base/img/wiki-icon.png -> website/themes/initial/img/wiki-icon.png
* website/static/media/css/publications.css -> website/themes/initial/css/publications.css
* website/static/media/css/screenshots.css -> website/themes/initial/css/screenshots.css
* website/static/media/css/video-list.css -> website/themes/initial/css/video-list.css
* website/static/media/css/video-preview.css -> website/themes/initial/css/video-preview.css
* website/static/media/css/video.css -> website/themes/initial/css/video.css
* website/static/media/img/playing-icon.svg -> website/themes/initial/img/playing-icon.svg
* website/static/media/img/playlist-icon.svg -> website/themes/initial/img/playlist-icon.svg
* website/static/media/img/scientific-mark.svg -> website/themes/initial/img/scientific-mark.svg
* website/static/packages/css/letter-selector.css -> website/themes/initial/css/letter-selector.css
* website/static/packages/css/package-list.css -> website/themes/initial/css/package-list.css
* website/static/packages/css/package.css -> website/themes/initial/css/package.css
* website/static/packages/img/red-tag.png -> website/themes/initial/img/red-tag.png

The following files were removed:

* website/static/base/img/GuixSD-logo.png: Delete (obsolete).
---
website/apps/base/templates/about.scm | 2 +-
website/apps/base/templates/components.scm | 6 +++---
website/apps/base/templates/contact.scm | 6 +++---
website/apps/base/templates/contribute.scm | 4 ++--
website/apps/base/templates/cuirass.scm | 2 +-
website/apps/base/templates/donate.scm | 2 +-
website/apps/base/templates/graphics.scm | 4 ++--
website/apps/base/templates/help.scm | 20 +++++++++---------
website/apps/base/templates/home.scm | 6 +++---
website/apps/base/templates/irc.scm | 2 +-
website/apps/base/templates/menu.scm | 2 +-
website/apps/base/templates/security.scm | 2 +-
website/apps/base/templates/theme.scm | 18 ++++++++--------
website/apps/base/utils.scm | 20 +++++++++++++++++-
website/apps/blog/templates/feed.scm | 2 +-
website/apps/blog/templates/post-list.scm | 6 +++---
website/apps/blog/templates/post.scm | 6 +++---
website/apps/blog/templates/tag.scm | 6 +++---
.../download/templates/download-latest.scm | 4 ++--
website/apps/download/templates/download.scm | 4 ++--
website/apps/media/templates/components.scm | 6 +++---
.../apps/media/templates/publication-list.scm | 4 ++--
website/apps/media/templates/screenshot.scm | 4 ++--
.../media/templates/screenshots-overview.scm | 2 +-
website/apps/media/templates/video-list.scm | 4 ++--
website/apps/media/templates/video.scm | 4 ++--
website/haunt.scm | 1 +
website/static/base/img/GuixSD-logo.png | Bin 6785 -> 0 bytes
website/themes/README.org | 6 ++++++
.../initial}/css/breadcrumbs.css | 0
.../base => themes/initial}/css/buttons.css | 0
.../base => themes/initial}/css/code.css | 0
.../base => themes/initial}/css/common.css | 0
.../base => themes/initial}/css/contact.css | 0
.../base => themes/initial}/css/download.css | 0
.../base => themes/initial}/css/elements.css | 0
.../base => themes/initial}/css/footer.css | 0
.../base => themes/initial}/css/index.css | 0
.../initial}/css/item-preview.css | 0
.../initial}/css/letter-selector.css | 0
.../base => themes/initial}/css/manual.css | 0
.../base => themes/initial}/css/menu.css | 0
.../base => themes/initial}/css/messages.css | 0
.../base => themes/initial}/css/navbar.css | 0
.../initial}/css/package-list.css | 0
.../initial}/css/package.css | 0
.../base => themes/initial}/css/page.css | 0
.../blog => themes/initial}/css/post.css | 0
.../initial}/css/publications.css | 2 +-
.../initial}/css/screenshots.css | 0
.../base => themes/initial}/css/sidebar.css | 2 +-
.../initial}/css/video-list.css | 0
.../initial}/css/video-preview.css | 0
.../media => themes/initial}/css/video.css | 0
.../base => themes/initial}/img/Guix-logo.png | Bin
.../base => themes/initial}/img/Guix.png | Bin
.../initial}/img/back-btn-bg.png | Bin
.../initial}/img/breadcrumbs-bg.png | Bin
.../base => themes/initial}/img/chat-icon.png | Bin
.../initial}/img/checkerboard-bg.png | Bin
.../initial}/img/cookbook-icon.png | Bin
.../initial}/img/depression-shadow-top.png | Bin
.../initial}/img/dropdown-bg.png | Bin
.../initial}/img/email-icon.png | Bin
.../initial}/img/featured-box-bg.png | Bin
.../initial}/img/feed-bg-white.png | Bin
.../base => themes/initial}/img/feed.png | Bin
.../base => themes/initial}/img/feed.svg | 0
.../initial}/img/h-separator-dark.png | Bin
.../initial}/img/h-separator.png | Bin
.../base => themes/initial}/img/icon-set.svg | 0
.../base => themes/initial}/img/icon.png | Bin
.../base => themes/initial}/img/icon.svg | 0
.../initial}/img/language-picker.svg | 0
.../initial}/img/library-icon.png | Bin
.../initial}/img/link-arrow-shaper.svg | 0
.../initial}/img/link-arrow.png | Bin
.../initial}/img/manual-icon.png | Bin
.../initial}/img/manual-latest-icon.png | Bin
.../initial}/img/menu-btn-bg.png | Bin
.../initial}/img/menu-item-active-bg.png | Bin
.../initial}/img/more-info-bg.png | Bin
.../base => themes/initial}/img/noise-bg.png | Bin
.../initial}/img/playing-icon.svg | 0
.../initial}/img/playlist-icon.svg | 0
.../initial}/img/red-tag.png | Bin
.../initial}/img/scientific-mark.svg | 0
.../initial}/img/videos-icon.png | Bin
.../initial}/img/white-star.png | Bin
.../base => themes/initial}/img/wiki-icon.png | Bin
90 files changed, 92 insertions(+), 67 deletions(-)
delete mode 100644 website/static/base/img/GuixSD-logo.png
create mode 100644 website/themes/README.org
rename website/{static/base => themes/initial}/css/breadcrumbs.css (100%)
rename website/{static/base => themes/initial}/css/buttons.css (100%)
rename website/{static/base => themes/initial}/css/code.css (100%)
rename website/{static/base => themes/initial}/css/common.css (100%)
rename website/{static/base => themes/initial}/css/contact.css (100%)
rename website/{static/base => themes/initial}/css/download.css (100%)
rename website/{static/base => themes/initial}/css/elements.css (100%)
rename website/{static/base => themes/initial}/css/footer.css (100%)
rename website/{static/base => themes/initial}/css/index.css (100%)
rename website/{static/base => themes/initial}/css/item-preview.css (100%)
rename website/{static/packages => themes/initial}/css/letter-selector.css (100%)
rename website/{static/base => themes/initial}/css/manual.css (100%)
rename website/{static/base => themes/initial}/css/menu.css (100%)
rename website/{static/base => themes/initial}/css/messages.css (100%)
rename website/{static/base => themes/initial}/css/navbar.css (100%)
rename website/{static/packages => themes/initial}/css/package-list.css (100%)
rename website/{static/packages => themes/initial}/css/package.css (100%)
rename website/{static/base => themes/initial}/css/page.css (100%)
rename website/{static/blog => themes/initial}/css/post.css (100%)
rename website/{static/media => themes/initial}/css/publications.css (92%)
rename website/{static/media => themes/initial}/css/screenshots.css (100%)
rename website/{static/base => themes/initial}/css/sidebar.css (96%)
rename website/{static/media => themes/initial}/css/video-list.css (100%)
rename website/{static/media => themes/initial}/css/video-preview.css (100%)
rename website/{static/media => themes/initial}/css/video.css (100%)
rename website/{static/base => themes/initial}/img/Guix-logo.png (100%)
rename website/{static/base => themes/initial}/img/Guix.png (100%)
rename website/{static/base => themes/initial}/img/back-btn-bg.png (100%)
rename website/{static/base => themes/initial}/img/breadcrumbs-bg.png (100%)
rename website/{static/base => themes/initial}/img/chat-icon.png (100%)
rename website/{static/base => themes/initial}/img/checkerboard-bg.png (100%)
rename website/{static/base => themes/initial}/img/cookbook-icon.png (100%)
rename website/{static/base => themes/initial}/img/depression-shadow-top.png (100%)
rename website/{static/base => themes/initial}/img/dropdown-bg.png (100%)
rename website/{static/base => themes/initial}/img/email-icon.png (100%)
rename website/{static/base => themes/initial}/img/featured-box-bg.png (100%)
rename website/{static/base => themes/initial}/img/feed-bg-white.png (100%)
rename website/{static/base => themes/initial}/img/feed.png (100%)
rename website/{static/base => themes/initial}/img/feed.svg (100%)
rename website/{static/base => themes/initial}/img/h-separator-dark.png (100%)
rename website/{static/base => themes/initial}/img/h-separator.png (100%)
rename website/{static/base => themes/initial}/img/icon-set.svg (100%)
rename website/{static/base => themes/initial}/img/icon.png (100%)
rename website/{static/base => themes/initial}/img/icon.svg (100%)
rename website/{static/base => themes/initial}/img/language-picker.svg (100%)
rename website/{static/base => themes/initial}/img/library-icon.png (100%)
rename website/{static/base => themes/initial}/img/link-arrow-shaper.svg (100%)
rename website/{static/base => themes/initial}/img/link-arrow.png (100%)
rename website/{static/base => themes/initial}/img/manual-icon.png (100%)
rename website/{static/base => themes/initial}/img/manual-latest-icon.png (100%)
rename website/{static/base => themes/initial}/img/menu-btn-bg.png (100%)
rename website/{static/base => themes/initial}/img/menu-item-active-bg.png (100%)
rename website/{static/base => themes/initial}/img/more-info-bg.png (100%)
rename website/{static/base => themes/initial}/img/noise-bg.png (100%)
rename website/{static/media => themes/initial}/img/playing-icon.svg (100%)
rename website/{static/media => themes/initial}/img/playlist-icon.svg (100%)
rename website/{static/packages => themes/initial}/img/red-tag.png (100%)
rename website/{static/media => themes/initial}/img/scientific-mark.svg (100%)
rename website/{static/base => themes/initial}/img/videos-icon.png (100%)
rename website/{static/base => themes/initial}/img/white-star.png (100%)
rename website/{static/base => themes/initial}/img/wiki-icon.png (100%)

Toggle diff (83 lines)
diff --git a/website/apps/base/templates/about.scm b/website/apps/base/templates/about.scm
index 1cf2f65..68c8815 100644
--- a/website/apps/base/templates/about.scm
+++ b/website/apps/base/templates/about.scm
@@ -26,7 +26,7 @@
system|GNU Hurd|GNU Guix package manager") #\|)
#:active-menu-item (C_ "website menu" "About")
#:css (list
- (guix-url "static/base/css/page.css"))
+ (theme-url "css/page.css"))
#:crumbs (list (crumb (C_ "website menu" "About") "./"))
#:content
`(main
diff --git a/website/apps/base/templates/components.scm b/website/apps/base/templates/components.scm
index 2a6881e..82f3b85 100644
--- a/website/apps/base/templates/components.scm
+++ b/website/apps/base/templates/components.scm
@@ -179,8 +179,8 @@
`(img
(@ (class "h-separator")
,(if light
- `(src ,(guix-url "static/base/img/h-separator.png"))
- `(src ,(guix-url "static/base/img/h-separator-dark.png")))
+ `(src ,(theme-url "img/h-separator.png"))
+ `(src ,(theme-url "img/h-separator-dark.png")))
(alt ""))))
(define (horizontal-skip)
@@ -191,7 +191,7 @@
"Return SHTML for a visible separator to be used in a dropdown menu
like a menu item."
`(img (@ (class "hline")
- (src ,(guix-url "static/base/img/h-separator.png"))
+ (src ,(theme-url "img/h-separator.png"))
(alt ""))))
diff --git a/website/apps/base/templates/contact.scm b/website/apps/base/templates/contact.scm
index 49d8393..33d4abf 100644
--- a/website/apps/base/templates/contact.scm
+++ b/website/apps/base/templates/contact.scm
@@ -25,9 +25,9 @@ system|GNU Hurd|GNU Guix package manager|Community|Mailing lists|IRC \
channels|Bug reports|Help") #\|)
#:active-menu-item (C_ "website menu" "About")
#:css (list
- (guix-url "static/base/css/page.css")
- (guix-url "static/base/css/buttons.css")
- (guix-url "static/base/css/contact.css"))
+ (theme-url "css/page.css")
+ (theme-url "css/buttons.css")
+ (theme-url "css/contact.css"))
#:crumbs (list (crumb (C_ "website menu" "Contact") "./"))
#:content
`(main
diff --git a/website/apps/base/templates/contribute.scm b/website/apps/base/templates/contribute.scm
index 42ffcb9..703267f 100644
--- a/website/apps/base/templates/contribute.scm
+++ b/website/apps/base/templates/contribute.scm
@@ -25,8 +25,8 @@ system|GNU Hurd|GNU Guix package manager|Volunteer|Development|\
Translation|I18N|L10N|Artwork") #\|)
#:active-menu-item (C_ "website menu" "About")
#:css (list
- (guix-url "static/base/css/page.css")
- (guix-url "static/base/css/item-preview.css"))
+ (theme-url "css/page.css")
+ (theme-url "css/item-preview.css"))
#:crumbs (list (crumb (C_ "website menu" "Contribute") "./"))
#:content
`(main
diff --git a/website/apps/base/templates/cuirass.scm b/website/apps/base/templates/cuirass.scm
index 00fe4b9..b421530 100644
--- a/website/apps/base/templates/cuirass.scm
+++ b/website/apps/base/templates/cuirass.scm
@@ -21,7 +21,7 @@
(G_ "GNU|Linux|Unix|Free software|Libre software|Operating \
system|GNU Guix package manager|Cuirass|CI") #\|)
#:css (list
- (guix-url "static/base/css/page.css"))
+ (theme-url "css/page.css"))
#:content
`(main
(section
diff --git a/website/apps/base/
This message was truncated. Download the full message here.
S
S
sirgazil wrote on 15 Mar 20:34 +0100
[PATCH] doc: build: Update paths to style sheets.
(address . 69783@debbugs.gnu.org)(name . Luis Felipe)(address . sirgazil@zoho.com)
20240315193422.14350-1-sirgazil@zoho.com
From: Luis Felipe <sirgazil@zoho.com>

The Guix website style sheets are now organized in themes. This change
makes the documentation builder use the resources provided by a theme

* doc/build.scm (syntax-highlighted-html): Update path to CSS.
(html-manual-indexes): Likewise.
(stylized-html): Likewise, and update path to language picker image.

Change-Id: Ib2d51fcfdec42ad827add1ead1cfee4c9c4e65b7
---
doc/build.scm | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)

Toggle diff (62 lines)
diff --git a/doc/build.scm b/doc/build.scm
index 2cd57b4a92..9ab2ca32d2 100644
--- a/doc/build.scm
+++ b/doc/build.scm
@@ -365,7 +365,7 @@ (define* (syntax-highlighted-html input
#:languages
languages))
(syntax-css-url
- "/static/base/css/code.css"))
+ "/themes/initial/css/code.css"))
"Return a derivation called NAME that processes all the HTML files in INPUT
to (1) add them a link to SYNTAX-CSS-URL, and (2) highlight the syntax of all
its <pre class=\"lisp\"> blocks (as produced by 'makeinfo --html')."
@@ -624,7 +624,7 @@ (define* (stylized-html source input
#:key
(languages %languages)
(manual %manual)
- (manual-css-url "/static/base/css/manual.css"))
+ (manual-css-url "/themes/initial/css/manual.css"))
"Process all the HTML files in INPUT; add them MANUAL-CSS-URL as a <style>
link, and add a menu to choose among LANGUAGES. Use the Guix PO files found
in SOURCE."
@@ -741,7 +741,7 @@ (define split-node?
(list (menu-dropdown
#:label
`(img (@ (alt "Language")
- (src "/static/base/img/language-picker.svg")))
+ (src "/themes/initial/img/language-picker.svg")))
#:items
(language-menu-items file)))
#:split-node? split-node?)
@@ -1141,16 +1141,16 @@ (define (sxml-index language title body)
;; Menu prefetch.
(link (@ (rel "prefetch") (href ,(guix-url "menu/index.html"))))
;; Base CSS.
- (link (@ (rel "stylesheet") (href ,(guix-url "static/base/css/elements.css"))))
- (link (@ (rel "stylesheet") (href ,(guix-url "static/base/css/common.css"))))
- (link (@ (rel "stylesheet") (href ,(guix-url "static/base/css/messages.css"))))
- (link (@ (rel "stylesheet") (href ,(guix-url "static/base/css/navbar.css"))))
- (link (@ (rel "stylesheet") (href ,(guix-url "static/base/css/breadcrumbs.css"))))
- (link (@ (rel "stylesheet") (href ,(guix-url "static/base/css/buttons.css"))))
- (link (@ (rel "stylesheet") (href ,(guix-url "static/base/css/footer.css"))))
-
- (link (@ (rel "stylesheet") (href ,(guix-url "static/base/css/page.css"))))
- (link (@ (rel "stylesheet") (href ,(guix-url "static/base/css/post.css")))))
+ (link (@ (rel "stylesheet") (href ,(guix-url "themes/initial/css/elements.css"))))
+ (link (@ (rel "stylesheet") (href ,(guix-url "themes/initial/css/common.css"))))
+ (link (@ (rel "stylesheet") (href ,(guix-url "themes/initial/css/messages.css"))))
+ (link (@ (rel "stylesheet") (href ,(guix-url "themes/initial/css/navbar.css"))))
+ (link (@ (rel "stylesheet") (href ,(guix-url "themes/initial/css/breadcrumbs.css"))))
+ (link (@ (rel "stylesheet") (href ,(guix-url "themes/initial/css/buttons.css"))))
+ (link (@ (rel "stylesheet") (href ,(guix-url "themes/initial/css/footer.css"))))
+
+ (link (@ (rel "stylesheet") (href ,(guix-url "themes/initial/css/page.css"))))
+ (link (@ (rel "stylesheet") (href ,(guix-url "themes/initial/css/post.css")))))
(body
(header (@ (class "navbar"))
(h1 (a (@ (class "branding")

base-commit: 93aefca7bab5f5b40164176e3224221d26d708f1
--
2.41.0
P
P
pelzflorian (Florian Pelz) wrote on 15 Mar 23:51 +0100
Re: [bug#69783] [PATCH v2] website: Convert old style sheets into a theme.
(address . 69783@debbugs.gnu.org)
87ttl7f6rn.fsf@pelzflorian.de
Having pushed these two patches to guix-artwork and guix.git, I have one
humble request to the Guix maintainers (Cc):

This patch split static/ into static/ and themes/. Could someone with
push access to maintenance.git make it so that hydra/nginx/berlin.scm
also emits cache HTTP headers for themes/ like it already does for
static/?

Pushed as f916cbb234e159f4730425c82d436a542f9288a8 with two changes:
* untabified,
* changed the static/base/fonts in .guix.scm as well.

Otherwise all rebuilds are automatic, I believe, and I hope we have not
wreaked much havoc.

Regards,
Florian
G
G
Giovanni Biscuolo wrote on 16 Mar 10:34 +0100
Re: [bug#69783] [PATCH] doc: build: Update paths to style sheets.
(address . 69783-close@debbugs.gnu.org)
878r2iseov.fsf@xelera.eu
Hello,

sirgazil--- via Guix-patches via <guix-patches@gnu.org> writes:

Toggle quote (12 lines)
> From: Luis Felipe <sirgazil@zoho.com>
>
> The Guix website style sheets are now organized in themes. This change
> makes the documentation builder use the resources provided by a theme
> called "initial" (See https://issues.guix.gnu.org/69783).
>
> * doc/build.scm (syntax-highlighted-html): Update path to CSS.
> (html-manual-indexes): Likewise.
> (stylized-html): Likewise, and update path to language picker image.
>
> Change-Id: Ib2d51fcfdec42ad827add1ead1cfee4c9c4e65b7

I was looking at this patch set and found that this has been commited as
999bfa0d543c539e4554797deaf2f447dddf3796 (Fri Mar 15 23:22:45 2024)

I'm closing this bug, if I'm doing something wrong please reopen it! :-)

Thanks! Gio'

--
Giovanni Biscuolo

Xelera IT Infrastructures
-----BEGIN PGP SIGNATURE-----

iQJABAEBCgAqFiEERcxjuFJYydVfNLI5030Op87MORIFAmX1Z6AMHGdAeGVsZXJh
LmV1AAoJENN9DqfOzDkSM1kP/iETEmW6kXP+Ua1KuFkCGSHN5ePDyy8265+EMHM8
+a1VDf69P38JjmtvYTHZiDyoYyOrtFxC1b4+RZHJDmRfGeEDi3ABN/wBe4EMoq5F
hK45WJqfEqVVfSTCiVWX6kSh4S328lOGYK4vxSDBxx5Kpel6fsCUqPSSvL576DnC
cA+qI9MgfqKAcWtr8T9lhaczTHExC8nDeQ5dGxjtMG9oT2BP4wGeAKWB3BXh4jXj
/la+s+/Is8jieujmoEL0EAh9Mf8IVRJnar2UlRIXhnnW1a4xNS6KGUS5uXleKQ/7
kF4wMlCk7N6qav45UX4bgx/3wtZMIgr/Y1KhgiDp4nfiMvxyZlL+5TBW6Q7yUsGh
KedHYDqG2LwB96pF8GS4BGkNw0BihDcDXd7Qa2vpWLAfNo6gND+rvG/QHAI1f4ci
r6dzCz9ihjmUnanGvLAWIkzBWeYytNIcQubW1WP1Ml/6wow9QurzB5EVg5s4yX1u
J8WkmcBR3exgHq43l2iXEoTxbIAvDHOWAFws6WFdX1es7g2I1zMSRdSwSNmS+xKN
Xo1V76e165eHjNZW7j4UYp/z12D/mm5L3JakUoOVV3jUKUJf//4WbtxRtzhizE7r
saDcAmbL3G/sjIq1UwFF+bmM1y4QQXN9W+ltInGmI6pIWkdlsLoOVwBrYCFfNrhm
hnPZ
=DDOo
-----END PGP SIGNATURE-----

P
L
L
Luis Felipe wrote on 16 Mar 14:52 +0100
(address . 69783@debbugs.gnu.org)
d0de2275-5360-05c9-694c-29cfa44e4310@zoho.com
I see that the changes are live now, thanks.
However, the HTML manual for version 1.4.0 still uses the old paths, so
the style is currently broken (not horribly broken but still).
I'm not sure if the pending actions that require maintainer intervention
would fix this, so I'm investigating in the meantime.
(I hope I can help make the Texinfo's HTML versions of the manual easier
to theme soon)
Attachment: OpenPGP_0x0AB0D067012F08C3.asc
Attachment: OpenPGP_signature
P
P
pelzflorian (Florian Pelz) wrote on 16 Mar 18:47 +0100
(name . Luis Felipe)(address . sirgazil@zoho.com)(address . 69783@debbugs.gnu.org)
87plvukr0g.fsf@pelzflorian.de
Hrmm. I see breakage only of the /manual hub page listing the
languages, otherwise I had checked some 14 hours ago and the manual and
site itself worked. I see some nginx proxy pass directives that last
two days, but I think it is something different.

Luis Felipe <sirgazil@zoho.com> writes:
Toggle quote (3 lines)
> (I hope I can help make the Texinfo's HTML versions of the manual
> easier to theme soon)

guix.git’s doc/build.scm says:

;; FIXME: Avoid duplicating styling info from guix-artwork.git.

That would mean downloading guix-artwork.git from within the build
script, like with a fixed-output derivation, but I do not know how to do
downloads from outside package origins beautifully and not as
confusing/unexpected as the test code for the recent fixed-output
derivation vulnerability on the Guix.gnu.org blog.

Regards,
Florian
G
G
Giovanni Biscuolo wrote on 17 Mar 11:51 +0100
(name . pelzflorian (Florian Pelz))(address . pelzflorian@pelzflorian.de)
875xxlrv14.fsf@xelera.eu
Hello Florian,

"pelzflorian (Florian Pelz)" <pelzflorian@pelzflorian.de> writes:

Toggle quote (5 lines)
> Reopen.
> I had not closed yet because I still had a request to the maintainers:
>
> https://lists.gnu.org/archive/html/guix-patches/2024-03/msg01035.html

Uh sorry! I missed it.

But then, why not wait for the missing information and related patch and
commit all the patches in this bug as a coherent patchset "in bulk"? If
needed "we" could use a dedicated "doc" branch to test this, no?

I understand that this patch series is "just" for doc presentation
(style) and the missing patch(es) do not "hard" break the manual, but
this workflow makes harder for casual contributors like me to help in
"bug gardening".

WDYT?

Sorry again for the confusion.

Happy hacking! Gio'

--
Giovanni Biscuolo

Xelera IT Infrastructures
-----BEGIN PGP SIGNATURE-----

iQJABAEBCgAqFiEERcxjuFJYydVfNLI5030Op87MORIFAmX2yycMHGdAeGVsZXJh
LmV1AAoJENN9DqfOzDkSmjcQANXSyFVEmynA36c/H/jqiovyby7HDPkajtBwlraA
DGtAXhYbUclGtkaoJSjf1hUu1owChy3ywghyMM1kl8mZO0G9I3TYZp3jZl+dG2BZ
8Vo6/ZhpCnakpP1FibjQmr2VqvTTgDUt+JtbN4fYXsFTvAyuo7prAz/n8H+FuYgp
P4/1YyqgK3hp/u72xw2Zre1Wm9bAtaqA32F6D3IwbWF46kqAveXnL7l3RY/a3lqa
bdtzd1mH4vLRL6+5CgX5wXyJehy6VpQodmL2qmRd0aeDR+JqDSQP3vbnIE5n37Nl
8rLk0OZmFh/w1/YxekBG6g3AizFFdOqnyt0rXWkCNGzIhr1LWg+zPJN2jZqpuYip
LCGgjJgrzNxFaZPr0+2kE+t6+7XMiRcJH6UMZbgsoQ4ZyjY2Hw3jc4TFa3zrFCZD
RJvJBHxX14XeYQYqqtlR1RulxXJlPhoY07IvbWZ4DHAD29poQrR2i33ceHNybsXN
727L8ROx+YsWkCPB4/yTIlHq+A+n3sspnYtF3TgdXSWsbySp/+Ns2awjb8vsXA6b
vAGkZCoVjyOeCeXJ9Z86Fhi1nixGbwq7zgOE1fJr1/CX7mnRViVffrcy8wd8XvBz
7H/hdfpegT6UjbS4F09jWaF+dnvsdhbtkgvU2MbWmBh1TIZoHGfX9L0AhNclPAbX
NGcA
=hHZU
-----END PGP SIGNATURE-----

P
P
pelzflorian (Florian Pelz) wrote on 17 Mar 17:52 +0100
(name . Giovanni Biscuolo)(address . g@xelera.eu)
877ci03imy.fsf@pelzflorian.de
Hello Giovanni and thank you for spending time on bug management.

What I wanted from the maintainers is not the reason why
https://guix.gnu.org/manual/still has the wrong CSS paths.

I had pushed to guix-artwork.git and guix.git without waiting for
maintainers with push authorization to maintenance.git, because I wanted
to fix tabification myself and cause less bother. Sorry to you that I
did cause inconvenience to you.

I wanted from the maintainers specifically that maintenance.git’s
hydra/nginx/berlin.scm treats /themes the same way as /static.

I believe this would change server-side cache times to be the same for
/themes and for /static. Regardless of whether they are the same,
server-side cacheing causes the current disruption of the CSS of the
/manual hub page. I was not sure this would happen, but accept it and
hope the cache issue is gone by itself by tomorrow.

Regards,
Florian
P
P
pelzflorian (Florian Pelz) wrote on 17 Mar 18:57 +0100
(name . Giovanni Biscuolo)(address . g@xelera.eu)
8734so3fnu.fsf@pelzflorian.de
Indeed you are right, Giovanni, that the true problem is that
maintenance.git needs rewrite rules for the CSS and image files. This
is because the 1.4.0 manual still uses the doc/build.scm of 1.4.0.

My apologies. I can prepare a patch later.

Regards,
Florian
F
F
Florian Pelz wrote on 17 Mar 21:21 +0100
[PATCH] hydra: nginx: Adjust to website themes in guix-artwork.
(address . 69783@debbugs.gnu.org)(name . Florian Pelz)(address . pelzflorian@pelzflorian.de)
20240317202531.21599-2-pelzflorian@pelzflorian.de
* hydra/modules/sysadmin/nginx.scm (guix.gnu.org-redirect-locations):
Redirect /static to the new /themes location to fix the 1.4.0 manual.
(guix.gnu.org-other-locations): Adjust to fonts being in /themes now.
Use /static cache settings for /themes as well.
* hydra/nginx/berlin.scm: Use /static cache settings for /themes.
---
hydra/modules/sysadmin/nginx.scm | 27 +++++++++++++++++++++++----
hydra/nginx/berlin.scm | 10 ++++++++++
2 files changed, 33 insertions(+), 4 deletions(-)

Toggle diff (89 lines)
diff --git a/hydra/modules/sysadmin/nginx.scm b/hydra/modules/sysadmin/nginx.scm
index 59d5856..14d8461 100644
--- a/hydra/modules/sysadmin/nginx.scm
+++ b/hydra/modules/sysadmin/nginx.scm
@@ -2,7 +2,7 @@
;; Copyright © 2016-2024 Ludovic Courtès <ludo@gnu.org>
;; Copyright © 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
;; Copyright © 2020 Christopher Baines <mail@cbaines.net>
-;; Copyright © 2020, 2021 Florian Pelz <pelzflorian@pelzflorian.de>
+;; Copyright © 2020, 2021, 2024 Florian Pelz <pelzflorian@pelzflorian.de>
;; Copyright © 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org>
;; Released under the GNU GPLv3 or any later version.
@@ -317,6 +317,20 @@ synonymous IETF language tags that should be mapped to the same $lang."
(redirect "/manual/en/html_node/Installing-GuixSD-in-a-VM.html" "Installing-Guix-in-a-VM.html")
(redirect "/manual/en/html_node/Running-GuixSD-in-a-VM.html"
"Running-Guix-in-a-VM.html")
+ ;; URLs used by the manual for Guix 1.4.0.
+ ;; XXX: Remove after the next release.
+ (redirect "/static/base/css/elements.css" "/themes/initial/css/elements.css")
+ (redirect "/static/base/css/common.css" "/themes/initial/css/common.css")
+ (redirect "/static/base/css/messages.css" "/themes/initial/css/messages.css")
+ (redirect "/static/base/css/navbar.css" "/themes/initial/css/navbar.css")
+ (redirect "/static/base/css/breadcrumbs.css" "/themes/initial/css/breadcrumbs.css")
+ (redirect "/static/base/css/buttons.css" "/themes/initial/css/buttons.css")
+ (redirect "/static/base/css/footer.css" "/themes/initial/css/footer.css")
+ (redirect "/static/base/css/page.css" "/themes/initial/css/page.css")
+ (redirect "/static/base/css/post.css" "/themes/initial/css/post.css")
+ (redirect "/static/base/css/manual.css" "/themes/initial/css/manual.css")
+ (redirect "/static/base/css/code.css" "/themes/initial/css/code.css")
+ (redirect "/static/base/img/language-picker.svg" "/themes/initial/img/language-picker.svg")
;; Old URLs not ending in a slash like https://guix.gnu.org/graphics.
(redirect "/about" "/$lang/about/")
(redirect "/blog" "/$lang/blog/")
@@ -664,14 +678,14 @@ synonymous IETF language tags that should be mapped to the same $lang."
(uri "^~ /cuirass/releases")
(body (list "alias /srv/cuirass-releases;")))
- ;; Let browsers cache files under /static for a while.
+ ;; Let browsers cache files under /themes for a while.
(nginx-location-configuration
- (uri "/static/base/fonts")
+ (uri "/themes/initial/fonts")
(body (list "expires 30d;" ;fonts never change
"gzip on;"
"gzip_types *;"
- "alias /srv/guix.gnu.org/static/base/fonts;")))
+ "alias /srv/guix.gnu.org/themes/initial/fonts;")))
;; XXX: This is really a hack to work around the fact that we can't have
;; 'If-Modified-Since' because timestamps are zeroed.
@@ -680,6 +694,11 @@ synonymous IETF language tags that should be mapped to the same $lang."
(body (list "expires 1d;"
"alias /srv/guix.gnu.org/static;")))
+ (nginx-location-configuration
+ (uri "/themes") ;like "/static" above
+ (body (list "expires 1d;"
+ "alias /srv/guix.gnu.org/themes;")))
+
;; These rules take precedence over the '.pdf' and '.html' rules below.
(nginx-location-configuration
(uri "~ /manual/devel(|/.*)$")
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

base-commit: e16552ce47aca34dc8597787f1c3f19d7580eb9b
--
2.41.0
F
F
Florian Pelz wrote on 24 Mar 19:19 +0100
[PATCH v2 1/2] hydra: nginx: Redirect 1.4.0 manual resources due to themes move.
(address . 69783@debbugs.gnu.org)
20240324182012.5026-1-pelzflorian@pelzflorian.de
* hydra/modules/sysadmin/nginx.scm (guix.gnu.org-redirect-locations):
Redirect /static to the new /themes location to fix the 1.4.0 manual.
---
hydra/modules/sysadmin/nginx.scm | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)

Toggle diff (38 lines)
diff --git a/hydra/modules/sysadmin/nginx.scm b/hydra/modules/sysadmin/nginx.scm
index e8b7897..e18c9b4 100644
--- a/hydra/modules/sysadmin/nginx.scm
+++ b/hydra/modules/sysadmin/nginx.scm
@@ -2,7 +2,7 @@
;; Copyright © 2016-2024 Ludovic Courtès <ludo@gnu.org>
;; Copyright © 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
;; Copyright © 2020 Christopher Baines <mail@cbaines.net>
-;; Copyright © 2020, 2021 Florian Pelz <pelzflorian@pelzflorian.de>
+;; Copyright © 2020, 2021, 2024 Florian Pelz <pelzflorian@pelzflorian.de>
;; Copyright © 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org>
;; Released under the GNU GPLv3 or any later version.
@@ -317,6 +317,20 @@ synonymous IETF language tags that should be mapped to the same $lang."
(redirect "/manual/en/html_node/Installing-GuixSD-in-a-VM.html" "Installing-Guix-in-a-VM.html")
(redirect "/manual/en/html_node/Running-GuixSD-in-a-VM.html"
"Running-Guix-in-a-VM.html")
+ ;; URLs used by the manual for Guix 1.4.0.
+ ;; XXX: Remove after the next release.
+ (redirect "/static/base/css/elements.css" "/themes/initial/css/elements.css")
+ (redirect "/static/base/css/common.css" "/themes/initial/css/common.css")
+ (redirect "/static/base/css/messages.css" "/themes/initial/css/messages.css")
+ (redirect "/static/base/css/navbar.css" "/themes/initial/css/navbar.css")
+ (redirect "/static/base/css/breadcrumbs.css" "/themes/initial/css/breadcrumbs.css")
+ (redirect "/static/base/css/buttons.css" "/themes/initial/css/buttons.css")
+ (redirect "/static/base/css/footer.css" "/themes/initial/css/footer.css")
+ (redirect "/static/base/css/page.css" "/themes/initial/css/page.css")
+ (redirect "/static/base/css/post.css" "/themes/initial/css/post.css")
+ (redirect "/static/base/css/manual.css" "/themes/initial/css/manual.css")
+ (redirect "/static/base/css/code.css" "/themes/initial/css/code.css")
+ (redirect "/static/base/img/language-picker.svg" "/themes/initial/img/language-picker.svg")
;; Old URLs not ending in a slash like https://guix.gnu.org/graphics.
(redirect "/about" "/$lang/about/")
(redirect "/blog" "/$lang/blog/")

base-commit: ef0e3bf584a66ac14ff230da54c7d25d0fdf0129
--
2.41.0
F
F
Florian Pelz wrote on 24 Mar 19:19 +0100
[PATCH v2 2/2] hydra: nginx: Further adjust to website themes in guix-artwork.
(address . 69783@debbugs.gnu.org)
20240324182012.5026-2-pelzflorian@pelzflorian.de
* hydra/nginx/berlin.scm: Use /static cache settings for /themes.
---
hydra/nginx/berlin.scm | 10 ++++++++++
1 file changed, 10 insertions(+)

Toggle diff (23 lines)
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
--
2.41.0
L
L
Ludovic Courtès wrote on 30 Mar 12:00 +0100
(name . Florian Pelz)(address . pelzflorian@pelzflorian.de)
87a5mgf0hh.fsf@gnu.org
Hi Florian,

Florian Pelz <pelzflorian@pelzflorian.de> skribis:

Toggle quote (2 lines)
> * hydra/nginx/berlin.scm: Use /static cache settings for /themes.

I hadn’t noticed your message and did this:


Toggle quote (12 lines)
> 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!).
L
L
Ludovic Courtès wrote on 30 Mar 15:28 +0100
Re: [bug#69783] [PATCH v2 1/2] hydra: nginx: Redirect 1.4.0 manual resources due to themes move.
(name . Florian Pelz)(address . pelzflorian@pelzflorian.de)
875xx3g5fr.fsf@gnu.org
Florian Pelz <pelzflorian@pelzflorian.de> skribis:

Toggle quote (3 lines)
> * 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.

I guess we can close now?

Ludo’.
P
P
pelzflorian (Florian Pelz) wrote on 31 Mar 12:07 +0200
Re: [bug#69783] [PATCH v2 2/2] hydra: nginx: Further adjust to website themes in guix-artwork.
(name . Ludovic Courtès)(address . ludo@gnu.org)
87plvabton.fsf@pelzflorian.de
Thank you Ludo.

Ludovic Courtès <ludo@gnu.org> writes:
Toggle quote (7 lines)
> 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.


Toggle quote (2 lines)
> I guess we can close now?

Yes, closing.



Toggle quote (26 lines)
> 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.

Toggle quote (7 lines)
> 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
Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 69783@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 69783
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch