added --project_host option to make_project

py/Boinc/setup_project.py

@@ -8,7 +8,7 @@
 import boinc_path_config
 from Boinc import database, db_mid, configxml, tools
 from Boinc.boinc_db import *
-import os, sys, glob, time, shutil, re, random, socket
+import os, sys, glob, time, shutil, re, random
 
 class Options:
     pass
@@ -454,6 +454,7 @@ class Project:
                  project_dir=None, key_dir=None,
                  master_url=None,
                  db_name=None,
+                 host=None,
                  web_only=False,
                  no_db=False,
                  production=False
@@ -480,8 +481,7 @@ class Project:
         config.db_host = options.db_host
         config.shmem_key = generate_shmem_key()
         config.uldl_dir_fanout = 1024
-        local_host = socket.gethostname()
+        config.host = host
-        config.host = local_host.split('.')[0]
         config.min_sendwork_interval = 0
         config.max_wus_to_send = 50
         config.daily_result_quota = 500

tools/make_project

@@ -41,7 +41,8 @@ Misc options:
 Dir-options:
    --project_root       default: HOME/projects/PROJECT
    --key_dir            default: PROJECT_ROOT/keys
-   --url_base           default: http://$NODENAME/ (http://%(NODENAME)s/)
+   --project_host       default: $HOSTNAME (%(NODENAME)s)
+   --url_base           default: http://PROJECT_HOST/
 
    --html_user_url      default: URL_BASE/PROJECT/
    --html_ops_url       default: URL_BASE/PROJECT_ops/
@@ -72,26 +73,27 @@ def usage():
 try:
     opts, args = getopt.getopt(sys.argv[1:],
         'hv', [
-            'help',
-            'verbose=',
-            'no_query',
-            'test_app',
-            'web_only',
-            'no_db',
-            'srcdir=',
-            'user_name=',
-            'drop_db_first',
-            'delete_prev_inst',
             'base=',
-            'key_dir=',
-            'project_root=',
-            'url_base=',
-            'html_user_url=',
-            'html_ops_url=',
-            'db_name=',
-            'db_user=',
-            'db_passwd=',
             'db_host=',
+            'db_name=',
+            'db_passwd=',
+            'db_user=',
+            'delete_prev_inst',
+            'drop_db_first',
+            'help',
+            'html_ops_url=',
+            'html_user_url=',
+            'key_dir=',
+            'no_db',
+            'no_query',
+            'project_host=',
+            'project_root=',
+            'srcdir=',
+            'test_app',
+            'url_base=',
+            'user_name=',
+            'verbose=',
+            'web_only',
             ]
         )
 except getopt.GetoptError, e:
@@ -107,25 +109,26 @@ options.srcdir = None
 
 for o,a in opts:
     if o == '-h' or o == '--help':        usage()
-    elif o == '-v':              options.echo_verbose   = 2
-    elif o == '--verbose':       options.echo_verbose   = int(a)
-    elif o == '--no_query':      options.no_query       = True
-    elif o == '--test_app':      options.test_app       = True
-    elif o == '--web_only':      options.web_only       = True
-    elif o == '--no_db':         options.no_db          = True
-    elif o == '--srcdir':        options.srcdir         = a
-    elif o == '--user_name':     options.user_name      = a
-    elif o == '--drop_db_first': options.drop_db_first  = True
-    elif o == '--delete_prev_inst': options.delete_prev_inst  = True
-    elif o == '--key_dir':       options.key_dir        = a
-    elif o == '--project_root':  options.project_root   = a
-    elif o == '--url_base':      options.url_base       = a
-    elif o == '--html_user_url': options.html_user_url  = a
-    elif o == '--html_ops_url':  options.html_ops_url   = a
-    elif o == '--db_name':       options.db_name        = a
-    elif o == '--db_user':       options.db_user        = a
-    elif o == '--db_passwd':     options.db_passwd      = a
     elif o == '--db_host':       options.db_host        = a
+    elif o == '--db_name':       options.db_name        = a
+    elif o == '--db_passwd':     options.db_passwd      = a
+    elif o == '--db_user':       options.db_user        = a
+    elif o == '--delete_prev_inst': options.delete_prev_inst  = True
+    elif o == '--drop_db_first': options.drop_db_first  = True
+    elif o == '--html_ops_url':  options.html_ops_url   = a
+    elif o == '--html_user_url': options.html_user_url  = a
+    elif o == '--key_dir':       options.key_dir        = a
+    elif o == '--no_db':         options.no_db          = True
+    elif o == '--no_query':      options.no_query       = True
+    elif o == '--project_host':  options.project_host   = a
+    elif o == '--project_root':  options.project_root   = a
+    elif o == '--srcdir':        options.srcdir         = a
+    elif o == '--test_app':      options.test_app       = True
+    elif o == '--url_base':      options.url_base       = a
+    elif o == '--user_name':     options.user_name      = a
+    elif o == '--verbose':       options.echo_verbose   = int(a)
+    elif o == '--web_only':      options.web_only       = True
+    elif o == '-v':              options.echo_verbose   = 2
     else:
         raise SystemExit('internal error o=%s'%o)
 
@@ -161,7 +164,8 @@ def replopt(str):
 def defopt(name, v, isdir=True):
     options.__dict__[name] = opt_repls[name.upper()] = add_slash(replopt(options.__dict__.get(name) or v), isdir)
 
-defopt('url_base'      , 'http://%s/'%NODENAME)
+defopt('project_host'  , NODENAME, isdir=False)
+defopt('url_base'      , 'http://%s/'%options.project_host)
 
 if not isurl(options.url_base):
     syntax_error('url_base needs to be an URL')
@@ -181,6 +185,7 @@ defopt('db_host'       , '', isdir=False)
 print "Creating project '%s' (short name '%s'):" %(project_longname, project_shortname)
 for k in [
     'project_root',
+    'project_host',
     'url_base',
     'html_user_url',
     'html_ops_url',
@@ -218,6 +223,7 @@ project = Project(
     master_url = options.html_user_url,
     key_dir = options.key_dir,
     db_name = options.db_name,
+    host = options.project_host,
     web_only = options.web_only,
     no_db = options.no_db,
     production = True