Commit a02aafef authored by anonym's avatar anonym
Browse files

Prevent Ikiwiki from formatting the Unsafe Browser warning pages.

This is a follow-up on 08259afa.

Due to #14962 we really only want the simple text-only HTML page
without all the Ikiwiki formatting added. I'm very ignorant of
Ikiwiki, so this hack is the best I could come up with so I can
quickly rebuild Tails 3.3. I'm also sloppy: I verified my assumption
that those .html pages would be left unprocessed...

Refs: #14962
parent 15d43a07
...@@ -25,4 +25,13 @@ if ! "${git_dir}/bin/sanity-check-website" ; then ...@@ -25,4 +25,13 @@ if ! "${git_dir}/bin/sanity-check-website" ; then
fi fi
fi fi
ikiwiki -setup ikiwiki.setup -refresh "$@" # If I knew Ikiwiki better I'd probably figure out how to just make it
# keep the misc/*.html files as-is instead of this hack.
fixup_14962_workaround() {
mkdir -p config/chroot_local-includes/usr/share/doc/tails/website/misc
rm -f config/chroot_local-includes/usr/share/doc/tails/website/misc/*
cp wiki/src/misc/*.html \
config/chroot_local-includes/usr/share/doc/tails/website/misc
}
ikiwiki -setup ikiwiki.setup -refresh "$@" && fixup_14962_workaround
...@@ -107,7 +107,7 @@ ENV: {} ...@@ -107,7 +107,7 @@ ENV: {}
# regexp of normally excluded files to include # regexp of normally excluded files to include
include: '^\.htaccess$' include: '^\.htaccess$'
# regexp of files that should be skipped # regexp of files that should be skipped
exclude: '(^blueprint\/.*|^contribute\/how\/promote\/material\/.*|\/discussion\..*|\/Discussion\..*)' exclude: '(^blueprint\/.*|^contribute\/how\/promote\/material\/.*|\/discussion\..*|\/Discussion\..*|^misc\/.*)'
# specifies the characters that are allowed in source filenames # specifies the characters that are allowed in source filenames
wiki_file_chars: '-[:alnum:]+/._~' wiki_file_chars: '-[:alnum:]+/._~'
# allow symlinks in the path leading to the srcdir (potentially insecure) # allow symlinks in the path leading to the srcdir (potentially insecure)
...@@ -213,7 +213,7 @@ po_slave_languages: ...@@ -213,7 +213,7 @@ po_slave_languages:
# #
# When updating this list, refer to the checklist in # When updating this list, refer to the checklist in
# https://tails.boum.org/contribute/how/website/po_translatable_pages/ # https://tails.boum.org/contribute/how/website/po_translatable_pages/
po_translatable_pages: '!security/audits and !security/audits/* and !misc/* and !news/report_2* and !news/version_0* and !news/version_1* and !news/test_0* and !news/test_1* and !news/test_*alpha? and !news/test_*-beta? and !news/test_*-rc? and !security/Numerous_security_holes_in_0* and !security/Numerous_security_holes_in_1* and (about or about/* or bugs or chat or contribute or doc or doc/* or donate or donate/* or download or download.inline or getting_started or home or index or news or news/* or partners or press or security or security/* or sidebar or support or support/* or torrents or misc or misc/* or install or install/* or upgrade or upgrade/*)' po_translatable_pages: '!security/audits and !security/audits/* and !news/report_2* and !news/version_0* and !news/version_1* and !news/test_0* and !news/test_1* and !news/test_*alpha? and !news/test_*-beta? and !news/test_*-rc? and !security/Numerous_security_holes_in_0* and !security/Numerous_security_holes_in_1* and (about or about/* or bugs or chat or contribute or doc or doc/* or donate or donate/* or download or download.inline or getting_started or home or index or news or news/* or partners or press or security or security/* or sidebar or support or support/* or torrents or misc or misc/* or install or install/* or upgrade or upgrade/*)'
# internal linking behavior (default/current/negotiated) # internal linking behavior (default/current/negotiated)
po_link_to: current po_link_to: current
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment