diff --git a/project-security/bulletins-template.md b/project-security/bulletins-template.md deleted file mode 100644 index 3ea80b72..00000000 --- a/project-security/bulletins-template.md +++ /dev/null @@ -1,82 +0,0 @@ ---- -lang: en -layout: doc -permalink: /security/bulletins/template/ -redirect_from: -- /doc/security-bulletins/template/ -ref: 209 -title: Security Bulletin Template ---- - -~~~ -Dear Qubes Community, - -We have just published Qubes Security Bulletin (QSB) #: -. -The text of this QSB is reproduced below. This QSB and its accompanying -signatures will always be available in the Qubes Security Pack (qubes-secpack). - -View QSB #<number> in the qubes-secpack: - -<https://github.com/QubesOS/qubes-secpack/blob/master/QSBs/qsb-`<number>`-`<year>`.txt> - -Learn about the qubes-secpack, including how to obtain, verify, and read it: - -<https://www.qubes-os.org/security/pack/> - -View all past QSBs: - -<https://www.qubes-os.org/security/bulletins/> - -View <XSA> in the XSA Tracker: - -<https://www.qubes-os.org/security/xsa/`<XSA>`> - -``` - ---===[ Qubes Security Bulletin #<number>]===--- - - <date> - - <title> - -Summary -======= - -[...] - -Description -=========== - -[...] - -Impact -====== - -[...] - -Discussion -========== - -[...] - -Patching -======== - -[...] - -Credits -======= - -[...] - -References -========== - -[...] - --- -The Qubes Security Team -https://www.qubes-os.org/security/ -``` - -~~~ diff --git a/project-security/canary-checklist.md b/project-security/canary-checklist.md index d6c94db5..f954260a 100644 --- a/project-security/canary-checklist.md +++ b/project-security/canary-checklist.md @@ -1,9 +1,11 @@ --- lang: en layout: doc -permalink: /security/canaries/checklist/ +permalink: /security/canary/checklist/ +redirect_from: +- /security/canaries/checklist/ ref: 216 -title: Canary Checklist +title: Qubes Canary Checklist --- ## Preparation diff --git a/project-security/canary-template.md b/project-security/canary-template.md index 653fad9a..4963f41d 100644 --- a/project-security/canary-template.md +++ b/project-security/canary-template.md @@ -1,61 +1,12 @@ --- lang: en layout: doc -permalink: /security/canaries/template/ +permalink: /security/canary/template/ redirect_from: +- /security/canaries/template/ - /doc/canaries/template/ +redirect_to: +- https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-template.txt ref: 212 -title: Canary Template +title: Qubes Canary Template --- - - -~~~ -Dear Qubes community, - -We have just published Qubes Canary #<number>. The text of this canary is -reproduced below. This canary and its accompanying signatures will always be -available in the Qubes Security Pack (qubes-secpack). - -View Canary #<number> in the qubes-secpack: - -<https://github.com/QubesOS/qubes-secpack/blob/master/canaries/canary-`<number>`-`<year>`.txt> - -Learn about the qubes-secpack, including how to obtain, verify, and read it: - -<https://www.qubes-os.org/security/pack/> - -View all past canaries: - -<https://www.qubes-os.org/security/canaries/> - -``` - ---===[ Qubes Canary #<number> ]===--- - - -Statements ------------ - -[...] - -Special announcements ----------------------- - -[...] - -Disclaimers and notes ----------------------- - -[...] - -Proof of freshness -------------------- - -[...] - -Footnotes ----------- - -[...] -``` - -~~~ diff --git a/project-security/canaries.md b/project-security/canary.md similarity index 95% rename from project-security/canaries.md rename to project-security/canary.md index a69585d4..e65ad1cc 100644 --- a/project-security/canaries.md +++ b/project-security/canary.md @@ -1,8 +1,9 @@ --- lang: en layout: doc -permalink: /security/canaries/ +permalink: /security/canary/ redirect_from: +- /security/canaries/ - /doc/canaries/ ref: 208 title: Qubes Canaries diff --git a/project-security/bulletins-checklist.md b/project-security/qsb-checklist.md similarity index 82% rename from project-security/bulletins-checklist.md rename to project-security/qsb-checklist.md index fe882f1d..122e4579 100644 --- a/project-security/bulletins-checklist.md +++ b/project-security/qsb-checklist.md @@ -1,11 +1,12 @@ --- lang: en layout: doc -permalink: /security/bulletins/checklist/ +permalink: /security/qsb/checklist/ redirect_from: +- /security/bulletins/checklist/ - /doc/security-bulletins/checklist/ ref: 215 -title: Security Bulletin Checklist +title: Qubes Security Bulletin (QSB) Checklist --- ## Preparation diff --git a/project-security/qsb-template.md b/project-security/qsb-template.md new file mode 100644 index 00000000..1a56022c --- /dev/null +++ b/project-security/qsb-template.md @@ -0,0 +1,12 @@ +--- +lang: en +layout: doc +permalink: /security/qsb/template/ +redirect_from: +- /security/bulletins/template/ +- /doc/security-bulletins/template/ +redirect_to: +- https://github.com/QubesOS/qubes-secpack/blob/master/QSBs/qsb-template.txt +ref: 209 +title: Qubes Security Bulletin (QSB) Template +--- diff --git a/project-security/bulletins.md b/project-security/qsb.md similarity index 92% rename from project-security/bulletins.md rename to project-security/qsb.md index df427789..910f4b6b 100644 --- a/project-security/bulletins.md +++ b/project-security/qsb.md @@ -1,8 +1,9 @@ --- lang: en layout: doc -permalink: /security/bulletins/ +permalink: /security/qsb/ redirect_from: +- /security/bulletins/ - /doc/security-bulletins/ - /en/doc/security-bulletins/ - /doc/SecurityBulletins/