From cf91c400b72e84f463714e4cd39798d904dc2fae Mon Sep 17 00:00:00 2001 From: Francois Andrieu Date: Nov 02 2021 20:50:53 +0000 Subject: [PATCH 1/3] use basepath where it's needed --- diff --git a/alt.fedoraproject.org/data/content/alt/index.html b/alt.fedoraproject.org/data/content/alt/index.html index e3c908e..c08e12b 100644 --- a/alt.fedoraproject.org/data/content/alt/index.html +++ b/alt.fedoraproject.org/data/content/alt/index.html @@ -34,7 +34,7 @@
- +

${_('Fedora Server')}

@@ -48,7 +48,7 @@
- +

${_('Fedora Server')}

@@ -62,7 +62,7 @@
- +

${_('Fedora Workstation')}

@@ -76,7 +76,7 @@
- +

${_('Fedora KDE Plasma')}

@@ -90,7 +90,7 @@
- +

${_('Fedora KDE Plasma')}

@@ -104,7 +104,7 @@
- +

${_('Fedora Minimal')}

@@ -118,7 +118,7 @@
- +

${_('Everything')}

@@ -132,7 +132,7 @@
- +

${_('Fedora Cloud')}

@@ -160,7 +160,7 @@
- +

${_('Fedora Cloud')}

@@ -174,7 +174,7 @@
- +

${_('Fedora Container')}

@@ -207,7 +207,7 @@
- +

${_('Fedora Server')}

@@ -216,7 +216,7 @@
- +

${_('Fedora Server')}

@@ -225,7 +225,7 @@
- +

${_('Fedora Workstation')}

@@ -234,7 +234,7 @@
- +

${_('Fedora Minimal')}

@@ -243,7 +243,7 @@
- +

${_('Everything')}

@@ -252,7 +252,7 @@
- +

${_('Fedora Cloud')}

@@ -270,7 +270,7 @@
- +

${_('Fedora Cloud')}

@@ -279,7 +279,7 @@
- +

${_('Fedora Container')}

@@ -306,7 +306,7 @@
- +

${_('Fedora Server')}

@@ -317,7 +317,7 @@
- +

${_('Fedora Server')}

@@ -328,7 +328,7 @@
- +

${_('Fedora Workstation')}

@@ -339,7 +339,7 @@
- +

${_('Fedora Minimal')}

@@ -350,7 +350,7 @@
- +

${_('Everything')}

@@ -361,7 +361,7 @@
- +

${_('Fedora Cloud')}

@@ -383,7 +383,7 @@
- +

${_('Fedora Cloud')}

@@ -394,7 +394,7 @@
- +

${_('Fedora Container')}

@@ -456,7 +456,7 @@
- +

${_('Fedora Server')}

@@ -470,7 +470,7 @@
- +

${_('Fedora Server')}

@@ -484,7 +484,7 @@
- +

${_('Fedora Workstation')}

@@ -498,7 +498,7 @@
- +

${_('Everything')}

@@ -512,7 +512,7 @@
- +

${_('Fedora Cloud')}

@@ -526,7 +526,7 @@
- +

${_('Fedora Cloud')}

@@ -540,7 +540,7 @@
- +

${_('Fedora Container')}

@@ -573,7 +573,7 @@
- +

${_('Fedora Server')}

@@ -582,7 +582,7 @@
- +

${_('Fedora Server')}

@@ -591,7 +591,7 @@
- +

${_('Fedora Workstation')}

@@ -600,7 +600,7 @@
- +

${_('Everything')}

@@ -609,7 +609,7 @@
- +

${_('Fedora Cloud')}

@@ -618,7 +618,7 @@
- +

${_('Fedora Cloud')}

@@ -627,7 +627,7 @@
- +

${_('Fedora Container')}

@@ -654,7 +654,7 @@
- +

${_('Fedora Server')}

@@ -665,7 +665,7 @@
- +

${_('Fedora Server')}

@@ -677,7 +677,7 @@
- +

${_('Fedora Workstation')}

@@ -689,7 +689,7 @@
- +

${_('Everything')}

@@ -700,7 +700,7 @@
- +

${_('Fedora Cloud')}

@@ -711,7 +711,7 @@
- +

${_('Fedora Cloud')}

@@ -722,7 +722,7 @@
- +

${_('Fedora Container')}

@@ -784,7 +784,7 @@
- +

${_('Fedora Server')}

@@ -798,7 +798,7 @@
- +

${_('Fedora Server')}

@@ -812,7 +812,7 @@
- +

${_('Everything')}

@@ -826,7 +826,7 @@
- +

${_('Fedora Cloud')}

@@ -840,7 +840,7 @@
- +

${_('Fedora Cloud')}

@@ -854,7 +854,7 @@
- +

${_('Fedora Container')}

@@ -887,7 +887,7 @@
- +

${_('Fedora Server')}

@@ -896,7 +896,7 @@
- +

${_('Fedora Server')}

@@ -905,7 +905,7 @@
- +

${_('Everything')}

@@ -914,7 +914,7 @@
- +

${_('Fedora Cloud')}

@@ -923,7 +923,7 @@
- +

${_('Fedora Cloud')}

@@ -932,7 +932,7 @@
- +

${_('Fedora Container')}

@@ -959,7 +959,7 @@
- +

${_('Fedora Server')}

@@ -970,7 +970,7 @@
- +

${_('Fedora Server')}

@@ -981,7 +981,7 @@
- +

${_('Everything')}

@@ -992,7 +992,7 @@
- +

${_('Fedora Cloud')}

@@ -1003,7 +1003,7 @@
- +

${_('Fedora Cloud')}

@@ -1014,7 +1014,7 @@
- +

${_('Fedora Container')}

diff --git a/alt.fedoraproject.org/data/content/cloud/index.html b/alt.fedoraproject.org/data/content/cloud/index.html index 4d292b5..ffa86c0 100644 --- a/alt.fedoraproject.org/data/content/cloud/index.html +++ b/alt.fedoraproject.org/data/content/cloud/index.html @@ -33,7 +33,7 @@
- +

${_('Cloud Base compressed raw image')}

@@ -47,7 +47,7 @@
- +

${_('Cloud Base image for Openstack')}

