Compare commits
No commits in common. "4aef107c1a1aa2e1cdc5d17e0d194c2e716ec114" and "309824dabf9722234ae48c3f39ac5d4224ac6b01" have entirely different histories.
4aef107c1a
...
309824dabf
|
@ -40,6 +40,10 @@ Vagrant.configure("2") do |config|
|
||||||
d.has_ssh = true
|
d.has_ssh = true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if opts[:name].include? "bullseye"
|
||||||
|
m.vm.provision "shell", inline: "[ -f '/root/first_provision' ] || (apt-get update -qq && apt-get -y dist-upgrade && touch /root/first_provision)"
|
||||||
|
end
|
||||||
|
|
||||||
#m.vm.provision "shell", inline: "apt-get update && apt-get install -y python python-apt"
|
#m.vm.provision "shell", inline: "apt-get update && apt-get install -y python python-apt"
|
||||||
m.vm.provision "ansible" do |ansible|
|
m.vm.provision "ansible" do |ansible|
|
||||||
ansible.playbook = "tests/test.yml"
|
ansible.playbook = "tests/test.yml"
|
||||||
|
@ -59,6 +63,10 @@ Vagrant.configure("2") do |config|
|
||||||
end
|
end
|
||||||
m.vm.provision "shell", inline: "apt-get update && apt-get install -y ifupdown python"
|
m.vm.provision "shell", inline: "apt-get update && apt-get install -y ifupdown python"
|
||||||
|
|
||||||
|
if opts[:name].include? "bullseye"
|
||||||
|
m.vm.provision "shell", inline: "[ -f '/root/first_provision' ] || (apt-get update -qq && apt-get -y dist-upgrade && touch /root/first_provision)"
|
||||||
|
end
|
||||||
|
|
||||||
m.vm.provision "ansible" do |ansible|
|
m.vm.provision "ansible" do |ansible|
|
||||||
ansible.playbook = "tests/test.yml"
|
ansible.playbook = "tests/test.yml"
|
||||||
ansible.verbose = 'vv'
|
ansible.verbose = 'vv'
|
||||||
|
|
|
@ -1,14 +1,5 @@
|
||||||
---
|
---
|
||||||
|
|
||||||
- name: SHELL | Check if we are in multiple PHP distribution
|
|
||||||
ansible.builtin.shell: set -o pipefail && apt-cache search php xdebug | grep 'php[[:digit:]].[[:digit:]]'
|
|
||||||
args:
|
|
||||||
executable: /bin/bash
|
|
||||||
failed_when: false
|
|
||||||
changed_when: false
|
|
||||||
register: multiple_php
|
|
||||||
when: ansible_os_family == 'Debian'
|
|
||||||
|
|
||||||
- name: INCLUDE_VARS | Related to OS family
|
- name: INCLUDE_VARS | Related to OS family
|
||||||
ansible.builtin.include_vars: "OS_Family_{{ ansible_os_family }}.yml"
|
ansible.builtin.include_vars: "OS_Family_{{ ansible_os_family }}.yml"
|
||||||
|
|
||||||
|
@ -73,7 +64,6 @@
|
||||||
state: present
|
state: present
|
||||||
update_cache: true
|
update_cache: true
|
||||||
cache_valid_time: 3600
|
cache_valid_time: 3600
|
||||||
install_recommends: false
|
|
||||||
vars:
|
vars:
|
||||||
pkgs: "{{ php_packages + php_extra_packages | flatten }}"
|
pkgs: "{{ php_packages + php_extra_packages | flatten }}"
|
||||||
notify: restart php-fpm
|
notify: restart php-fpm
|
||||||
|
|
|
@ -4,13 +4,11 @@
|
||||||
|
|
||||||
- name: APT | Install APCu
|
- name: APT | Install APCu
|
||||||
ansible.builtin.apt:
|
ansible.builtin.apt:
|
||||||
pkg: "{{ php_apcu_package }}"
|
pkg: "php-apcu"
|
||||||
install_recommends: false
|
|
||||||
|
|
||||||
- name: APT | Install Opcache
|
- name: APT | Install Opcache
|
||||||
ansible.builtin.apt:
|
ansible.builtin.apt:
|
||||||
pkg: "{{ php_package_prefix }}opcache"
|
pkg: "{{ php_package_prefix }}opcache"
|
||||||
install_recommends: false
|
|
||||||
|
|
||||||
when: ansible_os_family == 'Debian'
|
when: ansible_os_family == 'Debian'
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
state: present
|
state: present
|
||||||
update_cache: true
|
update_cache: true
|
||||||
cache_valid_time: 3600
|
cache_valid_time: 3600
|
||||||
install_recommends: false
|
|
||||||
when: ansible_os_family == 'Debian'
|
when: ansible_os_family == 'Debian'
|
||||||
|
|
||||||
- name: PKGNG | Install xdebug
|
- name: PKGNG | Install xdebug
|
||||||
|
|
|
@ -167,21 +167,3 @@
|
||||||
ansible.builtin.uri:
|
ansible.builtin.uri:
|
||||||
url: "http://localhost{{ php_fpm_poold.0.status_path }}"
|
url: "http://localhost{{ php_fpm_poold.0.status_path }}"
|
||||||
when: php_fpm_poold.0.status_path is defined
|
when: php_fpm_poold.0.status_path is defined
|
||||||
|
|
||||||
- block:
|
|
||||||
|
|
||||||
- name: SHELL | Check if we installed multiple PHP versions
|
|
||||||
ansible.builtin.shell: set -o pipefail && (dpkg -l | grep 'php[[:digit:]].*common' | wc -l)
|
|
||||||
args:
|
|
||||||
executable: /bin/bash
|
|
||||||
failed_when: false
|
|
||||||
changed_when: false
|
|
||||||
register: check_multiple_php
|
|
||||||
|
|
||||||
|
|
||||||
- name: FAIL | If we have multiple PHP version
|
|
||||||
ansible.builtin.fail:
|
|
||||||
msg: "Multiple PHP versions detected"
|
|
||||||
when: check_multiple_php.stdout != '1'
|
|
||||||
|
|
||||||
when: ansible_os_family == 'Debian'
|
|
||||||
|
|
|
@ -7,8 +7,7 @@ php_packages:
|
||||||
- '{{ php_package_prefix }}mysql'
|
- '{{ php_package_prefix }}mysql'
|
||||||
- '{{ php_package_prefix }}intl'
|
- '{{ php_package_prefix }}intl'
|
||||||
|
|
||||||
php_xdebug_package: '{% if multiple_php.rc == 0 %}{{ php_package_prefix }}{% else %}php-{% endif %}xdebug'
|
php_xdebug_package: 'php-xdebug'
|
||||||
php_apcu_package: '{% if multiple_php.rc == 0 %}{{ php_package_prefix }}{% else %}php-{% endif %}apcu'
|
|
||||||
|
|
||||||
php_package_prefix: 'php{{ php_version }}-'
|
php_package_prefix: 'php{{ php_version }}-'
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue