Use the plugin_dir configuration directive.

Previously, all wipis would share the same plugins due to a symlink in
their data dirs. This is a much more elegant approach.

diff --git a/conf/farmconfig.py b/conf/farmconfig.py
index a1e98ebceef59166777f9ab0a4b2321d846b3dd6..f2b8cca19ebc06c977f12b1943bef2deeaf78066 100644 (file)
--- a/conf/farmconfig.py
+++ b/conf/farmconfig.py
@@ -94,6 +94,11 @@ class FarmConfig(DefaultConfig):
     # backup it.
     data_underlay_dir = data_dir_root + '/underlay/'
 
     # backup it.
     data_underlay_dir = data_dir_root + '/underlay/'
 

+    # Override the default data_dir/plugin path for plugins, which doesn't
+    # make sense. We don't want to have per-wiki plugins anyway and stuffing
+    # code in the datadir is weird.
+    plugin_dir = os.path.join(os.path.dirname(__file__), os.path.pardir, 'plugin')
+

     # The URL prefix we use to access the static stuff (img, css, js).
     # NOT touching this is maybe the best way to handle this setting as moin
     # uses a good internal default (something like '/moin_static163' for moin
     # The URL prefix we use to access the static stuff (img, css, js).
     # NOT touching this is maybe the best way to handle this setting as moin
     # uses a good internal default (something like '/moin_static163' for moin