From df209bed213b3037ea0b5d6b3bf596997a9da569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felipe=20Mart=C3=ADn?= Date: Wed, 17 Jun 2015 22:31:54 +0200 Subject: [PATCH] Added less/js to provision --- provision/roles/app_deploy/tasks/bower.yml | 3 +++ provision/roles/app_deploy/tasks/django.yml | 8 ++++++++ provision/roles/app_deploy/tasks/gulp.yml | 9 +++++++++ provision/roles/app_deploy/tasks/main.yml | 10 ++++++++-- provision/roles/app_deploy/tasks/node.yml | 6 +++--- provision/roles/nodejs/tasks/tools.yml | 1 + 6 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 provision/roles/app_deploy/tasks/bower.yml create mode 100644 provision/roles/app_deploy/tasks/gulp.yml diff --git a/provision/roles/app_deploy/tasks/bower.yml b/provision/roles/app_deploy/tasks/bower.yml new file mode 100644 index 0000000..f03568d --- /dev/null +++ b/provision/roles/app_deploy/tasks/bower.yml @@ -0,0 +1,3 @@ +--- +- name: Install bower requirements + bower: path={{ deploy_path.stdout }}/git diff --git a/provision/roles/app_deploy/tasks/django.yml b/provision/roles/app_deploy/tasks/django.yml index 0c16d75..e94c2a2 100644 --- a/provision/roles/app_deploy/tasks/django.yml +++ b/provision/roles/app_deploy/tasks/django.yml @@ -5,3 +5,11 @@ command=migrate app_path={{ deploy_path.stdout }}/git virtualenv={{ deploy_path.stdout }}/.virtualenv + settings=amiibofindr.settings.local + +- name: Performs manage.py collectstatic + django_manage: > + command=collectstatic + app_path={{ deploy_path.stdout }}/git + virtualenv={{ deploy_path.stdout }}/.virtualenv + settings=amiibofindr.settings.local diff --git a/provision/roles/app_deploy/tasks/gulp.yml b/provision/roles/app_deploy/tasks/gulp.yml new file mode 100644 index 0000000..9ee5c2a --- /dev/null +++ b/provision/roles/app_deploy/tasks/gulp.yml @@ -0,0 +1,9 @@ +--- +- name: Execute gulp scripts + command: gulp scripts + args: + chdir: "{{ deploy_path.stdout }}/git" +- name: Execute gulp less + command: gulp less + args: + chdir: "{{ deploy_path.stdout }}/git" diff --git a/provision/roles/app_deploy/tasks/main.yml b/provision/roles/app_deploy/tasks/main.yml index 50d5482..933c6e8 100644 --- a/provision/roles/app_deploy/tasks/main.yml +++ b/provision/roles/app_deploy/tasks/main.yml @@ -19,8 +19,8 @@ - include: virtualenv.yml remote_user: "{{ app_user }}" -#- include: node.yml -# remote_user: "{{ app_user }}" +- include: node.yml + remote_user: "{{ app_user }}" - include: config.yml remote_user: "{{ app_user }}" @@ -29,6 +29,12 @@ remote_user: "{{ app_user }}" when: initial_syncdb.stat.exists == False +- include: bower.yml + remote_user: "{{ app_user }}" + +- include: gulp.yml + remote_user: "{{ app_user }}" + - include: django.yml remote_user: "{{ app_user }}" when: initial_syncdb.stat.exists diff --git a/provision/roles/app_deploy/tasks/node.yml b/provision/roles/app_deploy/tasks/node.yml index 6d379dc..00d08bc 100644 --- a/provision/roles/app_deploy/tasks/node.yml +++ b/provision/roles/app_deploy/tasks/node.yml @@ -1,3 +1,3 @@ -#--- -#- name: Install node requirements -# npm: path={{ deploy_path.stdout }}/git/src/backend +--- +- name: Install node requirements + npm: path={{ deploy_path.stdout }}/git diff --git a/provision/roles/nodejs/tasks/tools.yml b/provision/roles/nodejs/tasks/tools.yml index 0fc2e57..1fe3db9 100644 --- a/provision/roles/nodejs/tasks/tools.yml +++ b/provision/roles/nodejs/tasks/tools.yml @@ -4,3 +4,4 @@ sudo: true with_items: - gulp + - bower