Skip to content

Commit

Permalink
Merge branch 'drybjed-force-shell-interpreter'
Browse files Browse the repository at this point in the history
  • Loading branch information
drybjed committed Sep 7, 2017
2 parents 9de3fa4 + 2faa562 commit fcf9a8f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
3 changes: 3 additions & 0 deletions tasks/main.yml
Expand Up @@ -91,6 +91,8 @@

- name: Get list of nameservers configured in /etc/resolv.conf
shell: awk '$1=="nameserver" {if(/%/){sub(/[0-9a-fA-F:]+/, "[&]", $2)}; print $2}' /etc/resolv.conf
args:
executable: '/bin/sh'
register: nginx_register_nameservers
changed_when: False
check_mode: False
Expand Down Expand Up @@ -200,6 +202,7 @@
- name: Remove all configuration symlinks during config reset
shell: rm -f /etc/nginx/sites-enabled/*
args:
executable: '/bin/sh'
creates: '/etc/ansible/facts.d/nginx.fact'
warn: False
when: (nginx__deploy_state in [ 'present' ])
Expand Down
2 changes: 2 additions & 0 deletions tasks/passenger_config.yml
Expand Up @@ -12,6 +12,8 @@

- name: Detect passenger ruby
shell: "passenger-config about ruby-command | grep Command | tail -1 | awk -F: '{print $2}'"
args:
executable: '/bin/sh'
register: nginx_register_passenger_ruby
changed_when: False

Expand Down

0 comments on commit fcf9a8f

Please sign in to comment.