Commits

Vladimir Mihailenco committed 8f45e74

Merge options

Comments (0)

Files changed (1)

fab_deploy/utils.py

         LOCAL_CONFIG='config.py',
         REMOTE_CONFIG_TEMPLATE='config.server.py',
 
-        CONFIG_TEMPLATES_DIR='config_templates',
-        INSTANCE_CONFIG_TEMPLATES_DIR='config_templates',
+        CONFIG_TEMPLATES_DIRS=['config_templates'],
 
         PIP_REQUIREMENTS_DIR='reqs',
         PIP_REQUIREMENTS='all.txt',
     if name.startswith('/'):
         return name
 
-    path = os.path.join(env.conf.INSTANCE_CONFIG_TEMPLATES_DIR, name)
-    if os.path.exists(path):
-        return path
-
-    return os.path.join(env.conf.CONFIG_TEMPLATES_DIR, name)
+    for dir in env.conf.CONFIG_TEMPLATES_DIRS:
+        path = os.path.join(dir, name)
+        if os.path.exists(path):
+            return path
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.