Skip to content

Commit ae72633

Browse files
committed
improve(tests) support for bionic 18.04
1 parent f441778 commit ae72633

File tree

5 files changed

+25
-25
lines changed

5 files changed

+25
-25
lines changed

README.md

+14-14
Original file line numberDiff line numberDiff line change
@@ -94,20 +94,20 @@ Upon studiing installation instructions, we automate manual installation steps w
9494
- name: Ruby | Download chruby distribution
9595
get_url: url="http://github.com/postmodern/chruby/archive/v{{ chruby_version }}.tar.gz"
9696
dest="/tmp/chruby-{{ chruby_version }}.tar.gz"
97-
when: chruby_present|failed
97+
when: chruby_present is failed
9898
tags: ruby
9999

100100
- name: Ruby | unpack chruby
101101
command: tar xf "/tmp/chruby-{{ chruby_version }}.tar.gz"
102102
chdir="/tmp"
103-
when: chruby_present|failed
103+
when: chruby_present is failed
104104
tags: ruby
105105

106106
- name: Ruby | chruby install target
107107
command: make install
108108
chdir="/tmp/chruby-{{ chruby_version }}"
109109
become: yes
110-
when: chruby_present|failed
110+
when: chruby_present is failed
111111
tags: ruby
112112

113113
- name: Ruby | autoload script
@@ -212,7 +212,7 @@ Historically, I prefer Nginx over classic Apache, thus we will install pre-build
212212

213213
- name: Passenger | Add GPG key to apt keyring
214214
apt_key: keyserver=keyserver.ubuntu.com id=561F9B9CAC40B2F7
215-
when: ansible_os_family == "Debian" and nginx_present|failed
215+
when: ansible_os_family == "Debian" and nginx_present is failed
216216
tags: passenger
217217
become: yes
218218

@@ -221,19 +221,19 @@ Historically, I prefer Nginx over classic Apache, thus we will install pre-build
221221
with_items:
222222
- apt-transport-https
223223
- ca-certificates
224-
when: ansible_os_family == "Debian" and nginx_present|failed
224+
when: ansible_os_family == "Debian" and nginx_present is failed
225225
become: yes
226226
tags: passenger
227227

228228
- name: Passenger | Add nginx extras repository
229229
apt_repository: repo="deb https://oss-binaries.phusionpassenger.com/apt/passenger trusty main" state=present
230-
when: ansible_os_family == "Debian" and nginx_present|failed
230+
when: ansible_os_family == "Debian" and nginx_present is failed
231231
tags: passenger
232232
become: yes
233233

234234
- name: Ruby | Install Nginx extra and Phusion Passenger
235235
apt: state=present update_cache=yes pkg="{{item}}"
236-
when: ansible_os_family == "Debian" and nginx_present|failed
236+
when: ansible_os_family == "Debian" and nginx_present is failed
237237
with_items:
238238
- nginx-extras
239239
- passenger
@@ -245,7 +245,7 @@ Historically, I prefer Nginx over classic Apache, thus we will install pre-build
245245
with_items:
246246
- /etc/nginx/sites-available
247247
- /etc/nginx/sites-enabled
248-
when: ansible_os_family == "Debian" and nginx_present|failed
248+
when: ansible_os_family == "Debian" and nginx_present is failed
249249
tags:
250250
- nginx
251251
- passenger
@@ -256,44 +256,44 @@ Historically, I prefer Nginx over classic Apache, thus we will install pre-build
256256
tags:
257257
- nginx
258258
- passenger
259-
when: ansible_os_family == "Debian" and nginx_present|failed
259+
when: ansible_os_family == "Debian" and nginx_present is failed
260260
become: yes
261261

262262
- name: Nginx | Disable default site
263263
file: path=/etc/nginx/sites-enabled/default state=absent
264264
tags:
265265
- nginx
266266
- passenger
267-
when: ansible_os_family == "Debian" and nginx_present|failed
267+
when: ansible_os_family == "Debian" and nginx_present is failed
268268
become: yes
269269

270270
- name: Nginx | Uncomment server_names_hash_bucket_size
271271
lineinfile: dest=/etc/nginx/nginx.conf regexp="^(\s*)#\s*server_names_hash_bucket_size" line="\1server_names_hash_bucket_size 64;" backrefs=yes
272272
become: yes
273-
when: ansible_os_family == "Debian" and nginx_present|failed
273+
when: ansible_os_family == "Debian" and nginx_present is failed
274274
tags:
275275
- nginx
276276
- passenger
277277

