Add commandline options for configuration files.

diff --git a/src/backupninja b/src/backupninja
index e351c62acd9afd171be82135dc554d74e2b8145e..a77242d55a14df5b610324da43bce7dab3df59db 100755 (executable)
--- a/src/backupninja
+++ b/src/backupninja
@@ -35,7 +35,30 @@ log = logging.getLogger()
 def make_option_parser():
     description = """%prog checks for scheduled actions and runs them when needed."""
     parser = optparse.OptionParser(description=description)
-
+    parser.add_option( "-c", "--confdir"
+                     , help="Load configuration from CONFIG_DIR "
+                            "instead of '%default'. When "
+                            "the --conffile or --actionsdir options "
+                            "specify relative paths, they are taken "
+                            "relative to this directory."
+                     , default="/etc/backupninja"
+                     , dest="config_dir"
+                     , metavar="CONFIG_DIR")
+    parser.add_option( "-f", "--conffile"
+                     , help="Load the main configuration from FILE instead "
+                            "of '%default'. If FILE is a relative path, it "
+                            "is interpreted relative to CONFIG_DIR."
+                     , default='backupninja.conf'
+                     , dest="global_config"
+                     , metavar="FILE")
+    parser.add_option( "-a", "--actionsdir"
+                     , help="Load action configurations from ACTIONS_DIR "
+                            "instead of '%default'. If ACTIONS_DIR is a "
+                            "relative path, it is interpreted relative to "
+                            "CONFIG_DIR."
+                     , default="actions"
+                     , dest="actions_dir"
+                     , metavar="ACTIONS_DIR")
     return parser
  
 def main(argv):

diff --git a/src/lib/backupninja/config.py b/src/lib/backupninja/config.py
index af3d4dae3b7ddda15d3b4b22a1328eddfb93571e..0246efe11e34adc02104f5d8f67de6be4ff44a39 100644 (file)
--- a/src/lib/backupninja/config.py
+++ b/src/lib/backupninja/config.py
@@ -37,7 +37,7 @@ def get_global_config(opts):
 
     opts are the parsed commandline options.
     """
-    global_config = os.path.join(default_config_dir, default_global_config)
+    global_config = os.path.join(opts.config_dir, opts.global_config)
     return _load_config(global_config)
 
 def get_action_config(opts, action):
@@ -48,7 +48,7 @@ def get_action_config(opts, action):
 
     opts are the parsed commandline options.
     """
-    actions_dir = os.path.join(default_config_dir, default_actions_dir)
+    actions_dir = os.path.join(opts.config_dir, opts.actions_dir)
     return _load_config(os.path.join(actions_dir, action))
 
 def list_actions(opts):
@@ -57,7 +57,7 @@ def list_actions(opts):
     list of action names that can be passed to get_action_config.
     opts are the parsed commandline options.
     """
-    actions_dir = os.path.join(default_config_dir, default_actions_dir)
+    actions_dir = os.path.join(opts.config_dir, opts.actions_dir)
     return os.listdir(actions_dir)
     
 def _load_config(filename):