1.1 --- a/moinsetup.py Tue Feb 09 15:30:38 2016 +0100
1.2 +++ b/moinsetup.py Tue Feb 09 14:38:52 2016 +0000
1.3 @@ -417,7 +417,7 @@
1.4
1.5 site_config_names = (
1.6 "web_app_dir", "web_site_dir", "web_static_dir",
1.7 - "url_path", "static_url_path"
1.8 + "url_complete", "url_path", "static_url_path"
1.9 )
1.10
1.11 # NOTE: Potentially detect Web server credentials.
1.12 @@ -436,7 +436,7 @@
1.13 web_app_dir=None, web_static_dir=None, web_site_dir=None,
1.14 web_user=None, web_group=None,
1.15 common_dir=None, farm_config=None, site_config=None,
1.16 - url_path=None, static_url_path=None,
1.17 + url_complete=None, url_path=None, static_url_path=None,
1.18 superuser=None, site_name=None, site_identifier=None, front_page_name=None,
1.19 theme_default=None):
1.20
1.21 @@ -470,6 +470,9 @@
1.22 'common_dir' setting)
1.23 * site_config - optional: a specific configuration file location
1.24 (overrides the 'common_dir' setting)
1.25 + * url_complete - optional: the complete URL at which the Wiki
1.26 + will be made available by a wikifarm (such as
1.27 + https://moinmo.in/ or http://my.wiki/Mine)
1.28 * url_path - the URL path at which the Wiki will be made
1.29 available (such as / or /mywiki)
1.30 * static_url_path - optional: the URL path at which static resources
1.31 @@ -504,6 +507,8 @@
1.32 if not self.web_app_dir:
1.33 raise TypeError, "The 'web_app_dir' setting must be specified."
1.34
1.35 + self.url_complete = url_complete
1.36 +
1.37 # Strip any trailing "/" from the URL path.
1.38
1.39 if not url_path:
1.40 @@ -1631,7 +1636,7 @@
1.41
1.42 path = self._set_pythonpath()
1.43 installer = join(self.prefix_site_packages, "MoinMoin", "packages.py")
1.44 - cmd = "%s %s i %s %s" % (sys.executable, installer, package_filename, self.url_path)
1.45 + cmd = "%s %s i %s %s" % (sys.executable, installer, package_filename, self.url_complete or self.url_path)
1.46 os.system(cmd)
1.47 self._reset_pythonpath(path)
1.48