update for our new mediawiki installation

diff --git a/debian/pve-docs-mediawiki.install b/debian/pve-docs-mediawiki.install
index 9cf293dc4f9692205624eb6bb52b58dcfcbd8fb7..41cea59f030dfa9db1a2d211865bd8121c640041 100644 (file)
--- 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 26e673a2a35695b0e3b3650b20f552f61ba87d71..c065cfea18c65b2baf3150ac3f517891b3988495 100644 (file)
--- 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 9e3ced0797a6fbeab4818600bcaa07e6bfc4ad44..cd4e4640f133f2aa51ea6e3d276f3834d5a75b6d 100755 (executable)
--- 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 5fc53784a0b00341491ea97b3d7540b40578964e..29f013fa8d65acc1f6f03e8eeb14da7cf427a1f4 100644 (file)
--- 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",
 );