From 0c35aa1432b072423f357c96560b7c674b18d903 Mon Sep 17 00:00:00 2001 From: Dorian Pula Date: Mon, 22 Jun 2015 08:09:13 -0400 Subject: [PATCH] Update deployment to use the npm installation setup. --- tasks/nodejs.yaml | 2 -- tasks/rookeries_deployment.yaml | 6 +++--- vars/main.yml | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tasks/nodejs.yaml b/tasks/nodejs.yaml index 4b471bc..21e6c45 100644 --- a/tasks/nodejs.yaml +++ b/tasks/nodejs.yaml @@ -31,7 +31,5 @@ - name: install coffeescript + less dependencies npm: name={{ item }} global=yes state=present registry=http://registry.npmjs.org/ with_items: - - coffee-script - less - browserify - - bower diff --git a/tasks/rookeries_deployment.yaml b/tasks/rookeries_deployment.yaml index c2c5e08..22a3769 100644 --- a/tasks/rookeries_deployment.yaml +++ b/tasks/rookeries_deployment.yaml @@ -13,6 +13,7 @@ pip: requirements=requirements.txt virtualenv={{ rookeries_venv }} chdir={{ app_root_path }} when: deploy_package.stat.exists +# TODO Remove after transition to CouchDB as a store. - name: install extra MySQL python connector dependency pip: name=mysql-connector-python virtualenv={{ rookeries_venv }} version=1.1.6 extra_args="--allow-external mysql-connector-python --allow-unverified mysql-connector-python" @@ -23,9 +24,8 @@ state=directory recurse=yes when: deploy_package.stat.exists -# TODO Replace with npm installation in the future. -- name: install bower dependencies in app - command: bower install --allow-root --quiet chdir={{ web_root_path }}/rookeries_webapp +- name: install frontend dependencies for app + npm: path={{ app_root_path }} state=present registry=http://registry.npmjs.org/ notify: - restart uwsgi app when: deploy_package.stat.exists diff --git a/vars/main.yml b/vars/main.yml index 769a627..8767dd9 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -4,7 +4,7 @@ app_name: "{{ rookeries_app_name }}" # Introduced from deployment playbook rookeries_venv: "{{ virtualenv_root_path }}/rookeries" -rookeries_package: rookeries-0.4.0.tar.bz2 +rookeries_package: rookeries-0.5.0.tar.bz2 rookeries_package_path: "{{ rookeries_package }}" # Extra virtualenv if working in a dev environment to provide the mailsink testing server