File tree Expand file tree Collapse file tree 11 files changed +102
-5
lines changed Expand file tree Collapse file tree 11 files changed +102
-5
lines changed Original file line number Diff line number Diff line change @@ -14,6 +14,6 @@ before_install:
14
14
install :
15
15
- pip install molecule[docker]
16
16
script :
17
- - molecule test -s $scenario
17
+ - travis_wait 50 molecule test -s $scenario
18
18
notifications :
19
19
webhooks : https://galaxy.ansible.com/api/v1/notifications/
Original file line number Diff line number Diff line change 4
4
lint :
5
5
name : yamllint
6
6
platforms :
7
+ - name : alpine-3.8
8
+ image : alpine:3.8
9
+ dockerfile : ../common/Dockerfile.j2
10
+ command : " /sbin/init"
11
+ - name : alpine-3.9
12
+ image : alpine:3.9
13
+ dockerfile : ../common/Dockerfile.j2
14
+ command : " /sbin/init"
15
+ - name : alpine-3.10
16
+ image : alpine:3.10
17
+ dockerfile : ../common/Dockerfile.j2
18
+ command : " /sbin/init"
7
19
- name : centos-6
8
20
image : centos:6
9
21
dockerfile : ../common/Dockerfile.j2
Original file line number Diff line number Diff line change 7
7
lint :
8
8
name : yamllint
9
9
platforms :
10
+ - name : alpine-3.8
11
+ image : alpine:3.8
12
+ dockerfile : ../common/Dockerfile.j2
13
+ command : " /sbin/init"
14
+ - name : alpine-3.9
15
+ image : alpine:3.9
16
+ dockerfile : ../common/Dockerfile.j2
17
+ command : " /sbin/init"
18
+ - name : alpine-3.10
19
+ image : alpine:3.10
20
+ dockerfile : ../common/Dockerfile.j2
21
+ command : " /sbin/init"
10
22
- name : centos-6
11
23
image : centos:6
12
24
dockerfile : ../common/Dockerfile.j2
Original file line number Diff line number Diff line change 7
7
lint :
8
8
name : yamllint
9
9
platforms :
10
+ - name : alpine-3.8
11
+ image : alpine:3.8
12
+ dockerfile : ../common/Dockerfile.j2
13
+ command : " /sbin/init"
14
+ - name : alpine-3.9
15
+ image : alpine:3.9
16
+ dockerfile : ../common/Dockerfile.j2
17
+ command : " /sbin/init"
18
+ - name : alpine-3.10
19
+ image : alpine:3.10
20
+ dockerfile : ../common/Dockerfile.j2
21
+ command : " /sbin/init"
10
22
- name : centos-6
11
23
image : centos:6
12
24
dockerfile : ../common/Dockerfile.j2
Original file line number Diff line number Diff line change 4
4
lint :
5
5
name : yamllint
6
6
platforms :
7
+ - name : alpine-3.8
8
+ image : alpine:3.8
9
+ dockerfile : ../common/Dockerfile.j2
10
+ command : " /sbin/init"
11
+ - name : alpine-3.9
12
+ image : alpine:3.9
13
+ dockerfile : ../common/Dockerfile.j2
14
+ command : " /sbin/init"
15
+ - name : alpine-3.10
16
+ image : alpine:3.10
17
+ dockerfile : ../common/Dockerfile.j2
18
+ command : " /sbin/init"
7
19
- name : centos-6
8
20
image : centos:6
9
21
dockerfile : ../common/Dockerfile.j2
Original file line number Diff line number Diff line change 1
1
---
2
2
- name : Converge
3
3
hosts : all
4
+ pre_tasks :
5
+ - name : " Set module if Alpine"
6
+ set_fact :
7
+ module :
8
+ - " unit-perl"
9
+ - " unit-php7"
10
+ - " unit-python3"
11
+ when : ansible_os_family == "Alpine"
12
+ - name : " Set module if Debian/RedHat"
13
+ set_fact :
14
+ module :
15
+ - " unit-perl"
16
+ - " unit-php"
17
+ - " unit-ruby"
18
+ when : ansible_os_family == "Debian"
19
+ - name : " Set module if RedHat"
20
+ set_fact :
21
+ module :
22
+ - " unit-php"
23
+ - " unit-go"
24
+ when : ansible_os_family == "RedHat"
4
25
roles :
5
26
- role : ansible-role-nginx
6
27
vars :
7
28
nginx_enable : false
8
29
nginx_unit_enable : true
9
- nginx_unit_modules :
10
- - unit-php
30
+ nginx_unit_modules : " {{ module }}"
Original file line number Diff line number Diff line change 14
14
- import_tasks : setup-suse.yml
15
15
when : ansible_os_family == "Suse"
16
16
17
- when : nginx_install_from == "nginx_repository"
17
+ when :
18
+ - nginx_install_from == "nginx_repository"
18
19
19
20
- name : " (Install: Linux) Install NGINX package"
20
21
package :
21
22
name : " nginx{{ nginx_version | default('') }}"
22
23
state : present
23
- when : ansible_os_family in nginx_linux_families
24
+ when :
25
+ - nginx_install_from == "os_repository"
24
26
notify : " (Handler: All OSs) Start NGINX"
Original file line number Diff line number Diff line change 14
14
path : /etc/apk/repositories
15
15
insertafter : EOF
16
16
line : " {{ repository }}"
17
+
18
+ - name : " (Install: Alpine) Install Required Alpine Dependencies"
19
+ apk :
20
+ name :
21
+ - openssl
22
+ - pcre
23
+
24
+ - name : " (Install: Alpine) Install NGINX"
25
+ apk :
26
+ name : " nginx{{ nginx_version | default('') }}"
27
+ repository : " {{ repository }}"
28
+ notify : " (Handler: All OSs) Start NGINX"
Original file line number Diff line number Diff line change 18
18
repo : " {{ item }}"
19
19
with_items :
20
20
- " {{ repository }}"
21
+
22
+ - name : " (Install: Debian/Ubuntu) Install NGINX"
23
+ apt :
24
+ name : " nginx{{ nginx_version | default('') }}"
25
+ notify : " (Handler: All OSs) Start NGINX"
Original file line number Diff line number Diff line change 17
17
description : NGINX Repository
18
18
enabled : yes
19
19
gpgcheck : yes
20
+
21
+ - name : " (Install: CentOS/RedHat) Install NGINX"
22
+ yum :
23
+ name : " nginx{{ nginx_version | default('') }}"
24
+ notify : " (Handler: All OSs) Start NGINX"
You can’t perform that action at this time.
0 commit comments