Merge pull request #262 from pinguinkiste/default-config

Do not create default config if config.d directory exists
elasticluster · Jun 1, 2016 · 73c3075 · 73c3075
2 parents b92348f + 2d88f2e
commit 73c3075
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/elasticluster/main.py b/elasticluster/main.py
@@ -150,8 +150,8 @@ def pre_run(self):
                                  "%s\n" % (str(ex)))
                 sys.exit(1)
 
-        # If no configuration file was specified and default does not exists...
-        if not os.path.isfile(self.params.config):
+        # If no configuration file was specified and default does not exists and the user did not create a config dir...
+        if not os.path.isfile(self.params.config) and not os.path.isdir(self.params.config + '.d'):
             if self.params.config == self.default_configuration_file:
             # Copy the default configuration file to the user's home
                 if not os.path.exists(os.path.dirname(self.params.config)):