From e418a60763772d961112b798d2d01266f7c77c70 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sun, 9 Jul 2017 18:29:54 +0300
Subject: [PATCH] - Forked from mod-php.
---
.travis.yml | 6 ++++--
README.rst | 10 +++++-----
defaults/main.yml | 2 +-
handlers/main.yml | 2 +-
meta/main.yml | 10 +++++-----
tasks/main.yml | 6 +++---
tests/playbook.yml | 2 +-
tests/{test_mod-php.py => test_mod-php7.py} | 2 +-
tox.ini | 2 +-
vars/main.yml | 2 +-
10 files changed, 23 insertions(+), 21 deletions(-)
rename tests/{test_mod-php.py => test_mod-php7.py} (77%)
diff --git a/.travis.yml b/.travis.yml
index e74e1ea..aaaaa78 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,8 @@ env:
- VBOX_MEMORY=2048
- VBOX_HWVIRTEX=off
matrix:
- - TOXENV=trusty
- - &jessie TOXENV=jessie
+ - TOXENV=xenial
+ - &stretch TOXENV=stretch
cache:
- pip
@@ -34,6 +34,8 @@ notifications:
matrix:
fast_finish: True
+ allow_failures:
+ - env: *stretch
include:
- env:
TOXENV: pre-commit
diff --git a/README.rst b/README.rst
index f68da9f..09fca37 100644
--- a/README.rst
+++ b/README.rst
@@ -1,10 +1,10 @@
-mod-php
-#######
+mod-php7
+########
-.. image:: https://travis-ci.org/adarnimrod/mod-php.svg?branch=master
- :target: https://travis-ci.org/adarnimrod/mod-php
+.. image:: https://travis-ci.org/adarnimrod/mod-php7.svg?branch=master
+ :target: https://travis-ci.org/adarnimrod/mod-php7
-Provision PHP application server using Apache with mod-php.
+Provision PHP7 application server using Apache with mod-php7.
Requirements
------------
diff --git a/defaults/main.yml b/defaults/main.yml
index 75e091e..371acf8 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,2 +1,2 @@
---
-# defaults file for mod-php
+# defaults file for mod-php7
diff --git a/handlers/main.yml b/handlers/main.yml
index 9e3c0a1..61a3473 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,2 +1,2 @@
---
-# handlers file for mod-php
+# handlers file for mod-php7
diff --git a/meta/main.yml b/meta/main.yml
index cd5fba2..13dc220 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,19 +1,19 @@
galaxy_info:
author: Nimrod Adar
- description: Provision PHP application server using Apache with mod-php
+ description: Provision PHP7 application server using Apache with mod-php7
company: Shore technologies
license: MIT
min_ansible_version: 2.3
platforms:
- name: Ubuntu
versions:
- - trusty
+ - xenial
- name: Debian
versions:
- - jessie
+ - stretch
galaxy_tags: [ PHP ]
dependencies:
- - name: php5
- src: adarnimrod.php5
+ - name: php7
+ src: adarnimrod.php7
- name: apache
src: adarnimrod.apache
diff --git a/tasks/main.yml b/tasks/main.yml
index 9045e07..fad2ea8 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,5 +1,5 @@
---
-# tasks file for mod-php
+# tasks file for mod-php7
- name: Assertions
assert:
that:
@@ -7,14 +7,14 @@
- name: APT install
apt:
- name: libapache2-mod-php5
+ name: libapache2-mod-php7.0
state: present
update_cache: yes
cache_valid_time: 3600
- name: Enable PHP module
apache2_module:
- name: php5
+ name: php7.0
state: present
notify:
- Restart Apache
diff --git a/tests/playbook.yml b/tests/playbook.yml
index 9fe1fc8..00adc5f 100644
--- a/tests/playbook.yml
+++ b/tests/playbook.yml
@@ -19,7 +19,7 @@
- hosts: all
strategy: free
- roles: [mod-php]
+ roles: [mod-php7]
post_tasks:
- name: Install cURL
package:
diff --git a/tests/test_mod-php.py b/tests/test_mod-php7.py
similarity index 77%
rename from tests/test_mod-php.py
rename to tests/test_mod-php7.py
index a53134c..c9cf3a9 100644
--- a/tests/test_mod-php.py
+++ b/tests/test_mod-php7.py
@@ -9,4 +9,4 @@ def test_mod_php(Command, Sudo):
def test_phpinfo(Command):
- 'PHP Version 5' in Command('curl http://localhost/phpinfo.php').stdout
+ 'PHP Version 7.0' in Command('curl http://localhost/phpinfo.php').stdout
diff --git a/tox.ini b/tox.ini
index e7f5cc2..5573458 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
[tox]
skip_install = True
skipsdist = True
-envlist = trusty,jessie
+envlist = xenial,stretch
[testenv]
envdir = {toxinidir}/.tox/molecule
diff --git a/vars/main.yml b/vars/main.yml
index 41a1245..a8676da 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,2 +1,2 @@
---
-# vars file for mod-php
+# vars file for mod-php7
--
GitLab