From a45b098f98771005297c15888ff85b1749aed9cb Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Thu, 11 Aug 2016 12:41:14 +0200 Subject: [PATCH] update for our new mediawiki installation --- debian/pve-docs-mediawiki.install | 2 +- debian/tree/pve-docs-mediawiki/README | 1 + debian/tree/pve-docs-mediawiki/pve-docs-mediawiki-import | 2 +- debian/tree/pve-docs-mediawiki/pvedocs-include.php | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/pve-docs-mediawiki.install b/debian/pve-docs-mediawiki.install index 9cf293d..41cea59 100644 --- a/debian/pve-docs-mediawiki.install +++ b/debian/pve-docs-mediawiki.install @@ -1,3 +1,3 @@ -debian/tree/pve-docs-mediawiki/pvedocs-include.php /etc/mediawiki-extensions/extensions-available/ +debian/tree/pve-docs-mediawiki/pvedocs-include.php /usr/lib/pve-docs/ debian/tree/pve-docs-mediawiki/pve-docs-mediawiki-import /usr/bin/ debian/tree/pve-docs-mediawiki/pve-docs.conf /etc/apache2/sites-available/ diff --git a/debian/tree/pve-docs-mediawiki/README b/debian/tree/pve-docs-mediawiki/README index 26e673a..c065cfe 100644 --- a/debian/tree/pve-docs-mediawiki/README +++ b/debian/tree/pve-docs-mediawiki/README @@ -21,3 +21,4 @@ mediawiki and updates predefined pages with content from this package: Authentification credientials are read from '/root/.pve-docs'. The format is 'username:password'. +require_once("/usr/lib/pve-docs/pvedocs-include.php"); diff --git a/debian/tree/pve-docs-mediawiki/pve-docs-mediawiki-import b/debian/tree/pve-docs-mediawiki/pve-docs-mediawiki-import index 9e3ced0..cd4e464 100755 --- a/debian/tree/pve-docs-mediawiki/pve-docs-mediawiki-import +++ b/debian/tree/pve-docs-mediawiki/pve-docs-mediawiki-import @@ -13,7 +13,7 @@ my $config_fn = "/root/.pve-docs"; # format 'username:pw' my $fh = IO::File->new("$config_fn") || die "Please configure the mediawiki user/passswd in '$config_fn'\n"; -my $api_url = "http://localhost/api.php"; +my $api_url = "http://localhost/mediawiki/api.php"; my $config = <$fh>; chomp $config; diff --git a/debian/tree/pve-docs-mediawiki/pvedocs-include.php b/debian/tree/pve-docs-mediawiki/pvedocs-include.php index 5fc5378..29f013f 100644 --- a/debian/tree/pve-docs-mediawiki/pvedocs-include.php +++ b/debian/tree/pve-docs-mediawiki/pvedocs-include.php @@ -3,7 +3,7 @@ # see http://www.mediawiki.org/wiki/Manual:Parser_functions $wgExtensionCredits['parserhook'][] = array( - 'name' => "PVE Documenation Pages", + 'name' => "PVE Documentation Pages", 'description' => "Display PVE Documentation Pages", 'author' => "Dietmar Maurer", ); -- 2.39.2