diff --git a/bin/hardcache_api_url.sh b/bin/hardcache_api_url.sh index 6dfeb1472..f48b9354f 100755 --- a/bin/hardcache_api_url.sh +++ b/bin/hardcache_api_url.sh @@ -8,7 +8,7 @@ mkdir -p $DIR for f in xml json csv; do rm $DIR/$f.html 2> /dev/null - curl -qL "$URL/$f?_sf_ignore_cache=$$" > $TMPFILE + curl -kqL "$URL/$f?_sf_ignore_cache=$$" > $TMPFILE mv $TMPFILE $DIR/$f.html done diff --git a/bin/hardcache_url.sh b/bin/hardcache_url.sh index 558e468b5..9bd5c6580 100755 --- a/bin/hardcache_url.sh +++ b/bin/hardcache_url.sh @@ -8,7 +8,7 @@ TMPFILE=/tmp/hard_cache_url.$$ mkdir -p $DIR rm -f $DIR/$FIL.html 2> /dev/null -curl -qL "$URL?_sf_ignore_cache=$$" > $TMPFILE +curl -kqL "$URL?_sf_ignore_cache=$$" > $TMPFILE mv $TMPFILE $DIR/$FIL.html echo $URL $DIR $FIL diff --git a/bin/update_hardcache b/bin/update_hardcache index c4fc14070..b3ab99f4b 100644 --- a/bin/update_hardcache +++ b/bin/update_hardcache @@ -6,7 +6,7 @@ mkdir -p web/synthesetri for url in synthese synthesetri/10 synthesetri/11 synthesetri/12 synthesetri/13 synthesetri/1 synthesetri/2 synthesetri/3 synthesetri/4 synthesetri/5 synthesetri/6 synthesetri/7 synthesetri/8 synthesetri/9; do rm web/$url.html - curl -sL --max-time 90 "http://$VHOST/$url?_sf_ignore_cache=$$" > $TMPFILE 2>> /tmp/update_curl_output.txt + curl -ksL --max-time 90 "http://$VHOST/$url?_sf_ignore_cache=$$" > $TMPFILE 2>> /tmp/update_curl_output.txt mv $TMPFILE web/$url.html done; @@ -15,7 +15,7 @@ for seance_id in $(echo "select DISTINCT seance_id from intervention where creat do echo "http://$VHOST/$LEGISLATURE/seance/$seance_id" rm web/$LEGISLATURE/seance/$seance_id.html 2> /dev/null - curl -sL "http://$VHOST/$LEGISLATURE/seance/$seance_id?_sf_ignore_cache=$$" > $TMPFILE + curl -ksL "http://$VHOST/$LEGISLATURE/seance/$seance_id?_sf_ignore_cache=$$" > $TMPFILE mv $TMPFILE web/$LEGISLATURE/seance/$seance_id.html done rm -f cache/frontend/prod/template/*/all/intervention/seance/seance/* diff --git a/bin/update_hardcache_all b/bin/update_hardcache_all index 4908abd6e..987d910d7 100644 --- a/bin/update_hardcache_all +++ b/bin/update_hardcache_all @@ -5,7 +5,7 @@ TMPFILE=/tmp/hard_cache.$$ for url in synthese synthesetri/10 synthesetri/11 synthesetri/12 synthesetri/13 synthesetri/1 synthesetri/2 synthesetri/3 synthesetri/4 synthesetri/5 synthesetri/6 synthesetri/7 synthesetri/8 synthesetri/9; do rm web/$url.html - curl -sL http://$VHOST/$url > $TMPFILE + curl -ksL http://$VHOST/$url > $TMPFILE mv $TMPFILE web/$url.html done; @@ -13,7 +13,7 @@ for seance_id in $(echo "select DISTINCT seance_id from presence order by seance do echo "http://$VHOST/$LEGISLATURE/seance/$seance_id" rm web/$LEGISLATURE/seance/$seance_id.html 2> /dev/null - curl -sL http://$VHOST/$LEGISLATURE/seance/${seance_id}?_sf_ignore_cache=1 > $TMPFILE + curl -ksL http://$VHOST/$LEGISLATURE/seance/${seance_id}?_sf_ignore_cache=1 > $TMPFILE mv $TMPFILE web/$LEGISLATURE/seance/$seance_id.html done rm -rf cache/frontend/prod/template/*/all/intervention/seance/seance diff --git a/bin/update_hardcache_hemicycle b/bin/update_hardcache_hemicycle index 689fe5d94..d209ba6e2 100644 --- a/bin/update_hardcache_hemicycle +++ b/bin/update_hardcache_hemicycle @@ -6,7 +6,7 @@ for seance_id in $(echo "select DISTINCT id from seance where type = 'hemicycle' do echo "http://$VHOST/$LEGISLATURE/seance/$seance_id" rm web/$LEGISLATURE/seance/$seance_id.html 2> /dev/null - curl -sL http://$VHOST/$LEGISLATURE/seance/$seance_id > TMPFILE + curl -ksL http://$VHOST/$LEGISLATURE/seance/$seance_id > TMPFILE mv TMPFILE web/$LEGISLATURE/seance/$seance_id.html done rm cache/frontend/prod/template/*/all/intervention/seance/seance/* diff --git a/bin/update_hardcache_one b/bin/update_hardcache_one index 57f51d7a6..e01c2fde7 100644 --- a/bin/update_hardcache_one +++ b/bin/update_hardcache_one @@ -6,6 +6,6 @@ seance_id=$1 echo "http://$VHOST/$LEGISLATURE/seance/$seance_id" rm web/$LEGISLATURE/seance/$seance_id.html 2> /dev/null -curl -sL http://$VHOST/$LEGISLATURE/seance/${seance_id}?_sf_ignore_cache=$$ > $TMPFILE +curl -ksL http://$VHOST/$LEGISLATURE/seance/${seance_id}?_sf_ignore_cache=$$ > $TMPFILE mv $TMPFILE web/$LEGISLATURE/seance/$seance_id.html diff --git a/bin/update_latest_seances_hardcache b/bin/update_latest_seances_hardcache index b33438205..6d486ce41 100755 --- a/bin/update_latest_seances_hardcache +++ b/bin/update_latest_seances_hardcache @@ -7,7 +7,7 @@ for seance_id in $(echo "select DISTINCT seance_id from intervention where updat do echo "http://$VHOST/$LEGISLATURE/seance/$seance_id" rm web/$LEGISLATURE/seance/$seance_id.html 2> /dev/null - curl -s "http://$VHOST/$LEGISLATURE/seance/$seance_id?_sf_ignore_cache=$$" > $TMPFILE + curl -ks "http://$VHOST/$LEGISLATURE/seance/$seance_id?_sf_ignore_cache=$$" > $TMPFILE mv $TMPFILE web/$LEGISLATURE/seance/$seance_id.html done rm -f cache/frontend/prod/template/*/all/intervention/seance/seance/* diff --git a/web/css/xneth/style.css b/web/css/xneth/style.css index de7e26e98..9c0bb52a7 100644 --- a/web/css/xneth/style.css +++ b/web/css/xneth/style.css @@ -807,10 +807,6 @@ h1 { height: 35px; } -#announce h2 { - display: none; -} - #announce span { text-decoration: underline; }