@@ -79,7 +79,7 @@
- +

${_('Cloud Base raw')}

@@ -88,7 +88,7 @@
- +

${_('Cloud Base qcow2')}

@@ -115,7 +115,7 @@
- +

${_('Cloud Base raw image')}

@@ -126,7 +126,7 @@
- +

${_('Cloud Base qcow2 image')}

@@ -158,7 +158,7 @@
- +

${_('VirtualBox image')}

@@ -172,7 +172,7 @@
- +

${_('libvirt/KVM image')}

@@ -204,7 +204,7 @@
- +

${_('VirtualBox image')}

@@ -213,7 +213,7 @@
- +

${_('libvirt/KVM image')}

@@ -240,7 +240,7 @@
- +

${_('VirtualBox image')}

@@ -251,7 +251,7 @@
- +

${_('libvirt/KVM image')}

@@ -286,7 +286,7 @@
- +

${_('Compressed disk image')}

@@ -318,7 +318,7 @@
- +

${_('Compressed disk image')}

@@ -346,7 +346,7 @@
- +

${_('Compressed disk image')}

@@ -379,7 +379,7 @@
- +

${_('x86_64 AMIs')}

@@ -416,7 +416,7 @@
- +

${_('aarch64 AMIs')}

@@ -471,7 +471,7 @@
- +

${_('x86_64 AMIs')}

@@ -506,7 +506,7 @@
- +

${_('aarch64 AMIs')}

diff --git a/alt.fedoraproject.org/data/content/index.html b/alt.fedoraproject.org/data/content/index.html index 3ab15ec..216e75b 100644 --- a/alt.fedoraproject.org/data/content/index.html +++ b/alt.fedoraproject.org/data/content/index.html @@ -77,7 +77,7 @@
- +

${_('Fedora Server')}

@@ -113,7 +113,7 @@
- +

${_('Fedora Server')}

@@ -143,7 +143,7 @@
- +

${_('Fedora Server')}

@@ -234,7 +234,7 @@
- +

${_('Everything')}

@@ -249,7 +249,7 @@
- +

${_('x86_64 AMIs')}

@@ -501,7 +501,7 @@
- +

${_('aarch64 AMIs')}

@@ -558,7 +558,7 @@
- +

${_('raw image')}

@@ -567,7 +567,7 @@
- +

${_('qcow2 image')}

@@ -576,7 +576,7 @@
- +

${_('VirtualBox image')}

@@ -585,7 +585,7 @@
- +

${_('libvirt image')}

@@ -595,7 +595,7 @@
- +

${_('x86_64 AMIs')}

@@ -630,7 +630,7 @@
- +

${_('Standard HVM AMIs')}

@@ -684,7 +684,7 @@
- +

${_('raw image')}

@@ -695,7 +695,7 @@
- +

${_('qcow2 image')}

@@ -706,7 +706,7 @@
- +

${_('VirtualBox image')}

@@ -717,7 +717,7 @@
- +

${_('libvirt image')}

@@ -729,7 +729,7 @@
- +

${_('x86_64 AMIs')}

@@ -766,7 +766,7 @@
- +

${_('aarch64 AMIs')}

@@ -825,7 +825,7 @@
- +

${_('Everything 64-bit')}

@@ -839,7 +839,7 @@
- +

${_('Sugar on a Stick')}

@@ -306,7 +306,7 @@
- +

${_('KDE Plasma Desktop')}

@@ -324,7 +324,7 @@
- +

${_('Xfce Desktop')}

@@ -333,7 +333,7 @@
- +

${_('Sugar on a Stick')}

@@ -391,7 +391,7 @@
- +

${_('KDE Plasma Desktop')}

@@ -413,7 +413,7 @@
- +

${_('Xfce Desktop')}

@@ -424,7 +424,7 @@
- +

${_('Sugar on a Stick')}

@@ -490,7 +490,7 @@
- +

${_('Python-Classroom')}

@@ -525,7 +525,7 @@
- +

${_('Python-Classroom')}

@@ -554,7 +554,7 @@
- +

${_('Python-Classroom')}

diff --git a/arm.fedoraproject.org/data/content/prerelease.html b/arm.fedoraproject.org/data/content/prerelease.html index dbbfba9..15453de 100644 --- a/arm.fedoraproject.org/data/content/prerelease.html +++ b/arm.fedoraproject.org/data/content/prerelease.html @@ -40,7 +40,7 @@
- Server + Server
- Minimal + Minimal
- Workstation + Workstation
- KDE Plasma + KDE Plasma
- Xfce + Xfce
diff --git a/labs.fedoraproject.org/data/content/design-suite/index.html b/labs.fedoraproject.org/data/content/design-suite/index.html index b96950d..1ad48fa 100644 --- a/labs.fedoraproject.org/data/content/design-suite/index.html +++ b/labs.fedoraproject.org/data/content/design-suite/index.html @@ -29,7 +29,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

@@ -126,7 +126,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

diff --git a/labs.fedoraproject.org/data/content/games/download/index.html b/labs.fedoraproject.org/data/content/games/download/index.html index e69bff2..b198482 100644 --- a/labs.fedoraproject.org/data/content/games/download/index.html +++ b/labs.fedoraproject.org/data/content/games/download/index.html @@ -67,7 +67,7 @@

${_('Verify')}

diff --git a/labs.fedoraproject.org/data/content/games/index.html b/labs.fedoraproject.org/data/content/games/index.html index baf3a98..3853ae5 100644 --- a/labs.fedoraproject.org/data/content/games/index.html +++ b/labs.fedoraproject.org/data/content/games/index.html @@ -29,7 +29,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

@@ -126,7 +126,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

diff --git a/labs.fedoraproject.org/data/content/index.html b/labs.fedoraproject.org/data/content/index.html index e714a31..58d1a80 100644 --- a/labs.fedoraproject.org/data/content/index.html +++ b/labs.fedoraproject.org/data/content/index.html @@ -55,70 +55,70 @@
-
Astronomy banner
- Astronomy Screenshot -

${_('Explore the Outer Space.')}

 +
Astronomy banner
+ Astronomy Screenshot +

${_('Explore the Outer Space.')}

 ${_('Powerful completely open-source and free tool for amateurs and professionals.')}
