# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1455028238 -3600
# Node ID d69a4520413174a2971be490afe639c93975d088
# Parent  b729ccb3a7e239abd184112e06f7b476586f184a
Fixed ScriptAlias directives to work reliably.
Added the URL path to package installer invocations to work with wikifarms.
Added some other reminders.

diff -r b729ccb3a7e2 -r d69a45204131 moinsetup.py
--- a/moinsetup.py	Mon May 19 20:57:03 2014 +0000
+++ b/moinsetup.py	Tue Feb 09 15:30:38 2016 +0100
@@ -3,7 +3,7 @@
 """
 A setup and configuration script for MoinMoin.
 
-Copyright (C) 2010, 2011, 2012, 2013 Paul Boddie <paul@boddie.org.uk>
+Copyright (C) 2010, 2011, 2012, 2013, 2014, 2016 Paul Boddie <paul@boddie.org.uk>
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -54,7 +54,7 @@
 # Templates for Apache site definitions.
 
 apache_site = """\
-ScriptAlias %(url_path)s "%(web_app_dir)s/moin.cgi"
+ScriptAlias %(url_path)s "%(web_app_dir)s/moin.cgi/"
 """
 
 apache_site_extra = """\
@@ -1108,8 +1108,12 @@
 
         if not self.limited_hosting():
 
+            # NOTE: Add ".conf" for awkward Apache management tools.
+
             site_def = join(self.web_site_dir, self.site_identifier)
 
+            # NOTE: Put the more specific definition first.
+
             s = apache_site % self.__dict__
             s += apache_site_extra % self.__dict__
 
@@ -1627,7 +1631,7 @@
 
         path = self._set_pythonpath()
         installer = join(self.prefix_site_packages, "MoinMoin", "packages.py")
-        cmd = "%s %s i %s" % (sys.executable, installer, package_filename)
+        cmd = "%s %s i %s %s" % (sys.executable, installer, package_filename, self.url_path)
         os.system(cmd)
         self._reset_pythonpath(path)