More fixes for worker setup

Author: Janzert

setup/worker_server_info.py.template

@@ -6,7 +6,7 @@ server_info = {{
     "maps_path": "{map_dir}",
     "compiled_path": "{compiled_dir}",
     "logs_path": "{log_dir}",
-    "api_base_url": "http://{api_url}/",
+    "api_base_url": "{api_url}",
     "api_key": "{api_key}",
     "secure_jail": True,
     "memory_limit": 100,

setup/worker_setup.py

@@ -110,6 +110,9 @@ def setup_contest_files(options):
     if not os.path.exists(map_dir):
         os.mkdir(map_dir)
         run_cmd("chown {0}: {1}".format(options.username, map_dir))
+    if not os.path.exists(options.log_dir):
+        os.mkdir(options.log_dir)
+        run_cmd("chown {0}: {1}".format(options.username, options.log_dir))
     worker_dir = os.path.join(contest_root, local_repo, "worker")
     si_filename = os.path.join(TEMPLATE_DIR, "worker_server_info.py.template")
     with open(si_filename, 'r') as si_file:
@@ -293,7 +296,7 @@ def get_options(argv):
         "log_dir": log_dir,
         "local_repo": top_level,
         "create_jails": True,
-        "api_url":  '.'.join(getfqdn().split('.')[1:]),
+        "api_url":  "http://"+ '.'.join(getfqdn().split('.')[1:]) +"/",
         "api_key": "",
         "install_cronjob": False,
         "run_worker": False,

worker/start_worker.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-$ORIG_DIR = `pwd`
+ORIG_DIR=`pwd`
 cd `dirname $0`
 python release_stale_jails.py
 python worker.py -t -n 0 &