-
Comp Neuro banner
- Comp Neuro Screenshot -

${_('Explore the Brain.')}

 +
Comp Neuro banner
+ Comp Neuro Screenshot +

${_('Explore the Brain.')}

 ${_('A plethora of Free/Open source computational modelling tools for Neuroscience.')}
-
Design suite banner
- Design-suite Screenshot -

${_('Open Creativity.')}

 +
Design suite banner
+ Design-suite Screenshot +

${_('Open Creativity.')}

 ${_('Visual design, multimedia production, and publishing suite of free and open source creative tools.')}
-
Games banner
- Games Screenshot -

${_('Play with Fedora Today!')}

 +
Games banner
+ Games Screenshot +

${_('Play with Fedora Today!')}

 ${_('A collection and perfect show-case of the best games available in Fedora.')}
-
Jam banner
- Jam Screenshot -

${_('Unleash your inner musician.')}

 +
Jam banner
+ Jam Screenshot +

${_('Unleash your inner musician.')}

 ${_('For audio enthusiasts and musicians who want to create, edit and produce audio and music on Linux.')}
-
Python Classroom banner
- Python Classroom Screenshot -

${_('Teach Python with ease')}

 +
Python Classroom banner
+ Python Classroom Screenshot +

${_('Teach Python with ease')}

 ${_('A classroom lab for teaching the Python programming language to students')}
-
Security Lab banner
- Security Lab Screenshot -

${_('Thorough, safe and secure.')}

 +
Security Lab banner
+ Security Lab Screenshot +

${_('Thorough, safe and secure.')}

 ${_('A safe test environment to work on security auditing, forensics, system rescue and teaching security testing methodologies.')}
-
Robotics banner
- Robotics Screenshot -

${_('Dive into Robotics.')}

 +
Robotics banner
+ Robotics Screenshot +

${_('Dive into Robotics.')}

 ${_('A wide variety of free and open robotics software packages for beginners and experts in robotics.')}
-
Scientific Lab banner
- Scientific-KDE Lab Screenshot -

${_('Open source scientific computing.')}

 +
Scientific Lab banner
+ Scientific-KDE Lab Screenshot +

${_('Open source scientific computing.')}

 ${_('A bundle of open source scientific and numerical tools used in research.')}
diff --git a/labs.fedoraproject.org/data/content/jam/download/index.html b/labs.fedoraproject.org/data/content/jam/download/index.html index 513cead..d2a3589 100644 --- a/labs.fedoraproject.org/data/content/jam/download/index.html +++ b/labs.fedoraproject.org/data/content/jam/download/index.html @@ -67,7 +67,7 @@

${_('Verify')}

diff --git a/labs.fedoraproject.org/data/content/jam/index.html b/labs.fedoraproject.org/data/content/jam/index.html index 838d794..52eaf9f 100644 --- a/labs.fedoraproject.org/data/content/jam/index.html +++ b/labs.fedoraproject.org/data/content/jam/index.html @@ -29,7 +29,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

@@ -126,7 +126,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

diff --git a/labs.fedoraproject.org/data/content/prerelease.html b/labs.fedoraproject.org/data/content/prerelease.html index a4d9795..e6ffdf1 100644 --- a/labs.fedoraproject.org/data/content/prerelease.html +++ b/labs.fedoraproject.org/data/content/prerelease.html @@ -222,7 +222,7 @@

${Markup(_('Verify your Download!'))}

-

${Markup(_('Once you have downloaded an image, verify it for security and integrity. To verify your image, start by downloading the proper CHECKSUM file into the same directory as the image you downloaded and follow <a href="../../%s/verify">these instructions</a>.') % (lang))}

+

${Markup(_('Once you have downloaded an image, verify it for security and integrity. To verify your image, start by downloading the proper CHECKSUM file into the same directory as the image you downloaded and follow <a href="%s/%s/verify">these instructions</a>.') % (path, lang))}

${_('Verify 64bit!')} diff --git a/labs.fedoraproject.org/data/content/python-classroom/download/index.html b/labs.fedoraproject.org/data/content/python-classroom/download/index.html index e2500e5..f66a460 100644 --- a/labs.fedoraproject.org/data/content/python-classroom/download/index.html +++ b/labs.fedoraproject.org/data/content/python-classroom/download/index.html @@ -94,7 +94,7 @@

${_('Verify')}

diff --git a/labs.fedoraproject.org/data/content/python-classroom/index.html b/labs.fedoraproject.org/data/content/python-classroom/index.html index 1ece1ef..d503f3e 100644 --- a/labs.fedoraproject.org/data/content/python-classroom/index.html +++ b/labs.fedoraproject.org/data/content/python-classroom/index.html @@ -29,7 +29,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

@@ -148,7 +148,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

diff --git a/labs.fedoraproject.org/data/content/robotics/download/index.html b/labs.fedoraproject.org/data/content/robotics/download/index.html index acb3597..22b660e 100644 --- a/labs.fedoraproject.org/data/content/robotics/download/index.html +++ b/labs.fedoraproject.org/data/content/robotics/download/index.html @@ -67,7 +67,7 @@

${_('Verify')}

diff --git a/labs.fedoraproject.org/data/content/robotics/index.html b/labs.fedoraproject.org/data/content/robotics/index.html index 62b498b..858e0ab 100644 --- a/labs.fedoraproject.org/data/content/robotics/index.html +++ b/labs.fedoraproject.org/data/content/robotics/index.html @@ -29,7 +29,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

@@ -126,7 +126,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

diff --git a/labs.fedoraproject.org/data/content/scientific/download/index.html b/labs.fedoraproject.org/data/content/scientific/download/index.html index 0bd7414..e2e9ca8 100644 --- a/labs.fedoraproject.org/data/content/scientific/download/index.html +++ b/labs.fedoraproject.org/data/content/scientific/download/index.html @@ -85,7 +85,7 @@

${_('Verify')}

diff --git a/labs.fedoraproject.org/data/content/scientific/index.html b/labs.fedoraproject.org/data/content/scientific/index.html index 6393363..064b1df 100644 --- a/labs.fedoraproject.org/data/content/scientific/index.html +++ b/labs.fedoraproject.org/data/content/scientific/index.html @@ -29,7 +29,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

