moinsetup

Changeset

55:71087b8512cf
2011-10-15 Paul Boddie raw files shortlog changelog graph Added calculated settings to the show_config method.
moinsetup.py (file)
     1.1 --- a/moinsetup.py	Sat Oct 15 22:36:26 2011 +0200
     1.2 +++ b/moinsetup.py	Sat Oct 15 23:52:47 2011 +0200
     1.3 @@ -492,6 +492,12 @@
     1.4                  print "%-24s%s" % (setting, getattr(self, setting))
     1.5              print
     1.6  
     1.7 +        print "Configuration locations"
     1.8 +        print "-----------------------"
     1.9 +        print
    1.10 +        print "%-24s%s" % ("site-level", self.get_site_config())
    1.11 +        print "%-24s%s" % ("global", self.get_global_config())
    1.12 +
    1.13      def _get_abspath(self, d):
    1.14          return d and abspath(d) or None
    1.15  
    1.16 @@ -569,6 +575,24 @@
    1.17          else:
    1.18              return self.common_dir
    1.19  
    1.20 +    def get_site_config(self):
    1.21 +
    1.22 +        "Return the file providing the site-level configuration."
    1.23 +
    1.24 +        if self.site_config:
    1.25 +            return self.site_config
    1.26 +        else:
    1.27 +            return join(self.common_dir, "wikiconfig.py")
    1.28 +
    1.29 +    def get_global_config(self):
    1.30 +
    1.31 +        "Return the file providing the global MoinMoin configuration."
    1.32 +
    1.33 +        if self.farm_config:
    1.34 +            return self.farm_config
    1.35 +        else:
    1.36 +            return join(self.common_dir, "wikiconfig.py")
    1.37 +
    1.38      def get_static_identifier(self):
    1.39  
    1.40          "Return the static URL/directory identifier for the Wiki."
    1.41 @@ -989,10 +1013,7 @@
    1.42          will be changed.
    1.43          """
    1.44  
    1.45 -        if self.site_config:
    1.46 -            wikiconfig_py = self.site_config
    1.47 -        else:
    1.48 -            wikiconfig_py = join(self.common_dir, "wikiconfig.py")
    1.49 +        wikiconfig_py = self.get_site_config()
    1.50  
    1.51          status("Editing configuration from %s..." % wikiconfig_py)
    1.52  
    1.53 @@ -1019,10 +1040,7 @@
    1.54          will be changed.
    1.55          """
    1.56  
    1.57 -        if self.farm_config:
    1.58 -            wikiconfig_py = self.farm_config
    1.59 -        else:
    1.60 -            wikiconfig_py = join(self.common_dir, "wikiconfig.py")
    1.61 +        wikiconfig_py = self.get_global_config()
    1.62  
    1.63          status("Editing configuration from %s..." % wikiconfig_py)
    1.64