Skip to content

Commit cc6b768

Browse files
committed
Merge pull request #191 from CodeNow/npm-remove-optional
remove upstart script, remove node_module optional
2 parents 36e5c93 + e251388 commit cc6b768

4 files changed

Lines changed: 4 additions & 54 deletions

File tree

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@ node_modules
22
ca-key.pem
33
pass
44
hellorunnable
5+
dump.rdb
6+
erl_crash.dump
7+
npm-debug.log

ansible/roles/git_node_service/tasks/main.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
---
2-
- name: copy config file
3-
sudo: yes
4-
template:
5-
src=upstart.conf
6-
dest=/etc/init/{{ app_name }}.conf
7-
backup=yes
8-
92
- name: create {{ app_name }} repository dir
103
sudo: yes
114
file:
@@ -26,6 +19,7 @@
2619

2720
- name: remove node_modules
2821
sudo: yes
22+
when: remove_node_modules is defined
2923
file:
3024
path=/opt/runnable/{{ app_name }}/node_modules
3125
state=absent

ansible/roles/git_node_service/templates/upstart.conf

Lines changed: 0 additions & 41 deletions
This file was deleted.

ansible/roles/sauron/tasks/main.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,3 @@
3939
shell: "docker kill `docker ps | grep weave | awk '{print $1}'` || echo"
4040
when: weave_install.changed
4141
sudo: yes
42-
43-
- name: get org id
44-
sudo: yes
45-
when: docker_config == "docks"
46-
shell: "cut -d, -f 1 /opt/runnable/host_tags"
47-
register: org_id

0 commit comments

Comments
 (0)