@@ -126,7 +126,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

diff --git a/labs.fedoraproject.org/data/content/security/download/index.html b/labs.fedoraproject.org/data/content/security/download/index.html index a302bcc..5ea6ad8 100644 --- a/labs.fedoraproject.org/data/content/security/download/index.html +++ b/labs.fedoraproject.org/data/content/security/download/index.html @@ -67,7 +67,7 @@

${_('Verify')}

diff --git a/labs.fedoraproject.org/data/content/security/index.html b/labs.fedoraproject.org/data/content/security/index.html index 5c6b23d..da6361a 100644 --- a/labs.fedoraproject.org/data/content/security/index.html +++ b/labs.fedoraproject.org/data/content/security/index.html @@ -29,7 +29,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

@@ -126,7 +126,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

diff --git a/spins.fedoraproject.org/data/content/cinnamon/download/index.html b/spins.fedoraproject.org/data/content/cinnamon/download/index.html index 75af692..0b2cf4f 100644 --- a/spins.fedoraproject.org/data/content/cinnamon/download/index.html +++ b/spins.fedoraproject.org/data/content/cinnamon/download/index.html @@ -70,7 +70,7 @@

${_('Verify')}

diff --git a/spins.fedoraproject.org/data/content/cinnamon/index.html b/spins.fedoraproject.org/data/content/cinnamon/index.html index 97dd874..2e81f10 100644 --- a/spins.fedoraproject.org/data/content/cinnamon/index.html +++ b/spins.fedoraproject.org/data/content/cinnamon/index.html @@ -30,7 +30,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

@@ -134,7 +134,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

diff --git a/spins.fedoraproject.org/data/content/i3/download/index.html b/spins.fedoraproject.org/data/content/i3/download/index.html index c60d01f..17e5885 100755 --- a/spins.fedoraproject.org/data/content/i3/download/index.html +++ b/spins.fedoraproject.org/data/content/i3/download/index.html @@ -75,7 +75,7 @@

${_('Verify')}

diff --git a/spins.fedoraproject.org/data/content/i3/index.html b/spins.fedoraproject.org/data/content/i3/index.html index 8b12917..9e93fa1 100755 --- a/spins.fedoraproject.org/data/content/i3/index.html +++ b/spins.fedoraproject.org/data/content/i3/index.html @@ -29,7 +29,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

@@ -174,7 +174,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

diff --git a/spins.fedoraproject.org/data/content/index.html b/spins.fedoraproject.org/data/content/index.html index 0ef7d01..37f0db6 100644 --- a/spins.fedoraproject.org/data/content/index.html +++ b/spins.fedoraproject.org/data/content/index.html @@ -55,12 +55,12 @@
- KDE Screenshot + KDE Screenshot
-

KDE banner
+

KDE banner
${_('A complete, modern desktop built using the KDE Plasma Desktop.')}

@@ -69,12 +69,12 @@
- Xfce Screenshot + Xfce Screenshot
-

Xfce banner
+

Xfce banner
${_('A complete, well-integrated Xfce Desktop.')}

@@ -83,12 +83,12 @@
- LXQt Screenshot + LXQt Screenshot
-

LXQt banner
+

LXQt banner
${_('A lightweight, well-integrated LXQt desktop environment.')}

@@ -97,12 +97,12 @@
- MATE-Compiz Screenshot + MATE-Compiz Screenshot
-

MATE-Compiz banner
+

MATE-Compiz banner
${_('A classic Fedora Desktop with an additional 3D Windows Manager.')}

@@ -111,12 +111,12 @@
- Cinnamon Screenshot + Cinnamon Screenshot
-

Cinnamon banner
+

Cinnamon banner
${_('A modern desktop featuring traditional Gnome user experience.')}

@@ -125,12 +125,12 @@
- LXDE Screenshot + LXDE Screenshot
-

LXDE banner
+

LXDE banner
${_('A light, fast, less-resource hungry desktop environment.')}

@@ -139,12 +139,12 @@
- SoaS Screenshot + SoaS Screenshot
-

SoaS banner
+

SoaS banner
${_('Discover. Reflect. Share. Learn.')}

@@ -153,12 +153,12 @@
- i3 Screenshot + i3 Screenshot
-

i3 banner
+

i3 banner
${_('Tiling window manager.')}

diff --git a/spins.fedoraproject.org/data/content/kde/download/index.html b/spins.fedoraproject.org/data/content/kde/download/index.html index 15e5ddc..fe54af2 100644 --- a/spins.fedoraproject.org/data/content/kde/download/index.html +++ b/spins.fedoraproject.org/data/content/kde/download/index.html @@ -72,7 +72,7 @@

${_('Verify')}

diff --git a/spins.fedoraproject.org/data/content/kde/index.html b/spins.fedoraproject.org/data/content/kde/index.html index 755be52..75df147 100644 --- a/spins.fedoraproject.org/data/content/kde/index.html +++ b/spins.fedoraproject.org/data/content/kde/index.html @@ -31,7 +31,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

@@ -173,7 +173,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

diff --git a/spins.fedoraproject.org/data/content/lxde/download/index.html b/spins.fedoraproject.org/data/content/lxde/download/index.html index a8c69e0..d5b1991 100644 --- a/spins.fedoraproject.org/data/content/lxde/download/index.html +++ b/spins.fedoraproject.org/data/content/lxde/download/index.html @@ -71,7 +71,7 @@

${_('Verify')}

diff --git a/spins.fedoraproject.org/data/content/lxde/index.html b/spins.fedoraproject.org/data/content/lxde/index.html index 349ff20..3de2745 100644 --- a/spins.fedoraproject.org/data/content/lxde/index.html +++ b/spins.fedoraproject.org/data/content/lxde/index.html @@ -30,7 +30,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

@@ -134,7 +134,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

diff --git a/spins.fedoraproject.org/data/content/lxqt/download/index.html b/spins.fedoraproject.org/data/content/lxqt/download/index.html index 6047076..afa2c7e 100755 --- a/spins.fedoraproject.org/data/content/lxqt/download/index.html +++ b/spins.fedoraproject.org/data/content/lxqt/download/index.html @@ -75,7 +75,7 @@

${_('Verify')}

