From 6fe172acc832aea7d4f0aef74624efc2751ac509 Mon Sep 17 00:00:00 2001 From: Jayasuganthi Date: Fri, 20 Jul 2018 15:35:31 +0530 Subject: [PATCH] mediawiki: Enable short URLs Fixes #1274 Reviewed-by: Joseph Nuthalapati --- actions/mediawiki | 14 ++++++++++++++ .../conf-available/mediawiki-freedombox.conf | 9 +++++++++ plinth/modules/mediawiki/__init__.py | 2 +- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 data/etc/apache2/conf-available/mediawiki-freedombox.conf diff --git a/actions/mediawiki b/actions/mediawiki index f40eb5f7a..8784c5add 100755 --- a/actions/mediawiki +++ b/actions/mediawiki @@ -85,6 +85,7 @@ def subcommand_setup(_): ]) subprocess.run(['chmod', '-R', 'o-rwx', data_dir], check=True) subprocess.run(['chown', '-R', 'www-data:www-data', data_dir], check=True) + _change_article_path() _disable_public_registrations() _disable_anonymous_editing() _change_logo() @@ -119,6 +120,17 @@ def _change_logo(): file_handle.write(line) +def _change_article_path(): + lines = open(CONF_FILE, 'r').readlines() + with open(CONF_FILE, 'a') as file_handle: + conf_line = "" + for line in lines: + if not re.match('^\s*\$wgArticlePath', line): + conf_line = "$wgArticlePath = \"/mediawiki/$1\";\n" + if not re.match('^\s*\$wgUsePathInfo', line): + conf_line = conf_line+"$wgUsePathInfo = true;\n"; + file_handle.write(conf_line) + def _enable_file_uploads(): """Enable file uploads in mediawiki""" @@ -159,11 +171,13 @@ def subcommand_enable(_): """Enable web configuration and reload.""" action_utils.service_enable('mediawiki-jobrunner') action_utils.webserver_enable('mediawiki') + action_utils.webserver_enable('mediawiki-freedombox') def subcommand_disable(_): """Disable web configuration and reload.""" action_utils.webserver_disable('mediawiki') + action_utils.webserver_disable('mediawiki-freedombox') action_utils.service_disable('mediawiki-jobrunner') diff --git a/data/etc/apache2/conf-available/mediawiki-freedombox.conf b/data/etc/apache2/conf-available/mediawiki-freedombox.conf new file mode 100644 index 000000000..d5c8207e4 --- /dev/null +++ b/data/etc/apache2/conf-available/mediawiki-freedombox.conf @@ -0,0 +1,9 @@ + + + RewriteEngine On + RewriteRule ^/index.php/(.*)$ /$1 [R,L] + RewriteCond %{REQUEST_FILENAME} !-f + RewriteCond %{REQUEST_FILENAME} !-d + RewriteRule ^(.*)$ index.php [L] + + diff --git a/plinth/modules/mediawiki/__init__.py b/plinth/modules/mediawiki/__init__.py index 708091071..12358b1dd 100644 --- a/plinth/modules/mediawiki/__init__.py +++ b/plinth/modules/mediawiki/__init__.py @@ -26,7 +26,7 @@ from plinth.menu import main_menu from .manifest import clients -version = 3 +version = 4 managed_packages = ['mediawiki', 'imagemagick', 'php-sqlite3']