Merge pull request #482 from flibbertigibbet/feature/fix-deploy

Feature/fix deploy

Author: flibbertigibbet

deployment/ansible/roles.txt

@@ -1,6 +1,6 @@
 azavea.git,0.1.0
 azavea.java,0.2.6
-azavea.opentripplanner,1.0.0
+azavea.opentripplanner,1.0.1
 azavea.nginx,0.2.1
 azavea.nodejs,0.4.0
 azavea.packer,0.2.0

deployment/ansible/roles/cac-tripplanner.app/templates/cac_secrets.j2

@@ -1,4 +1,3 @@
-allowed_hosts: {{ allowed_hosts }}
 internal_ips: {{ internal_ips }}
 postgis_version: {{ postgis_version }}
 aws_storage_bucket_name: '{{ aws_storage_bucket_name }}'

deployment/ansible/roles/cac-tripplanner.otp-data/tasks/main.yml

@@ -23,7 +23,7 @@
   when: test
 
 - name: Copy OTP Data (test/develop)
-  copy: src=./otp_data/ dest="{{ otp_data_dir }}/" owner={{ansible_ssh_user}} group={{ansible_ssh_user}} mode=0664
+  copy: src=./otp_data/ dest="{{ otp_data_dir }}/" owner={{ansible_user_id}} group={{ansible_user_id}} mode=0664
   when: develop or test
 
 - name: Build OTP Graph (test/develop)
@@ -45,5 +45,5 @@
   when: develop or test
 
 - name: Copy Local Graph to Graph Directory (production)
-  copy: src=./otp_data/Graph.obj dest="{{ otp_data_dir }}/{{ otp_router }}/Graph.obj" owner={{ansible_ssh_user}} group={{ansible_ssh_user}} mode=0664
+  copy: src=./otp_data/Graph.obj dest="{{ otp_data_dir }}/{{ otp_router }}/Graph.obj" owner={{ansible_user_id}} group={{ansible_user_id}} mode=0664
   when: production

deployment/packer/cac.json

@@ -77,9 +77,8 @@
         "sudo apt-get update",
         "mkdir -p {{user `ansible_staging_directory`}}",
         "mkdir -p {{user `intermediate_directory`}}",
-        "sudo apt-get -y install build-essential python-dev python-pip git",
-        "sudo pip install paramiko==1.16.0",
-        "sudo pip install ansible==1.8.4"
+        "sudo apt-get -y install build-essential python-dev python-pip git libssl-dev libffi-dev",
+        "sudo pip install --upgrade ansible setuptools"
       ]
     },
     {
@@ -105,13 +104,19 @@
       "playbook_file": "{{user `local_project_directory`}}/deployment/ansible/app.yml",
       "inventory_file": "{{user `local_project_directory`}}/deployment/ansible/hosts/hosts.app",
       "group_vars": "{{user `local_project_directory`}}/deployment/ansible/group_vars/",
+      "extra_arguments": [
+          "--user 'ubuntu'"
+      ],
       "only": ["app"]
     },
     {
       "type": "ansible-local",
       "playbook_file": "{{user `local_project_directory`}}/deployment/ansible/otp.yml",
       "inventory_file": "{{user `local_project_directory`}}/deployment/ansible/hosts/hosts.otp",
       "group_vars": "{{user `local_project_directory`}}/deployment/ansible/group_vars/",
+      "extra_arguments": [
+          "--user 'ubuntu'"
+      ],
       "only": ["otp"]
     }
   ]

python/cac_tripplanner/cac_tripplanner/settings.py

@@ -34,7 +34,6 @@
         # overridden via the secrets file. This can't be automatically set
         # to the host machine's DNS here, because this code runs in a VM.
         'otp_url': 'http://192.168.8.26/otp/routers/{router}/',
-        'allowed_hosts': ['127.0.0.1', 'localhost'],
         'internal_ips': ['0.0.0.0', '127.0.0.1'],
         'postgis_version': [2, 1, 5],
         'build_dir': '/opt/app/src',
@@ -63,7 +62,7 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = not secrets['production']
 
-ALLOWED_HOSTS = secrets['allowed_hosts']
+ALLOWED_HOSTS = ['*']
 
 INTERNAL_IPS = tuple(secrets['internal_ips'])
 

src/gulpfile.js

@@ -64,8 +64,11 @@ var copyBowerFiles = function(filter, extraFiles) {
         .pipe(addsrc(extraFiles));
 };
 
+// silence the collectstatic output
+// gulp-run hangs if the output is too large:
+// https://github.com/MrBoolean/gulp-run/issues/34
 gulp.task('collectstatic', function () {
-    return run('python ' + pythonRoot + '/manage.py collectstatic --noinput').exec();
+    return run('python ' + pythonRoot + '/manage.py collectstatic --noinput -v0').exec();
 });
 
 gulp.task('clean', function() {