From d1df672383f6eb8d4218fdef7fbe9ec5e41803e4 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Mon, 11 Nov 2024 22:07:51 +0100 Subject: [PATCH] website: deploy: rsync: use --delete. The commit 768fde6f2d1ddb0883e53d5bb43c2872146d130e ("website: Remove news generation.") was supposed to produce a web page at https://www.gnu.org/software/gnuboot/web/news.html. This didn't work because due to a combination of the Apache rules deployed on the web server and the fact that we couldn't delete files. After discussing with the FSF sysadmins, they now fixed the problem, so we can now use --delete with rsync and this makes the news page appear. It's also possible to get the Apache rules being used under a free license, so to avoid this kind of situation again, so in the future we should get these rules and replace the test with lighttpd with a test that uses Apache and these rules instead. Signed-off-by: Denis 'GNUtoo' Carikli Acked-by: Adrien Bourmault --- website/Makefile.am | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/website/Makefile.am b/website/Makefile.am index c45ec1c..5750384 100644 --- a/website/Makefile.am +++ b/website/Makefile.am @@ -165,11 +165,7 @@ serve: endif endif -# The rsync options are hardcoded here because some options are known -# not to work. For instance --delete results in rsync hanging. Also -# note that it's possible to rsync some files to gnu.org but not from -# gnu.org. -RSYNC_OPTIONS := -av --progress +RSYNC_OPTIONS := -av --progress --delete publish: website.tar.gz rm -rf deploy mkdir -p deploy