Skip to content

Commit

Permalink
Merge branch 'release/1.3.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
chusiang committed Jun 21, 2017
2 parents ef7f9a5 + d7d7377 commit cd7a44b
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 5 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ This repository contains Dockerized [Ansible](https://github.com/ansible/ansible
### Images

* chusiang/php7:ubuntu14.04 (lastest)
* chusiang/php7:centos6
* `chusiang/php7:ubuntu14.04` (lastest)
* `chusiang/php7:centos6`

### Usage

Expand Down
10 changes: 10 additions & 0 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,16 @@ Vagrant.configure("2") do |config|
end
end

# Debian 9
config.vm.define "debian9" do |node|
node.vm.box = "debian/stretch64"
node.vm.hostname = "debian9.php7.local"
node.vm.provision "ansible" do |ansible|
ansible.playbook = "setup.yml"
ansible.sudo = true
end
end

# CentOS 6.7
config.vm.define "centos6" do |node|
node.vm.box = "bento/centos-6.7"
Expand Down
3 changes: 2 additions & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

galaxy_info:
author: chusiang
description: Deploy PHP 7 (php-fpm) for nginx on Ubuntu and CentOS. (forked from itcraftsmanpl.php7)
description: Deploy PHP 7 (php-fpm) for nginx on Ubuntu, Debian and CentOS. (forked from itcraftsmanpl.php7)
license: MIT
min_ansible_version: 1.9
platforms:
Expand All @@ -12,6 +12,7 @@ galaxy_info:
- name: Debian
versions:
- jessie
- stretch
- name: EL
versions:
- 6
Expand Down
8 changes: 6 additions & 2 deletions tasks/use-apt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,16 @@
apt_repository: >
repo="deb {{ debian_php7_apt_repo }} {{ ansible_distribution_release }} all"
state=present
when: ansible_distribution|lower == "debian"
when:
- ansible_distribution|lower == "debian"
- ansible_distribution_major_version < "9"

- name: Add apt key for Debian
become: true
apt_key: url={{ debian_php7_apt_key }} state=present
when: ansible_distribution|lower == "debian"
when:
- ansible_distribution|lower == "debian"
- ansible_distribution_major_version < "9"

- name: Add third-party repository for Ubuntu
become: true
Expand Down

0 comments on commit cd7a44b

Please sign in to comment.