56110 2025-09-23 13:58:10 +0300 Кривая сборка документации 2025-09-29 20:29:17 +0300 1 1 4 Development Sisyphus pve-docs unstable x86_64 Linux CLOSED FIXED P5 normal --- 1 glinkinvd kozorizki darisishe shaba shrek qa-sisyphus oldest_to_newest 272978 0 19613 glinkinvd 2025-09-23 13:58:10 +0300 Created attachment 19613 JavaScript код с онлайн-документации Proxmox Версия пакета: pve-docs-9.0.8-alt1 Документация для 9 мажорной версии криво собирается, о чём свидетельствуют ошибки и предупреждения в логах сборки: ... [00:00:04] asciidoc: WARNING: pve-network.adoc: line 162: missing section: [sect5] [00:00:04] asciidoc: WARNING: pve-network.adoc: line 223: missing section: [sect5] [00:00:05] asciidoc: WARNING: qm.adoc: line 158: missing section: [sect5] [00:00:05] asciidoc: WARNING: qm.adoc: line 197: missing section: [sect5] [00:00:05] asciidoc: WARNING: qm.adoc: line 220: missing section: [sect5] [00:00:06] asciidoc: WARNING: qm.adoc: line 1935: missing section: [sect5] [00:00:06] asciidoc: WARNING: qm.adoc: line 1941: missing section: [sect5] [00:00:06] asciidoc: WARNING: qm.adoc: line 1947: missing section: [sect5] [00:00:06] asciidoc: WARNING: qm.adoc: line 1960: missing section: [sect5] [00:00:08] asciidoc: WARNING: ha-manager.adoc: line 758: missing section: [sect5] [00:00:08] asciidoc: WARNING: ha-manager.adoc: line 826: missing section: [sect5] [00:00:08] asciidoc: WARNING: ha-manager.adoc: line 845: missing section: [sect5] [00:00:08] asciidoc: WARNING: ha-manager.adoc: line 863: missing section: [sect5] [00:00:08] asciidoc: WARNING: notifications.adoc: line 224: missing section: [sect5] [00:00:08] asciidoc: WARNING: notifications.adoc: line 239: missing section: [sect5] [00:00:08] asciidoc: WARNING: notifications.adoc: line 254: missing section: [sect5] ... [00:00:21] ./asciidoc-pve compile-chapter -o chapter-ha-manager.html ha-manager.adoc [00:00:21] asciidoc: WARNING: .asciidoc-pve-tmp1447183_ha-manager.adoc: line 4: include file not found: /etc/asciidoc/stylesheets/asciidoc.css [00:00:21] asciidoc: WARNING: .asciidoc-pve-tmp1447183_ha-manager.adoc: line 4: include file not found: /etc/asciidoc/stylesheets/toc2.css [00:00:21] asciidoc: WARNING: .asciidoc-pve-tmp1447183_ha-manager.adoc: line 4: include file not found: /etc/asciidoc/javascripts/asciidoc.js ... Той же проблеме подвержена 8 мажорная версия. А вот 7 мажорная версии у нас собирается нормально. Как следствие, на странице https://pve01:8006/pve-docs/pve-admin-guide.html пустой Table of Contents, кривое форматирование глав. Браузер жалуется на Uncaught ReferenceError: asciidoc is not defined (https://pve01:8006/pve-docs/pve-admin-guide.html:410) Шаги воспроизведения: 1) Перейти на https://<адрес сервера>:8006/pve-docs/pve-admin-guide.html Во вложении прикрепляю файл с JS кодом, которого не хватает для корректно отображения документации. Судя по всему, во время сборки он подставляется в /asciidoc/pve-html.conf: ifdef::linkcss[] <script type="text/javascript" src="{scriptsdir=.}/asciidoc.js"></script> <script type="text/javascript" src="{scriptsdir=.}/{theme}.js"></script> <script type="text/javascript"> #TODO: Escape not necessary in HTML5? # Escape as CDATA to pass validators. /*<![CDATA[*/ asciidoc.install({toc,toc2?{toclevels}}); /*]]>*/ </script> endif::linkcss[] ifndef::linkcss[] <script type="text/javascript"> # Escape as CDATA to pass validators. /*<![CDATA[*/ include1::{scriptsdir=/etc/asciidoc/javascripts}/asciidoc.js[] include1::{themedir}/{theme}.js[warnings=False] asciidoc.install({toc,toc2?{toclevels}}); /*]]>*/ </script> endif::linkcss[] 273045 1 glinkinvd 2025-09-24 12:06:57 +0300 Такая проблема вызвана изменениями в asciidoc - https://github.com/asciidoc-py/asciidoc-py/commit/4d61d4bfa3ca00b01b543a13e695ed518b90ca6d Как вариант решения проблемы, можно либо пропатчить asciidoc/pve-html.conf, либо сделать в спеке теми же командами вот так: --- a/pve-docs.spec +++ b/pve-docs.spec @@ -24,6 +24,8 @@ grep 'proxmox.com' * -rl | while read f; do sed -i 's|proxmox.com|basealt.ru|' $f done sed -i 's|{python}|python3|' asciidoc/*.conf +sed -i 's!/etc/asciidoc/stylesheets!/usr/lib/python3/site-packages/asciidoc/resources/stylesheets!g' asciidoc/pve-html.conf +sed -i 's!/etc/asciidoc/javascripts!/usr/lib/python3/site-packages/asciidoc/resources/javascripts!g' asciidoc/pve-html.conf rm -f getting-help.adoc howto-improve-pve-docs.adoc pve-package-repos.adoc pve-faq.adoc pve-installation.adoc pve-system-requirements.adoc translation.adoc pve-installation-media.adoc cpu-models.conf.adoc firmware-updates.adoc %build Второй вариант тут - https://packages.altlinux.org/ru/tasks/395692/ 273521 2 repository-robot 2025-09-29 20:29:17 +0300 pve-docs-9.0.8-alt2 -> sisyphus: Thu Sep 25 2025 Konstantin Kozoriz <kozorizki@altlinux> 9.0.8-alt2 - fix: correct resource paths, drop obsolete links (ALT #56110) 19613 2025-09-23 13:58:10 +0300 2025-09-23 13:58:10 +0300 JavaScript код с онлайн-документации Proxmox code.js application/x-javascript 5909 glinkinvd PHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPgovKjwhW0NEQVRBWyovCnZhciBhc2NpaWRv YyA9IHsgIC8vIE5hbWVzcGFjZS4KCi8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLwovLyBUYWJsZSBPZiBDb250ZW50cyBn ZW5lcmF0b3IKLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vCgovKiBBdXRob3I6IE1paGFpIEJhem9uLCBTZXB0ZW1iZXIg MjAwMgogKiBodHRwOi8vc3R1ZGVudHMuaW5mb2lhc2kucm8vfm1pc2hvbwogKgogKiBUYWJsZSBP ZiBDb250ZW50IGdlbmVyYXRvcgogKiBWZXJzaW9uOiAwLjQKICoKICogRmVlbCBmcmVlIHRvIHVz ZSB0aGlzIHNjcmlwdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYwog KiBMaWNlbnNlLCBhcyBsb25nIGFzIHlvdSBkbyBub3QgcmVtb3ZlIG9yIGFsdGVyIHRoaXMgbm90 aWNlLgogKi8KCiAvKiBtb2RpZmllZCBieSBUcm95IEQuIEhhbnNvbiwgU2VwdGVtYmVyIDIwMDYu IExpY2Vuc2U6IEdQTCAqLwogLyogbW9kaWZpZWQgYnkgU3R1YXJ0IFJhY2toYW0sIDIwMDYsIDIw MDkuIExpY2Vuc2U6IEdQTCAqLwoKLy8gdG9jbGV2ZWxzID0gMS4uNC4KdG9jOiBmdW5jdGlvbiAo dG9jbGV2ZWxzKSB7CgogIGZ1bmN0aW9uIGdldFRleHQoZWwpIHsKICAgIHZhciB0ZXh0ID0gIiI7 CiAgICBmb3IgKHZhciBpID0gZWwuZmlyc3RDaGlsZDsgaSAhPSBudWxsOyBpID0gaS5uZXh0U2li bGluZykgewogICAgICBpZiAoaS5ub2RlVHlwZSA9PSAzIC8qIE5vZGUuVEVYVF9OT0RFICovKSAv LyBJRSBkb2Vzbid0IHNwZWFrIGNvbnN0YW50cy4KICAgICAgICB0ZXh0ICs9IGkuZGF0YTsKICAg ICAgZWxzZSBpZiAoaS5maXJzdENoaWxkICE9IG51bGwpCiAgICAgICAgdGV4dCArPSBnZXRUZXh0 KGkpOwogICAgfQogICAgcmV0dXJuIHRleHQ7CiAgfQoKICBmdW5jdGlvbiBUb2NFbnRyeShlbCwg dGV4dCwgdG9jbGV2ZWwpIHsKICAgIHRoaXMuZWxlbWVudCA9IGVsOwogICAgdGhpcy50ZXh0ID0g dGV4dDsKICAgIHRoaXMudG9jbGV2ZWwgPSB0b2NsZXZlbDsKICB9CgogIGZ1bmN0aW9uIHRvY0Vu dHJpZXMoZWwsIHRvY2xldmVscykgewogICAgdmFyIHJlc3VsdCA9IG5ldyBBcnJheTsKICAgIHZh ciByZSA9IG5ldyBSZWdFeHAoJ1toSF0oWzEtJysodG9jbGV2ZWxzKzEpKyddKScpOwogICAgLy8g RnVuY3Rpb24gdGhhdCBzY2FucyB0aGUgRE9NIHRyZWUgZm9yIGhlYWRlciBlbGVtZW50cyAodGhl IERPTTIKICAgIC8vIG5vZGVJdGVyYXRvciBBUEkgd291bGQgYmUgYSBiZXR0ZXIgdGVjaG5pcXVl IGJ1dCBub3Qgc3VwcG9ydGVkIGJ5IGFsbAogICAgLy8gYnJvd3NlcnMpLgogICAgdmFyIGl0ZXJh dGUgPSBmdW5jdGlvbiAoZWwpIHsKICAgICAgZm9yICh2YXIgaSA9IGVsLmZpcnN0Q2hpbGQ7IGkg IT0gbnVsbDsgaSA9IGkubmV4dFNpYmxpbmcpIHsKICAgICAgICBpZiAoaS5ub2RlVHlwZSA9PSAx IC8qIE5vZGUuRUxFTUVOVF9OT0RFICovKSB7CiAgICAgICAgICB2YXIgbW8gPSByZS5leGVjKGku dGFnTmFtZSk7CiAgICAgICAgICBpZiAobW8gJiYgKGkuZ2V0QXR0cmlidXRlKCJjbGFzcyIpIHx8 IGkuZ2V0QXR0cmlidXRlKCJjbGFzc05hbWUiKSkgIT0gImZsb2F0IikgewogICAgICAgICAgICBy ZXN1bHRbcmVzdWx0Lmxlbmd0aF0gPSBuZXcgVG9jRW50cnkoaSwgZ2V0VGV4dChpKSwgbW9bMV0t MSk7CiAgICAgICAgICB9CiAgICAgICAgICBpdGVyYXRlKGkpOwogICAgICAgIH0KICAgICAgfQog ICAgfQogICAgaXRlcmF0ZShlbCk7CiAgICByZXR1cm4gcmVzdWx0OwogIH0KCiAgdmFyIHRvYyA9 IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ0b2MiKTsKICBpZiAoIXRvYykgewogICAgcmV0dXJu OwogIH0KCiAgLy8gRGVsZXRlIGV4aXN0aW5nIFRPQyBlbnRyaWVzIGluIGNhc2Ugd2UncmUgcmVs b2FkaW5nIHRoZSBUT0MuCiAgdmFyIHRvY0VudHJpZXNUb1JlbW92ZSA9IFtdOwogIHZhciBpOwog IGZvciAoaSA9IDA7IGkgPCB0b2MuY2hpbGROb2Rlcy5sZW5ndGg7IGkrKykgewogICAgdmFyIGVu dHJ5ID0gdG9jLmNoaWxkTm9kZXNbaV07CiAgICBpZiAoZW50cnkubm9kZU5hbWUudG9Mb3dlckNh c2UoKSA9PSAnZGl2JwogICAgICYmIGVudHJ5LmdldEF0dHJpYnV0ZSgiY2xhc3MiKQogICAgICYm IGVudHJ5LmdldEF0dHJpYnV0ZSgiY2xhc3MiKS5tYXRjaCgvXnRvY2xldmVsLykpCiAgICAgIHRv Y0VudHJpZXNUb1JlbW92ZS5wdXNoKGVudHJ5KTsKICB9CiAgZm9yIChpID0gMDsgaSA8IHRvY0Vu dHJpZXNUb1JlbW92ZS5sZW5ndGg7IGkrKykgewogICAgdG9jLnJlbW92ZUNoaWxkKHRvY0VudHJp ZXNUb1JlbW92ZVtpXSk7CiAgfQoKICAvLyBSZWJ1aWxkIFRPQyBlbnRyaWVzLgogIHZhciBlbnRy aWVzID0gdG9jRW50cmllcyhkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29udGVudCIpLCB0b2Ns ZXZlbHMpOwogIGZvciAodmFyIGkgPSAwOyBpIDwgZW50cmllcy5sZW5ndGg7ICsraSkgewogICAg dmFyIGVudHJ5ID0gZW50cmllc1tpXTsKICAgIGlmIChlbnRyeS5lbGVtZW50LmlkID09ICIiKQog ICAgICBlbnRyeS5lbGVtZW50LmlkID0gIl90b2NfIiArIGk7CiAgICB2YXIgYSA9IGRvY3VtZW50 LmNyZWF0ZUVsZW1lbnQoImEiKTsKICAgIGEuaHJlZiA9ICIjIiArIGVudHJ5LmVsZW1lbnQuaWQ7 CiAgICBhLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKGVudHJ5LnRleHQpKTsK ICAgIHZhciBkaXYgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgIGRpdi5hcHBl bmRDaGlsZChhKTsKICAgIGRpdi5jbGFzc05hbWUgPSAidG9jbGV2ZWwiICsgZW50cnkudG9jbGV2 ZWw7CiAgICB0b2MuYXBwZW5kQ2hpbGQoZGl2KTsKICB9CiAgaWYgKGVudHJpZXMubGVuZ3RoID09 IDApCiAgICB0b2MucGFyZW50Tm9kZS5yZW1vdmVDaGlsZCh0b2MpOwp9LAoKCi8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v LwovLyBGb290bm90ZXMgZ2VuZXJhdG9yCi8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLwoKLyogQmFzZWQgb24gZm9vdG5v dGUgZ2VuZXJhdGlvbiBjb2RlIGZyb206CiAqIGh0dHA6Ly93d3cuYnJhbmRzcGFua2luZ25ldy5u ZXQvYXJjaGl2ZS8yMDA1LzA3L2Zvcm1hdF9mb290bm90ZS5odG1sCiAqLwoKZm9vdG5vdGVzOiBm dW5jdGlvbiAoKSB7CiAgLy8gRGVsZXRlIGV4aXN0aW5nIGZvb3Rub3RlIGVudHJpZXMgaW4gY2Fz ZSB3ZSdyZSByZWxvYWRpbmcgdGhlIGZvb3Rub2Rlcy4KICB2YXIgaTsKICB2YXIgbm90ZWhvbGRl ciA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJmb290bm90ZXMiKTsKICBpZiAoIW5vdGVob2xk ZXIpIHsKICAgIHJldHVybjsKICB9CiAgdmFyIGVudHJpZXNUb1JlbW92ZSA9IFtdOwogIGZvciAo aSA9IDA7IGkgPCBub3RlaG9sZGVyLmNoaWxkTm9kZXMubGVuZ3RoOyBpKyspIHsKICAgIHZhciBl bnRyeSA9IG5vdGVob2xkZXIuY2hpbGROb2Rlc1tpXTsKICAgIGlmIChlbnRyeS5ub2RlTmFtZS50 b0xvd2VyQ2FzZSgpID09ICdkaXYnICYmIGVudHJ5LmdldEF0dHJpYnV0ZSgiY2xhc3MiKSA9PSAi Zm9vdG5vdGUiKQogICAgICBlbnRyaWVzVG9SZW1vdmUucHVzaChlbnRyeSk7CiAgfQogIGZvciAo aSA9IDA7IGkgPCBlbnRyaWVzVG9SZW1vdmUubGVuZ3RoOyBpKyspIHsKICAgIG5vdGVob2xkZXIu cmVtb3ZlQ2hpbGQoZW50cmllc1RvUmVtb3ZlW2ldKTsKICB9CgogIC8vIFJlYnVpbGQgZm9vdG5v dGUgZW50cmllcy4KICB2YXIgY29udCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb250ZW50 Iik7CiAgdmFyIHNwYW5zID0gY29udC5nZXRFbGVtZW50c0J5VGFnTmFtZSgic3BhbiIpOwogIHZh ciByZWZzID0ge307CiAgdmFyIG4gPSAwOwogIGZvciAoaT0wOyBpPHNwYW5zLmxlbmd0aDsgaSsr KSB7CiAgICBpZiAoc3BhbnNbaV0uY2xhc3NOYW1lID09ICJmb290bm90ZSIpIHsKICAgICAgbisr OwogICAgICB2YXIgbm90ZSA9IHNwYW5zW2ldLmdldEF0dHJpYnV0ZSgiZGF0YS1ub3RlIik7CiAg ICAgIGlmICghbm90ZSkgewogICAgICAgIC8vIFVzZSBbXHNcU10gaW4gcGxhY2Ugb2YgLiBzbyBt dWx0aS1saW5lIG1hdGNoZXMgd29yay4KICAgICAgICAvLyBCZWNhdXNlIEphdmFTY3JpcHQgaGFz IG5vIHMgKGRvdGFsbCkgcmVnZXggZmxhZy4KICAgICAgICBub3RlID0gc3BhbnNbaV0uaW5uZXJI VE1MLm1hdGNoKC9ccypcWyhbXHNcU10qKV1ccyovKVsxXTsKICAgICAgICBzcGFuc1tpXS5pbm5l ckhUTUwgPQogICAgICAgICAgIls8YSBpZD0nX2Zvb3Rub3RlcmVmXyIgKyBuICsgIicgaHJlZj0n I19mb290bm90ZV8iICsgbiArCiAgICAgICAgICAiJyB0aXRsZT0nVmlldyBmb290bm90ZScgY2xh c3M9J2Zvb3Rub3RlJz4iICsgbiArICI8L2E+XSI7CiAgICAgICAgc3BhbnNbaV0uc2V0QXR0cmli dXRlKCJkYXRhLW5vdGUiLCBub3RlKTsKICAgICAgfQogICAgICBub3RlaG9sZGVyLmlubmVySFRN TCArPQogICAgICAgICI8ZGl2IGNsYXNzPSdmb290bm90ZScgaWQ9J19mb290bm90ZV8iICsgbiAr ICInPiIgKwogICAgICAgICI8YSBocmVmPScjX2Zvb3Rub3RlcmVmXyIgKyBuICsgIicgdGl0bGU9 J1JldHVybiB0byB0ZXh0Jz4iICsKICAgICAgICBuICsgIjwvYT4uICIgKyBub3RlICsgIjwvZGl2 PiI7CiAgICAgIHZhciBpZCA9c3BhbnNbaV0uZ2V0QXR0cmlidXRlKCJpZCIpOwogICAgICBpZiAo aWQgIT0gbnVsbCkgcmVmc1siIyIraWRdID0gbjsKICAgIH0KICB9CiAgaWYgKG4gPT0gMCkKICAg IG5vdGVob2xkZXIucGFyZW50Tm9kZS5yZW1vdmVDaGlsZChub3RlaG9sZGVyKTsKICBlbHNlIHsK ICAgIC8vIFByb2Nlc3MgZm9vdG5vdGVyZWZzLgogICAgZm9yIChpPTA7IGk8c3BhbnMubGVuZ3Ro OyBpKyspIHsKICAgICAgaWYgKHNwYW5zW2ldLmNsYXNzTmFtZSA9PSAiZm9vdG5vdGVyZWYiKSB7 CiAgICAgICAgdmFyIGhyZWYgPSBzcGFuc1tpXS5nZXRFbGVtZW50c0J5VGFnTmFtZSgiYSIpWzBd LmdldEF0dHJpYnV0ZSgiaHJlZiIpOwogICAgICAgIGhyZWYgPSBocmVmLm1hdGNoKC8jLiovKVsw XTsgIC8vIEJlY2F1c2UgSUUgcmV0dXJuIGZ1bGwgVVJMLgogICAgICAgIG4gPSByZWZzW2hyZWZd OwogICAgICAgIHNwYW5zW2ldLmlubmVySFRNTCA9CiAgICAgICAgICAiWzxhIGhyZWY9JyNfZm9v dG5vdGVfIiArIG4gKwogICAgICAgICAgIicgdGl0bGU9J1ZpZXcgZm9vdG5vdGUnIGNsYXNzPSdm b290bm90ZSc+IiArIG4gKyAiPC9hPl0iOwogICAgICB9CiAgICB9CiAgfQp9LAoKaW5zdGFsbDog ZnVuY3Rpb24odG9jbGV2ZWxzKSB7CiAgdmFyIHRpbWVySWQ7CgogIGZ1bmN0aW9uIHJlaW5zdGFs bCgpIHsKICAgIGFzY2lpZG9jLmZvb3Rub3RlcygpOwogICAgaWYgKHRvY2xldmVscykgewogICAg ICBhc2NpaWRvYy50b2ModG9jbGV2ZWxzKTsKICAgIH0KICB9CgogIGZ1bmN0aW9uIHJlaW5zdGFs bEFuZFJlbW92ZVRpbWVyKCkgewogICAgY2xlYXJJbnRlcnZhbCh0aW1lcklkKTsKICAgIHJlaW5z dGFsbCgpOwogIH0KCiAgdGltZXJJZCA9IHNldEludGVydmFsKHJlaW5zdGFsbCwgNTAwKTsKICBp ZiAoZG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5lcikKICAgIGRvY3VtZW50LmFkZEV2ZW50TGlzdGVu ZXIoIkRPTUNvbnRlbnRMb2FkZWQiLCByZWluc3RhbGxBbmRSZW1vdmVUaW1lciwgZmFsc2UpOwog IGVsc2UKICAgIHdpbmRvdy5vbmxvYWQgPSByZWluc3RhbGxBbmRSZW1vdmVUaW1lcjsKfQoKfQph c2NpaWRvYy5pbnN0YWxsKDIpOwovKl1dPiovCjwvc2NyaXB0Pgo=