X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-base.git/blobdiff_plain/d030720f0845cc4f5ef0b68997c780537c69de7f:/files/usr/sbin/invirt-getconf..ac7d3e06f5f881c3818b9e47b09bad4eaa47784e:/files/usr/bin/invirt-getconf

diff --git a/files/usr/sbin/invirt-getconf b/files/usr/bin/invirt-getconf
similarity index 90%
rename from files/usr/sbin/invirt-getconf
rename to files/usr/bin/invirt-getconf
index bb4fd80..4721212 100755
--- a/files/usr/sbin/invirt-getconf
+++ b/files/usr/bin/invirt-getconf
@@ -16,7 +16,7 @@ Examples:
   invirt-getconf authn.0.type
 """
 
-from invirt.config import default_src_path, default_cache_path, load
+from invirt.config import load
 from sys import argv, exit, stderr, stdout
 from optparse import OptionParser
 
@@ -27,10 +27,10 @@ def main(argv):
         parser = OptionParser(usage = '%prog [options] key',
                 description = __doc__.strip().split('\n\n')[0])
         parser.add_option('-s', '--src',
-                default = default_src_path,
+                default = '/etc/invirt/master.yaml',
                 help = 'the source YAML configuration file to read from')
         parser.add_option('-c', '--cache',
-                default = default_cache_path,
+                default = '/var/lib/invirt/invirt.json',
                 help = 'path to the JSON cache')
         parser.add_option('-r', '--refresh',
                 action = 'store_true',
@@ -80,10 +80,8 @@ def main(argv):
                 print conf
             else:
                 import yaml
-                try:    dumper = yaml.CSafeDumper
-                except: dumper = yaml.SafeDumper
                 yaml.dump(conf, stdout,
-                          Dumper = dumper, default_flow_style = False)
+                          Dumper=yaml.CSafeDumper, default_flow_style=False)
     except invirt_exception, ex:
         print >> stderr, ex
         return 1