From 1efd396b1c76f762d6ed575ff02c22c91a610656 Mon Sep 17 00:00:00 2001 From: bach Date: Thu, 19 May 2022 14:27:13 +0200 Subject: [PATCH] donne --- Docker/nginx/default.conf | 5 +++-- static/build_static.sh | 11 +++++++---- static/posthttrack.sh | 2 ++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Docker/nginx/default.conf b/Docker/nginx/default.conf index c2af920..11e15f7 100644 --- a/Docker/nginx/default.conf +++ b/Docker/nginx/default.conf @@ -46,10 +46,11 @@ server { # rewrite ^/modules/(.*)\.(css|js)$ /modules/$1/index.$2 last; # rewrite ^/sites/all/modules/(.*)\.(css|js)$ /sites/all/modules/$1/index.$2 last; - rewrite ^/(.*)/(.*)\.(css|js|png|woff|ttf|ico|gif)$ /$1/$2/index.$3; rewrite ^/analytics.js$ /analytics/index.js; + rewrite ^/sites/default/files/(.+)\.(ico|png|jpeg|jpg|gif)$ /sites/default/files/$1/index.$2 last; rewrite ^/sites/default/files/styles/(.*)\.(ico|jpeg|jpg|gif|png)$ /sites/default/files/styles/$1/index.$2 last; - rewrite ^/sites/all/themes/gui/perfarttimeline/images/blank.gif$ /sites/all/themes/gui/perfarttimeline/images/blank/index.gif last; + rewrite ^/sites/all/themes/figureslibres/clameurs/images/(.*)\.(jpeg|jpg) /sites/all/themes/figureslibres/clameurs/images/$1/index.$2 last; + rewrite ^/(.*)/(.*)\.(css|js|png|woff|ttf|ico|gif)$ /$1/$2/index.$3; charset utf-8; diff --git a/static/build_static.sh b/static/build_static.sh index 436356b..68922c5 100755 --- a/static/build_static.sh +++ b/static/build_static.sh @@ -2,18 +2,21 @@ # http://httrack.kauler.com/help/User-defined_structure -# httrack http://dev.performance-art.fr -O ./web -N "%h%p/%n/index%[page].%t" --near --mirror-wizard --quiet --do-not-log -%v2 -X -p7 --robots=0 --footer '' --sockets=99 −−max−rate=99999999 --disable-security-limits −−keep−alive +# httrack http://dev.clameurs-lawebserie.fr -O ./web -N "%h%p/%n/index%[page].%t" --near --mirror-wizard --quiet --do-not-log -%v2 -X -p7 --robots=0 --footer '' --sockets=99 −−max−rate=99999999 --disable-security-limits −−keep−alive -httrack http://dev.performance-art.fr --path ./web --mirror-wizard --update --max-rate=9999999999999 --sockets=99 --near -N "%h%p/%n/index%[page].%t" --robots=0 --keep-alive --footer '' --display --do-not-log --quiet --disable-security-limits -p7 -K3 +httrack http://dev.clameurs-lawebserie.fr --path ./web --mirror-wizard --update --max-rate=9999999999999 --sockets=99 --near -N "%h%p/%n/index%[page].%t" --robots=0 --keep-alive --footer '' --display --do-not-log --quiet --disable-security-limits -p7 -K3 + +# todo get webfonts +# * done get ajax http://static.clameurs-lawebserie.fr/clameursmod/getemvidfield?src=https://youtu.be/KZd8E2c7BS8 # --continue -# httrack http://dev.performance-art.fr -O ./web -N "%h%p/%n%[page].%t" --near -WqQ%v --robots=0 --footer '' +# httrack http://dev.clameurs-lawebserie.fr -O ./web -N "%h%p/%n%[page].%t" --near -WqQ%v --robots=0 --footer '' # remove the ajax block from home with sed # move the index @the right place -# mv web/dev.performance-art.fr/index/index.html web/dev.performance-art.fr/index.html +# mv web/dev.clameurs-lawebserie.fr/index/index.html web/dev.clameurs-lawebserie.fr/index.html # as the index file moved, replace ../../ by ../ every-were diff --git a/static/posthttrack.sh b/static/posthttrack.sh index 8984a80..90bbf5a 100644 --- a/static/posthttrack.sh +++ b/static/posthttrack.sh @@ -1,5 +1,7 @@ #!/bin/bash +# move index.html to root folder + # remove the ajax block from home with sed (index.html, fr.html, en.html) # move external folders (e.g. ajax.googleapis.com) into the dev.performance-art.fr