Upate paths to match new boot directory in ec2autorun

galaxyproject · Jul 11, 2015 · 49f535d · 49f535d
1 parent ea3de89
commit 49f535d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/cm/boot/__init__.py b/cm/boot/__init__.py
@@ -30,7 +30,7 @@
 
 LOCAL_PATH = os.getcwd()
 CM_HOME = '/mnt/cm'
-CM_BOOT_PATH = '/tmp/cm'
+CM_BOOT_PATH = '/opt/cloudman/boot'
 USER_DATA_FILE = 'userData.yaml'
 SYSTEM_MESSAGES_FILE = '/mnt/cm/sysmsg.txt'
 CM_REMOTE_FILENAME = 'cm.tar.gz'
@@ -127,7 +127,7 @@ def _fix_nginx_upload(ud):
     if os.path.exists(nginx_conf_path):
         # Make sure any duplicate entries are collapsed into one (otherwise,
         # nginx won't start)
-        bkup_nginx_conf_path = "/tmp/cm/original_nginx.conf"
+        bkup_nginx_conf_path = "/opt/cloudman/boot/original_nginx.conf"
         _run(log, "cp {0} {1}".format(nginx_conf_path, bkup_nginx_conf_path))
         _run(log, "uniq {0} > {1}".format(bkup_nginx_conf_path, nginx_conf_path))
         # Check if the directive is already defined

diff --git a/cm_boot.py b/cm_boot.py
@@ -205,7 +205,7 @@ def _key_exists_in_bucket(log, s3_conn, bucket_name, key_name):
 logging.getLogger('boto').setLevel(logging.INFO)
 LOCAL_PATH = os.getcwd()
 CM_HOME = '/mnt/cm'
-CM_BOOT_PATH = '/tmp/cm'
+CM_BOOT_PATH = '/opt/cloudman/boot'
 USER_DATA_FILE = 'userData.yaml'
 SYSTEM_MESSAGES_FILE = '/mnt/cm/sysmsg.txt'
 CM_REMOTE_FILENAME = 'cm.tar.gz'
@@ -280,7 +280,7 @@ def _fix_nginx_upload(ud):
     nginx_conf_path = ud.get('nginx_conf_path', _nginx_conf_file(log))
     log.info('Attempting to configure max_client_body_size in {0}'.format(nginx_conf_path))
     if os.path.exists(nginx_conf_path):
-        bkup_nginx_conf_path = '/tmp/cm/original_nginx.conf'
+        bkup_nginx_conf_path = '/opt/cloudman/boot/original_nginx.conf'
         _run(log, 'cp {0} {1}'.format(nginx_conf_path, bkup_nginx_conf_path))
         _run(log, 'uniq {0} > {1}'.format(bkup_nginx_conf_path, nginx_conf_path))
         already_defined = "grep 'client_max_body_size' {0}".format(nginx_conf_path)

diff --git a/userData.yaml.sample b/userData.yaml.sample
@@ -1,6 +1,6 @@
 access_key: <your AWS access key>
 boot_script_name: [cm_boot.py]
-boot_script_path: [/tmp/cm]
+boot_script_path: [/opt/cloudman/boot]
 bucket_cluster: cm-<hash>
 bucket_default: [cloudman]
 cloudman_home: /mnt/cm