adding domain name parameter, added extra setup file appending

2 files changed, 21 insertions, 1 deletions

diff --git a/askbot/deployment/__init__.py b/askbot/deployment/__init__.py
index 10de3c25..d7dbe92b 100644
--- a/askbot/deployment/__init__.py
+++ b/askbot/deployment/__init__.py
@@ -47,6 +47,18 @@ def askbot_setup():
                       help="the database password"
                      )
 
+    parser.add_option("--domain",
+                      dest="domain_name",
+                      default=None,
+                      help="the domain name of the instance"
+                     )
+
+    parser.add_option("--append-settings",
+                      dest="local_settings",
+                      default='',
+                      help="Extra settings file to append custom settings"
+                     )
+
     (options, args) = parser.parse_args()
     #ask 
     if options.verbosity >= 1:
@@ -164,7 +176,9 @@ def deploy_askbot(directory, create_new, options):
     help_file = path_utils.get_path_to_help_file()
     context = {'database_name': options.database_name,
                'database_password': options.database_password,
-               'database_user': options.database_user
+               'database_user': options.database_user,
+               'domain_name': options.domain_name,
+               'local_settings': options.local_settings
               }
     for key in context.keys():
         if context[key] == None:
diff --git a/askbot/deployment/path_utils.py b/askbot/deployment/path_utils.py
index 95f24735..64818b03 100644
--- a/askbot/deployment/path_utils.py
+++ b/askbot/deployment/path_utils.py
@@ -163,6 +163,12 @@ def deploy_into(directory, new_project = None, verbosity=1, context=None):
         else:
             settings_file = open(settings_path, 'w+')
             settings_file.write(settings_contents)
+            #Grab the file!
+            if exists(context['local_settings']):
+                local_settings = open(context['local_settings'], 'r').read()
+                settings_file.write('\n')
+                settings_file.write(local_settings)
+
             settings_file.close()
             if verbosity>=1:
                 print "settings file created"