library/roles/php-fpm: Support the Ubuntu PPA that permits to install newer php versions.

library/roles/drupal-org: 8.1.7 is the newest drupal version and the new default.
This commit is contained in:
Andrea Dell'Amico 2016-08-01 14:19:36 +02:00
parent f8d93f6fbf
commit 064b563c29
4 changed files with 18 additions and 5 deletions

View File

@ -1,7 +1,7 @@
--- ---
drupal_install_deb: False drupal_install_deb: False
drupal_major: 8 drupal_major: 8
drupal_version: '{{ drupal_major_ver }}.0.3' drupal_version: '{{ drupal_major_ver }}.1.7'
drupal_dist_name: 'drupal-{{ drupal_version }}' drupal_dist_name: 'drupal-{{ drupal_version }}'
drupal_dist_file: '{{ drupal_dist_name }}.tar.gz' drupal_dist_file: '{{ drupal_dist_name }}.tar.gz'
drupal_tar_url: 'http://ftp.drupal.org/files/projects/{{ drupal_dist_file }}' drupal_tar_url: 'http://ftp.drupal.org/files/projects/{{ drupal_dist_file }}'

View File

@ -1,6 +1,6 @@
--- ---
- name: Install the drupal php prerequisites - name: Install the drupal php prerequisites
apt: name={{ item }} state=present apt: name={{ item }} state=latest update_cache=yes cache_valid_time=3600
with_items: drupal_php_prereq with_items: drupal_php_prereq
tags: drupal tags: drupal
@ -69,7 +69,7 @@
tags: drupal tags: drupal
- name: Remove the original drupal unpacked distribution - name: Remove the original drupal unpacked distribution
command: rm -fr {{ drupal_download_dir }}/{{ drupal_dist_name }} file: dest={{ drupal_download_dir }}/{{ drupal_dist_name }} state=absent
when: ( unpack_drupal | changed ) when: ( unpack_drupal | changed )
tags: drupal tags: drupal

View File

@ -5,10 +5,13 @@
# #
phpfpm_service_enabled: True phpfpm_service_enabled: True
phpfpm_remove_php_module: True phpfpm_remove_php_module: True
php_from_ppa: False
php_ppa: ppa:ondrej/php
php_version: 5
phpfpm_base_dir: /etc/php5/fpm phpfpm_base_dir: /etc/php5/fpm
php_fpm_packages: php_fpm_packages:
- php5-fpm - 'php{{ php_version }}-fpm'
# Main confign file settings # Main confign file settings
# It can be 'syslog' # It can be 'syslog'

View File

@ -1,7 +1,17 @@
--- ---
# php as a standalone service # php as a standalone service
- name: Install the Ubuntu PHP PPA
apt_repository: repo={{ php_ppa }} state=present update_cache=yes
when: php_from_ppa
tags: [ 'php', 'php_ppa' ]
- name: Remove the Ubuntu PHP PPA
apt_repository: repo={{ php_ppa }} state=absent update_cache=yes
when: not php_from_ppa
tags: [ 'php', 'php_ppa' ]
- name: Install the php-fpm package - name: Install the php-fpm package
apt: pkg={{ item }} state=present apt: pkg={{ item }} state=present update_cache=yes cache_valid_time=3600
with_items: '{{ php_fpm_packages }}' with_items: '{{ php_fpm_packages }}'
tags: php tags: php