diff --git a/spins.fedoraproject.org/data/content/lxqt/index.html b/spins.fedoraproject.org/data/content/lxqt/index.html index 39853c7..d7187c2 100755 --- a/spins.fedoraproject.org/data/content/lxqt/index.html +++ b/spins.fedoraproject.org/data/content/lxqt/index.html @@ -29,7 +29,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

@@ -133,7 +133,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

diff --git a/spins.fedoraproject.org/data/content/mate-compiz/download/index.html b/spins.fedoraproject.org/data/content/mate-compiz/download/index.html index 1b8fb41..0287696 100644 --- a/spins.fedoraproject.org/data/content/mate-compiz/download/index.html +++ b/spins.fedoraproject.org/data/content/mate-compiz/download/index.html @@ -71,7 +71,7 @@

${_('Verify')}

diff --git a/spins.fedoraproject.org/data/content/mate-compiz/index.html b/spins.fedoraproject.org/data/content/mate-compiz/index.html index 61d8557..d634773 100644 --- a/spins.fedoraproject.org/data/content/mate-compiz/index.html +++ b/spins.fedoraproject.org/data/content/mate-compiz/index.html @@ -30,7 +30,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

@@ -139,7 +139,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

diff --git a/spins.fedoraproject.org/data/content/soas/download/index.html b/spins.fedoraproject.org/data/content/soas/download/index.html index 8b1ce5a..d43be1b 100644 --- a/spins.fedoraproject.org/data/content/soas/download/index.html +++ b/spins.fedoraproject.org/data/content/soas/download/index.html @@ -75,7 +75,7 @@

${_('Verify')}

diff --git a/spins.fedoraproject.org/data/content/soas/index.html b/spins.fedoraproject.org/data/content/soas/index.html index 74a7f30..68c0f42 100644 --- a/spins.fedoraproject.org/data/content/soas/index.html +++ b/spins.fedoraproject.org/data/content/soas/index.html @@ -31,7 +31,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

@@ -173,7 +173,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

diff --git a/spins.fedoraproject.org/data/content/xfce/download/index.html b/spins.fedoraproject.org/data/content/xfce/download/index.html index f6b5de6..890530f 100644 --- a/spins.fedoraproject.org/data/content/xfce/download/index.html +++ b/spins.fedoraproject.org/data/content/xfce/download/index.html @@ -75,7 +75,7 @@

${_('Verify')}

diff --git a/spins.fedoraproject.org/data/content/xfce/index.html b/spins.fedoraproject.org/data/content/xfce/index.html index 46eb912..776a1ba 100644 --- a/spins.fedoraproject.org/data/content/xfce/index.html +++ b/spins.fedoraproject.org/data/content/xfce/index.html @@ -30,7 +30,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

@@ -129,7 +129,7 @@
-

${_('Download Now')}

+

${_('Download Now')}

