Skip to content

Commit

Permalink
NGX-753: Update (#25)
Browse files Browse the repository at this point in the history
* NGX-753: Update
  • Loading branch information
combssm authored Aug 21, 2023
1 parent 081ebef commit fb9b9ee
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 55 deletions.
16 changes: 7 additions & 9 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
name: Ansible Molecule Pipeline

on:
on: # yamllint disable-line rule:truthy
push:
branches: [master]
pull_request:
branches: [master]
workflow_dispatch:
branches: [master]

env:
PY_COLORS: '1'
Expand All @@ -30,13 +28,13 @@ jobs:
- image: geerlingguy/docker-rockylinux8-ansible:latest
- image: geerlingguy/docker-rockylinux9-ansible:latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: "3.x"

- name: Install test dependencies
run: pip3 install ansible molecule molecule-docker
run: pip install -r requirements.txt

- name: Run Molecule Test
run: molecule test
Expand All @@ -54,13 +52,13 @@ jobs:
- image: geerlingguy/docker-centos7-ansible:latest
command: /usr/lib/systemd/systemd
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: "3.x"

- name: Install test dependencies
run: pip3 install ansible molecule molecule-docker
run: pip install -r requirements.txt

- name: Run Molecule Test
run: molecule test
Expand Down
33 changes: 0 additions & 33 deletions .yamllint

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ server-focused Linux distributions and aims to follow their deprecation
policies. Additionally we will focus on supporting the latest two stable
releases of each, which at the time of writing are as follows:

* CentOS 7.x or later
* CentOS 7.x
* Debian 10 or later
* Ubuntu 20.04 LTS or later
* AlmaLinux 8.x or later
Expand Down
2 changes: 1 addition & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ galaxy_info:
description: Modular Ansible Role for deploying and configuring PHP-FPM
company: InMotion Hosting
license: GPLv3
min_ansible_version: "2.9"
min_ansible_version: "2.13"

platforms:
- name: EL
Expand Down
4 changes: 2 additions & 2 deletions tasks/facts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
- php_conf_soap_wsdl_cache_dir
- php_fpm_config_pool_path
- php_fpm_socket_path
- php_fpm_site_errorlog
- php_fpm_site_errorlog
- php_fpm_slowlog
php_required_ints:
- php_ini_rlimit_files
Expand Down Expand Up @@ -122,7 +122,7 @@
- name: Set PHP switcher
ansible.builtin.set_fact:
php_version_switch: true
when:
when:
- php_version_installed is defined
- php_version != php_version_installed

Expand Down
8 changes: 0 additions & 8 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,6 @@
name: "{{ php_packages }}"
state: present

- name: Ensure directories exist
ansible.builtin.file:
path: /var/run/php
state: directory
owner: root
group: root
mode: "0750"

- name: Ensure PHP session directory permissions
ansible.builtin.file:
path: /var/lib/php/session
Expand Down
2 changes: 1 addition & 1 deletion templates/etc/httpd/conf.d/php.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
AddType text/html .php
DirectoryIndex index.php

<Files ".user.ini">
<Files "php.ini">
<IfModule mod_authz_core.c>
Require all denied
</IfModule>
Expand Down

0 comments on commit fb9b9ee

Please sign in to comment.