proxmox-mirrors/pve-docs
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-docs synced 2025-04-29 21:32:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixup: TOC JS script is already in html pages for mediawiki

Browse Source 
not required, it's shipped by the docs files themself

This reverts commit 02114e68c2.
This commit is contained in:
Thomas Lamprecht 2019-07-25 18:03:51 +02:00
parent d95c639783
commit b275db163b
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -208,14 +208,13 @@ doc-install: index.html $(WIKI_IMPORTS) $(API_VIEWER_SOURCES) verify-images exam
install -m 0644 ${API_VIEWER_SOURCES} $(DESTDIR)/usr/share/${DOC_PACKAGE}/api-viewer install -m 0644 ${API_VIEWER_SOURCES} $(DESTDIR)/usr/share/${DOC_PACKAGE}/api-viewer
.PHONY: mediawiki-install .PHONY: mediawiki-install
mediawiki-install: pve-docs-mediawiki-import asciidoc/mediawiki-asciidoc.js mediawiki-install: pve-docs-mediawiki-import
install -dm755 $(DESTDIR)/usr/share/$(MEDIAWIKI_PACKAGE) install -dm755 $(DESTDIR)/usr/share/$(MEDIAWIKI_PACKAGE)
install -dm755 $(DESTDIR)/usr/share/doc/$(MEDIAWIKI_PACKAGE) install -dm755 $(DESTDIR)/usr/share/doc/$(MEDIAWIKI_PACKAGE)
install -dm755 $(DESTDIR)/usr/bin install -dm755 $(DESTDIR)/usr/bin
install -dm755 $(DESTDIR)/usr/share/$(MEDIAWIKI_PACKAGE) install -dm755 $(DESTDIR)/usr/share/$(MEDIAWIKI_PACKAGE)
install -dm755 $(DESTDIR)/usr/share/doc/$(MEDIAWIKI_PACKAGE) install -dm755 $(DESTDIR)/usr/share/doc/$(MEDIAWIKI_PACKAGE)
install -m 0755 pve-docs-mediawiki-import $(DESTDIR)/usr/bin/ install -m 0755 pve-docs-mediawiki-import $(DESTDIR)/usr/bin/
install -m 0644 -o www-data asciidoc/mediawiki-asciidoc.js $(DESTDIR)/usr/share/doc/$(MEDIAWIKI_PACKAGE)/mediawiki-asciidoc.js
.PHONY: upload .PHONY: upload
upload: ${GEN_DEB} ${DOC_DEB} ${MEDIAWIKI_DEB} upload: ${GEN_DEB} ${DOC_DEB} ${MEDIAWIKI_DEB}

1
debian/pve-docs-mediawiki.install vendored
View File

@ -1,4 +1,3 @@
/usr/bin/pve-docs-mediawiki-import /usr/bin/pve-docs-mediawiki-import
/usr/share/doc/pve-docs-mediawiki/mediawiki-asciidoc.js
debian/tree/pve-docs-mediawiki/pve-docs.conf /etc/apache2/sites-available/ debian/tree/pve-docs-mediawiki/pve-docs.conf /etc/apache2/sites-available/
debian/tree/pve-docs-mediawiki/pvedocs-include.php /usr/lib/pve-docs/ debian/tree/pve-docs-mediawiki/pvedocs-include.php /usr/lib/pve-docs/

6
debian/tree/pve-docs-mediawiki/README vendored
View File

@ -26,10 +26,4 @@ In the MediaWiki settings PHP file ('/var/www/mediawiki/LocalSettings.php') add:
# ----8<---- # ----8<----
# for docs-inclusion plugin: # for docs-inclusion plugin:
require_once("/usr/lib/pve-docs/pvedocs-include.php"); require_once("/usr/lib/pve-docs/pvedocs-include.php");
# for the JS snippet which generates the Table of Content and footer links
$wgHooks['BeforePageDisplay'][] = function( OutputPage &$out, Skin &$skin ) {
$asciidoc_js = file_get_contents("/usr/share/doc/pve-docs-mediawiki/mediawiki-asciidoc.js");
$out->addInlineScript($asciidoc_js);
};
# ---->8---- # ---->8----