278278
- name: Nginx | Set ruby to system one
279279
lineinfile: dest=/etc/nginx/nginx.conf regexp="^(\s*)#\s*passenger_ruby" line="passenger_ruby /usr/local/bin/ruby;" backrefs=yes
280280
become: yes
281-
when: ansible_os_family == "Debian" and nginx_present|failed
281+
when: ansible_os_family == "Debian" and nginx_present is failed
282282
tags:
283283
- nginx
284284
- passenger
285285

286286
- name: Nginx | Set ruby to system one
287287
lineinfile: dest=/etc/nginx/nginx.conf regexp="^(\s*)#\s*passenger_root" line="passenger_root /usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini;" backrefs=yes
288288
become: yes
289-
when: ansible_os_family == "Debian" and nginx_present|failed
289+
when: ansible_os_family == "Debian" and nginx_present is failed
290290
tags:
291291
- nginx
292292
- passenger
293293

294294
- name: Nginx | Reload
295295
service: name=nginx state=reloaded
296-
when: ansible_os_family == "Debian" and nginx_present|failed
296+
when: ansible_os_family == "Debian" and nginx_present is failed
297297
tags:
298298
- nginx
299299
- passenger

meta/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ galaxy_info:
1414
# - Apache
1515
# - CC-BY
1616
license: MIT
17-
min_ansible_version: 1.9.4
17+
min_ansible_version: 2.4.2.2
1818
#
1919
# Below are all platforms currently available. Just uncomment
2020
# the ones that apply to your role. If you don't see your
@@ -24,8 +24,8 @@ galaxy_info:
2424
- name: Ubuntu
2525
versions:
2626
- trusty
27-
- wily
2827
- xenial
28+
- bionix
2929
galaxy_tags:
3030
- ruby
3131
- chruby

tasks/ch_ruby.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@
99
- name: Ruby | Download chruby distribution
1010
get_url: url="http://github.com/postmodern/chruby/archive/v{{ chruby_version }}.tar.gz"
1111
dest="/tmp/chruby-{{ chruby_version }}.tar.gz"
12-
when: chruby_present|failed
12+
when: chruby_present is failed
1313
tags: ruby
1414

1515
- name: Ruby | unpack chruby
1616
command: tar xf "/tmp/chruby-{{ chruby_version }}.tar.gz"
1717
chdir="/tmp"
18-
when: chruby_present|failed
18+
when: chruby_present is failed
1919
tags: ruby
2020

2121
- name: Ruby | chruby install target
2222
command: make install
2323
chdir="/tmp/chruby-{{ chruby_version }}"
2424
become: yes
25-
when: chruby_present|failed
25+
when: chruby_present is failed
2626
tags: ruby
2727

2828
- name: Ruby | autoload script

tasks/main.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,26 @@
99
tags:
1010
- travis_1
1111

12-
- include: 'ch_ruby.yml'
12+
- include_tasks: 'ch_ruby.yml'
1313
tags:
1414
- travis_2
1515

1616

17-
- include: 'ruby_install.yml'
17+
- include_tasks: 'ruby_install.yml'
1818
tags:
1919
- travis_2
2020

2121

22-
- include: 'ruby.yml'
22+
- include_tasks: 'ruby.yml'
2323
tags:
2424
- travis_3
2525

2626

27-
- include: 'nginx_passenger.yml'
27+
- include_tasks: 'nginx_passenger.yml'
2828
when: option_install_nginx_passenger
2929
tags:
3030
- travis_4
3131

3232

33-
- include: 'ruby_app_stub.yml'
33+
- include_tasks: 'ruby_app_stub.yml'
3434
when: option_install_sampleapp

tasks/nginx_passenger.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191

9292
- name: Nginx | Reload
9393
service: name=nginx state=reloaded
94-
when: ansible_os_family == "Debian" and (docker_test is not defined) and nginx_present|failed
94+
when: ansible_os_family == "Debian" and (docker_test is not defined) and nginx_present is failed
9595
tags:
9696
- nginx
9797
- passenger

0 commit comments

Comments
 (0)