From 35a1ace37941dfadda43ab1a7b495917b9c5981a Mon Sep 17 00:00:00 2001 From: Francois Andrieu Date: Nov 02 2021 20:50:54 +0000 Subject: [PATCH 2/3] add new build_all script for CI This script build all websites in one location and will be used by our CI system to preview PR changes --- diff --git a/.ci/htaccess.in b/.ci/htaccess.in new file mode 100644 index 0000000..20a0c9f --- /dev/null +++ b/.ci/htaccess.in @@ -0,0 +1,21 @@ +AddLanguage en .en +LanguagePriority en +ForceLanguagePriority Prefer Fallback + +AddDefaultCharset utf-8 + +RewriteEngine on + +RewriteBase "/@SITE@" +RewriteRule ^(?:(?:en))?/(.*)$ $1? [L] + +Options MultiViews FollowSymLinks Indexes + +#SetEnvIf Request_URI ^/en/ prefer-language=en + + + Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" + Header set Pragma "no-cache" + Header set Expires "Thu, 1 Jan 1970 00:00:00 GMT" + + diff --git a/.ci/httpd.conf.in b/.ci/httpd.conf.in new file mode 100644 index 0000000..e9c38f9 --- /dev/null +++ b/.ci/httpd.conf.in @@ -0,0 +1,514 @@ +# +# This is the main Apache HTTP server configuration file. It contains the +# configuration directives that give the server its instructions. +# See for detailed information. +# In particular, see +# +# for a discussion of each configuration directive. +# +# Do NOT simply read the instructions in here without understanding +# what they do. They're here only as hints or reminders. If you are unsure +# consult the online docs. You have been warned. +# +# Configuration and logfile names: If the filenames you specify for many +# of the server's control files begin with "/" (or "drive:/" for Win32), the +# server will use that explicit path. If the filenames do *not* begin +# with "/", the value of ServerRoot is prepended -- so 'log/access_log' +# with ServerRoot set to '/www' will be interpreted by the +# server as '/www/log/access_log', where as '/log/access_log' will be +# interpreted as '/log/access_log'. + +# +# ServerRoot: The top of the directory tree under which the server's +# configuration, error, and log files are kept. +# +# Do not add a slash at the end of the directory path. If you point +# ServerRoot at a non-local disk, be sure to specify a local disk on the +# Mutex directive, if file-based mutexes are used. If you wish to share the +# same ServerRoot for multiple httpd daemons, you will need to change at +# least PidFile. +# +ServerRoot "@ROOT@/httpd" +PidFile run/httpd.pid + + +# +# Listen: Allows you to bind Apache to specific IP addresses and/or +# ports, instead of the default. See also the +# directive. +# +# Change this to Listen on specific IP addresses as shown below to +# prevent Apache from glomming onto all bound IP addresses. +# +#Listen 12.34.56.78:80 +Listen 5000 + +# +# Dynamic Shared Object (DSO) Support +# +# To be able to use the functionality of a module which was built as a DSO you +# have to place corresponding `LoadModule' lines at this location so the +# directives contained in it are actually available _before_ they are used. +# Statically compiled modules (those listed by `httpd -l') do not need +# to be loaded here. +# +# Example: +# LoadModule foo_module modules/mod_foo.so +# +#Include conf.modules.d/*.conf + +LoadModule unixd_module /etc/httpd/modules/mod_unixd.so +LoadModule slotmem_shm_module /etc/httpd/modules/mod_slotmem_shm.so +LoadModule mpm_prefork_module /etc/httpd/modules/mod_mpm_prefork.so +LoadModule auth_basic_module /etc/httpd/modules/mod_auth_basic.so +#LoadModule auth_digest_module /etc/httpd/modules/mod_auth_digest.so +LoadModule authn_file_module /etc/httpd/modules/mod_authn_file.so +LoadModule authn_anon_module /etc/httpd/modules/mod_authn_anon.so +LoadModule authn_dbm_module /etc/httpd/modules/mod_authn_dbm.so +LoadModule authz_host_module /etc/httpd/modules/mod_authz_host.so +LoadModule authz_user_module /etc/httpd/modules/mod_authz_user.so +LoadModule authz_owner_module /etc/httpd/modules/mod_authz_owner.so +LoadModule authz_groupfile_module /etc/httpd/modules/mod_authz_groupfile.so +LoadModule authz_dbm_module /etc/httpd/modules/mod_authz_dbm.so +LoadModule authz_core_module /etc/httpd/modules/mod_authz_core.so +LoadModule include_module /etc/httpd/modules/mod_include.so +LoadModule log_config_module /etc/httpd/modules/mod_log_config.so +LoadModule logio_module /etc/httpd/modules/mod_logio.so +LoadModule env_module /etc/httpd/modules/mod_env.so +LoadModule ext_filter_module /etc/httpd/modules/mod_ext_filter.so +LoadModule mime_magic_module /etc/httpd/modules/mod_mime_magic.so +LoadModule expires_module /etc/httpd/modules/mod_expires.so +LoadModule deflate_module /etc/httpd/modules/mod_deflate.so +LoadModule headers_module /etc/httpd/modules/mod_headers.so +LoadModule usertrack_module /etc/httpd/modules/mod_usertrack.so +LoadModule setenvif_module /etc/httpd/modules/mod_setenvif.so +LoadModule mime_module /etc/httpd/modules/mod_mime.so +LoadModule dav_module /etc/httpd/modules/mod_dav.so +LoadModule status_module /etc/httpd/modules/mod_status.so +LoadModule autoindex_module /etc/httpd/modules/mod_autoindex.so +LoadModule info_module /etc/httpd/modules/mod_info.so +LoadModule dav_fs_module /etc/httpd/modules/mod_dav_fs.so +LoadModule vhost_alias_module /etc/httpd/modules/mod_vhost_alias.so +LoadModule negotiation_module /etc/httpd/modules/mod_negotiation.so +LoadModule dir_module /etc/httpd/modules/mod_dir.so +LoadModule actions_module /etc/httpd/modules/mod_actions.so +LoadModule speling_module /etc/httpd/modules/mod_speling.so +LoadModule userdir_module /etc/httpd/modules/mod_userdir.so +LoadModule alias_module /etc/httpd/modules/mod_alias.so +LoadModule rewrite_module /etc/httpd/modules/mod_rewrite.so +#LoadModule proxy_module /etc/httpd/modules/mod_proxy.so +#LoadModule proxy_balancer_module /etc/httpd/modules/mod_proxy_balancer.so +#LoadModule proxy_ftp_module /etc/httpd/modules/mod_proxy_ftp.so +#LoadModule proxy_http_module /etc/httpd/modules/mod_proxy_http.so +#LoadModule proxy_connect_module /etc/httpd/modules/mod_proxy_connect.so +LoadModule cache_module /etc/httpd/modules/mod_cache.so +LoadModule suexec_module /etc/httpd/modules/mod_suexec.so +LoadModule cgi_module /etc/httpd/modules/mod_cgi.so + + +# +# If you wish httpd to run as a different user or group, you must run +# httpd as root initially and it will switch. +# +# User/Group: The name (or #number) of the user/group to run httpd as. +# It is usually good practice to create a dedicated user and group for +# running httpd, as with most system services. +# +#User apache +#Group apache + +# 'Main' server configuration +# +# The directives in this section set up the values used by the 'main' +# server, which responds to any requests that aren't handled by a +# definition. These values also provide defaults for +# any containers you may define later in the file. +# +# All of these directives may appear inside containers, +# in which case these default settings will be overridden for the +# virtual host being defined. +# + +# +# ServerAdmin: Your address, where problems with the server should be +# e-mailed. This address appears on some server-generated pages, such +# as error documents. e.g. admin@your-domain.com +# +ServerAdmin root@localhost + +# +# ServerName gives the name and port that the server uses to identify itself. +# This can often be determined automatically, but we recommend you specify +# it explicitly to prevent problems during startup. +# +# If your host doesn't have a registered DNS name, enter its IP address here. +# +#ServerName www.example.com:80 + +ServerName localhost:80 + +# +# Deny access to the entirety of your server's filesystem. You must +# explicitly permit access to web content directories in other +# blocks below. +# + + AllowOverride none + Require all denied + + +# +# Note that from this point forward you must specifically allow +# particular features to be enabled - so if something's not working as +# you might expect, make sure that you have specifically enabled it +# below. +# + +# +# DocumentRoot: The directory out of which you will serve your +# documents. By default, all requests are taken from this directory, but +# symbolic links and aliases may be used to point to other locations. +# +#DocumentRoot "/var/www/html" +DocumentRoot "@ROOT@/out" + +# +# Relax access to content within /var/www. +# +# + #AllowOverride None + # Allow open access: + #Require all granted +# + +# Further relax access to the default document root: +# + + + # + # Possible values for the Options directive are "None", "All", + # or any combination of: + # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews + # + # Note that "MultiViews" must be named *explicitly* --- "Options All" + # doesn't give it to you. + # + # The Options directive is both complicated and important. Please see + # http://httpd.apache.org/docs/2.4/mod/core.html#options + # for more information. + # + Options +Indexes +FollowSymLinks + + # + # AllowOverride controls what directives may be placed in .htaccess files. + # It can be "All", "None", or any combination of the keywords: + # Options FileInfo AuthConfig Limit + # + AllowOverride All + + # + # Controls who can get stuff from this server. + # + Require all granted + + +# +# DirectoryIndex: sets the file that Apache will serve if a directory +# is requested. +# + + #DirectoryIndex index.html +DirectoryIndex index.html index.html.var + + +# +# The following lines prevent .htaccess and .htpasswd files from being +# viewed by Web clients. +# + + Require all denied + + + +# +# ErrorLog: The location of the error log file. +# If you do not specify an ErrorLog directive within a +# container, error messages relating to that virtual host will be +# logged here. If you *do* define an error logfile for a +# container, that host's errors will be logged there and not here. +# +ErrorLog "logs/error_log" + +# +# LogLevel: Control the number of messages logged to the error_log. +# Possible values include: debug, info, notice, warn, error, crit, +# alert, emerg. +# +#LogLevel warn +LogLevel alert rewrite:trace3 + + + # + # The following directives define some format nicknames for use with + # a CustomLog directive (see below). + # + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined + LogFormat "%h %l %u %t \"%r\" %>s %b" common + + + # You need to enable mod_logio.c to use %I and %O + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio + + + # + # The location and format of the access logfile (Common Logfile Format). + # If you do not define any access logfiles within a + # container, they will be logged here. Contrariwise, if you *do* + # define per- access logfiles, transactions will be + # logged therein and *not* in this file. + # + #CustomLog "logs/access_log" common + + # + # If you prefer a logfile with access, agent, and referer information + # (Combined Logfile Format) you can use the following directive. + # + CustomLog "logs/access_log" combined + + + + # + # Redirect: Allows you to tell clients about documents that used to + # exist in your server's namespace, but do not anymore. The client + # will make a new request for the document at its new location. + # Example: + # Redirect permanent /foo http://www.example.com/bar + + # + # Alias: Maps web paths into filesystem paths and is used to + # access content that does not live under the DocumentRoot. + # Example: + # Alias /webpath /full/filesystem/path + # + # If you include a trailing / on /webpath then the server will + # require it to be present in the URL. You will also likely + # need to provide a section to allow access to + # the filesystem path. + + # + # ScriptAlias: This controls which directories contain server scripts. + # ScriptAliases are essentially the same as Aliases, except that + # documents in the target directory are treated as applications and + # run by the server when requested rather than as documents sent to the + # client. The same rules about trailing "/" apply to ScriptAlias + # directives as to Alias. + # + ScriptAlias /cgi-bin/ "/var/www/cgi-bin/" + + + +# +# "/var/www/cgi-bin" should be changed to whatever your ScriptAliased +# CGI directory exists, if you have that configured. +# +# +# AllowOverride None +# Options None +# Require all granted +# + + + # + # TypesConfig points to the file containing the list of mappings from + # filename extension to MIME-type. + # + TypesConfig /etc/mime.types + + # + # AddType allows you to add to or override the MIME configuration + # file specified in TypesConfig for specific file types. + # + #AddType application/x-gzip .tgz + # + # AddEncoding allows you to have certain browsers uncompress + # information on the fly. Note: Not all browsers support this. + # + #AddEncoding x-compress .Z + #AddEncoding x-gzip .gz .tgz + # + # If the AddEncoding directives above are commented-out, then you + # probably should define those extensions to indicate media types: + # + AddType application/x-compress .Z + AddType application/x-gzip .gz .tgz + + # + # AddHandler allows you to map certain file extensions to "handlers": + # actions unrelated to filetype. These can be either built into the server + # or added with the Action directive (see below) + # + # To use CGI scripts outside of ScriptAliased directories: + # (You will also need to add "ExecCGI" to the "Options" directive.) + # + #AddHandler cgi-script .cgi + + # For type maps (negotiated resources): + #AddHandler type-map var + + # + # Filters allow you to process content before it is sent to the client. + # + # To parse .shtml files for server-side includes (SSI): + # (You will also need to add "Includes" to the "Options" directive.) + # + AddType text/html .shtml + AddOutputFilter INCLUDES .shtml + + +# +# Specify a default charset for all content served; this enables +# interpretation of all content as UTF-8 by default. To use the +# default browser choice (ISO-8859-1), or to allow the META tags +# in HTML content to override this choice, comment out this +# directive: +# +AddDefaultCharset UTF-8 + +# +# The mod_mime_magic module allows the server to use various hints from the +# contents of the file itself to determine its type. The MIMEMagicFile +# directive tells the module where the hint definitions are located. +# +#MIMEMagicFile conf/magic +MIMEMagicFile /etc/httpd/conf/magic + + +# +# Customizable error responses come in three flavors: +# 1) plain text 2) local redirects 3) external redirects +# +# Some examples: +#ErrorDocument 500 "The server made a boo boo." +#ErrorDocument 404 /missing.html +#ErrorDocument 404 "/cgi-bin/missing_handler.pl" +#ErrorDocument 402 http://www.example.com/subscription_info.html +# + +# +# EnableMMAP and EnableSendfile: On systems that support it, +# memory-mapping or the sendfile syscall may be used to deliver +# files. This usually improves server performance, but must +# be turned off when serving from networked-mounted +# filesystems or if support for these functions is otherwise +# broken on your system. +# Defaults if commented: EnableMMAP On, EnableSendfile Off +# +#EnableMMAP off +EnableSendfile on + +# Supplemental configuration +# + +# prefork MPM +# StartServers: number of server processes to start +# MinSpareServers: minimum number of server processes which are kept spare +# MaxSpareServers: maximum number of server processes which are kept spare +# ServerLimit: maximum value for MaxClients for the lifetime of the server +# MaxClients: maximum number of server processes allowed to start +# MaxRequestsPerChild: maximum number of requests a server process serves + +StartServers 8 +MinSpareServers 5 +MaxSpareServers 20 +ServerLimit 256 +MaxClients 256 +MaxRequestsPerChild 4000 + + +# worker MPM +# StartServers: initial number of server processes to start +# MaxClients: maximum number of simultaneous client connections +# MinSpareThreads: minimum number of worker threads which are kept spare +# MaxSpareThreads: maximum number of worker threads which are kept spare +# ThreadsPerChild: constant number of worker threads in each server process +# MaxRequestsPerChild: maximum number of requests a server process serves + +StartServers 2 +MaxClients 150 +MinSpareThreads 25 +MaxSpareThreads 75 +ThreadsPerChild 25 +MaxRequestsPerChild 0 + + +# DefaultLanguage and AddLanguage allows you to specify the language of +# a document. You can then use content negotiation to give a browser a +# file in a language the user can understand. +# +# Specify a default language. This means that all data +# going out without a specific language tag (see below) will +# be marked with this one. You probably do NOT want to set +# this unless you are sure it is correct for all cases. +# +# * It is generally better to not mark a page as +# * being a certain language than marking it with the wrong +# * language! +# +# DefaultLanguage nl +# +# Note 1: The suffix does not have to be the same as the language +# keyword --- those with documents in Polish (whose net-standard +# language code is pl) may wish to use "AddLanguage pl .po" to +# avoid the ambiguity with the common suffix for perl scripts. +# +# Note 2: The example entries below illustrate that in some cases +# the two character 'Language' abbreviation is not identical to +# the two character 'Country' code for its country, +# E.g. 'Danmark/dk' versus 'Danish/da'. +# +# Note 3: In the case of 'ltz' we violate the RFC by using a three char +# specifier. There is 'work in progress' to fix this and get +# the reference data for rfc1766 cleaned up. +# +# Catalan (ca) - Croatian (hr) - Czech (cs) - Danish (da) - Dutch (nl) +# English (en) - Esperanto (eo) - Estonian (et) - French (fr) - German (de) +# Greek-Modern (el) - Hebrew (he) - Italian (it) - Japanese (ja) +# Korean (ko) - Luxembourgeois* (ltz) - Norwegian Nynorsk (nn) +# Norwegian (no) - Polish (pl) - Portugese (pt) +# Brazilian Portuguese (pt-BR) - Russian (ru) - Swedish (sv) +# Simplified Chinese (zh-CN) - Spanish (es) - Traditional Chinese (zh-TW) +# +#AddLanguage en .en +# +# LanguagePriority allows you to give precedence to some languages +# in case of a tie during content negotiation. +# +# Just list the languages in decreasing order of preference. We have +# more or less alphabetized them here. You probably want to change this. +# +#LanguagePriority en + +# +# ForceLanguagePriority allows you to serve a result page rather than +# MULTIPLE CHOICES (Prefer) [in case of a tie] or NOT ACCEPTABLE (Fallback) +# [in case no accepted languages matched the available variants] +# +ForceLanguagePriority Prefer Fallback + +# +# Specify a default charset for all content served; this enables +# interpretation of all content as UTF-8 by default. To use the +# default browser choice (ISO-8859-1), or to allow the META tags +# in HTML content to override this choice, comment out this +# directive: +# +AddDefaultCharset UTF-8 + + + +ErrorDocument 404 /404 + +#Include "conf/languages.conf" + +Alias /static/js/sponsor.js /srv/out/static/js/sponsors/redhat.js + diff --git a/tools/build_all.sh b/tools/build_all.sh new file mode 100755 index 0000000..cf0b632 --- /dev/null +++ b/tools/build_all.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +sites=() + +# Sites to build +sites+=(alt.fedoraproject.org) +sites+=(arm.fedoraproject.org) +sites+=(fedoracommunity.org) +sites+=(flocktofedora.org) +sites+=(labs.fedoraproject.org) +sites+=(spins.fedoraproject.org) +sites+=(start.fedoraproject.org) + +[ -d out ] && rm -Rf out +mkdir out +for site in ${sites[@]}; do + echo + echo "************ Building $site ***************" + pushd $site + make BASEPATH=/$site en 2>&1 | tee build.log + if [ $? -ne 0 ]; then + echo "!! Build Failed for $site !!" + rm -Rf out + mkdir out + fi + mv build.log out/ + sed "s|@SITE@|$site|" ../.ci/htaccess.in > out/.htaccess + rm -Rf ../out/$site + mv out ../out/$site + popd +done From b5449b58bc433f68a921d67112571163ce6a0d77 Mon Sep 17 00:00:00 2001 From: Francois Andrieu Date: Nov 02 2021 20:50:54 +0000 Subject: [PATCH 3/3] build_all: can now be used for stg/prod build --- diff --git a/tools/build_all.sh b/tools/build_all.sh index cf0b632..88a728f 100755 --- a/tools/build_all.sh +++ b/tools/build_all.sh @@ -1,6 +1,7 @@ #!/bin/bash sites=() +# BUILD_ENV = stg or prod # Sites to build sites+=(alt.fedoraproject.org) @@ -11,21 +12,40 @@ sites+=(labs.fedoraproject.org) sites+=(spins.fedoraproject.org) sites+=(start.fedoraproject.org) -[ -d out ] && rm -Rf out -mkdir out +[ -z "$OUTPUT" ] && OUTPUT="$(pwd)/out" +[ ! -d $OUTPUT ] && mkdir $OUTPUT for site in ${sites[@]}; do + ( + set -e echo - echo "************ Building $site ***************" + echo "**** Building $BUILD_ENV $site to ${OUTPUT}/${site} ****" pushd $site - make BASEPATH=/$site en 2>&1 | tee build.log - if [ $? -ne 0 ]; then - echo "!! Build Failed for $site !!" - rm -Rf out - mkdir out + if [ -z "$BUILD_ENV" ]; then + # local build or in CI + make BASEPATH=/$site en 2>&1 | tee ${OUTPUT}/${site}.log + sed "s|@SITE@|$site|" ../.ci/htaccess.in > out/.htaccess + else + # stg or prod build + make pullpos + make + [ -d ${OUTPUT}/${site}.new ] && rm -rf ${OUTPUT}/${site}.new + [ -d ${OUTPUT}/${site}.old ] && rm -rf ${OUTPUT}/${site}.old fi - mv build.log out/ - sed "s|@SITE@|$site|" ../.ci/htaccess.in > out/.htaccess - rm -Rf ../out/$site - mv out ../out/$site + + date +%s > out/build.timestamp + git rev-parse HEAD > out/build.commit + mv out ${OUTPUT}/${site}.new + + # Final quick move + [ -d ${OUTPUT}/$site ] && mv ${OUTPUT}/$site ${OUTPUT}/${site}.old + mv ${OUTPUT}/${site}.new ${OUTPUT}/$site + + # cleaning + rm -Rf ${OUTPUT}/${site}.old + rm -f ${OUTPUT}/${site}.log + popd + ) done +echo "Completed" +