moinsetup

Changeset

79:d69a45204131
2016-02-09 Paul Boddie raw files shortlog changelog graph Fixed ScriptAlias directives to work reliably. Added the URL path to package installer invocations to work with wikifarms. Added some other reminders.
moinsetup.py (file)
     1.1 --- a/moinsetup.py	Mon May 19 20:57:03 2014 +0000
     1.2 +++ b/moinsetup.py	Tue Feb 09 15:30:38 2016 +0100
     1.3 @@ -3,7 +3,7 @@
     1.4  """
     1.5  A setup and configuration script for MoinMoin.
     1.6  
     1.7 -Copyright (C) 2010, 2011, 2012, 2013 Paul Boddie <paul@boddie.org.uk>
     1.8 +Copyright (C) 2010, 2011, 2012, 2013, 2014, 2016 Paul Boddie <paul@boddie.org.uk>
     1.9  
    1.10  This program is free software; you can redistribute it and/or modify it under
    1.11  the terms of the GNU General Public License as published by the Free Software
    1.12 @@ -54,7 +54,7 @@
    1.13  # Templates for Apache site definitions.
    1.14  
    1.15  apache_site = """\
    1.16 -ScriptAlias %(url_path)s "%(web_app_dir)s/moin.cgi"
    1.17 +ScriptAlias %(url_path)s "%(web_app_dir)s/moin.cgi/"
    1.18  """
    1.19  
    1.20  apache_site_extra = """\
    1.21 @@ -1108,8 +1108,12 @@
    1.22  
    1.23          if not self.limited_hosting():
    1.24  
    1.25 +            # NOTE: Add ".conf" for awkward Apache management tools.
    1.26 +
    1.27              site_def = join(self.web_site_dir, self.site_identifier)
    1.28  
    1.29 +            # NOTE: Put the more specific definition first.
    1.30 +
    1.31              s = apache_site % self.__dict__
    1.32              s += apache_site_extra % self.__dict__
    1.33  
    1.34 @@ -1627,7 +1631,7 @@
    1.35  
    1.36          path = self._set_pythonpath()
    1.37          installer = join(self.prefix_site_packages, "MoinMoin", "packages.py")
    1.38 -        cmd = "%s %s i %s" % (sys.executable, installer, package_filename)
    1.39 +        cmd = "%s %s i %s %s" % (sys.executable, installer, package_filename, self.url_path)
    1.40          os.system(cmd)
    1.41          self._reset_pythonpath(path)
    1.42