Merge pull request #15 from clouddrove/CD-305

Cd 305

.cache/roles/ansible_role_php

@@ -0,0 +1 @@
+../..

.cache/roles/role-php

@@ -0,0 +1 @@
+../..

.github/workflows/galaxy.yml

@@ -0,0 +1,16 @@
+---
+name: Release to Ansible Galaxy
+
+'on':
+  push:
+    tags:
+      - '*'
+
+jobs:
+  release:
+    runs-on: ubuntu-18.04
+    steps:
+      - name: galaxy
+        uses: robertdebock/[email protected]
+        with:
+          galaxy_api_key: ${{ secrets.galaxy_api_key }}

.github/workflows/lint.yml

@@ -8,10 +8,9 @@ name: Lint
 
 jobs:
 
-  test:
-    name: Lint
+  yamllint:
+    name: yamllint
     runs-on: ubuntu-latest
-
     steps:
       - name: Check out the codebase.
         uses: actions/checkout@v2
@@ -21,21 +20,54 @@ jobs:
         with:
           python-version: '3.x'
 
-      - name: Install test dependencies.
-        run: pip3 install yamllint ansible-lint
+      - name: Install yamllist
+        run: pip3 install yamllint
 
       - name: Run yamllint.
         run: yamllint .
 
+  ansible-lint:
+    name: ansible-lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the codebase.
+        uses: actions/checkout@v2
+
+      - name: Set up Python 3.7.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install ansible and other packages
+        run: pip3 install ansible ansible-lint
+
       - name: Run ansible-lint.
         run: ansible-lint
+
+  pre-commit:
+    name: 'Pre-Commit'
+    needs:
+      - yamllint
+      - ansible-lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout'
+        uses: actions/[email protected]
+
+      - name: Install ansible-lint
+        run: pip3 install ansible-lint
+
+      - name: 'Pre-Commit 🔎'
+        uses: pre-commit/[email protected]
+        continue-on-error: true
+
       - name: 'Slack Notification'
         uses: clouddrove/action-slack@v2
         with:
           status: ${{ job.status }}
           fields: repo,author
-          author_name: 'Clouddrove'
+          author_name: 'CloudDrove Inc.'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_ANSIBLE }}
         if: always()

.github/workflows/readme.yml

@@ -0,0 +1,57 @@
+---
+name: 'Create README.md file'
+'on':
+  push:
+    branches:
+      - master
+
+jobs:
+  readme-create:
+    name: 'Autogenerate Readme file'
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout'
+        uses: actions/checkout@master
+
+      - name: Set up Python 3.7.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: 'Generate readme.md from readme.yaml'
+        uses: 'clouddrove/[email protected]'
+        with:
+          actions_subcommand: 'readme'
+          github_token: '${{ secrets.GITHUB }}'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Install ansible-lint
+        run: pip3 install ansible-lint
+
+      - name: pre-commit check errors
+        uses: pre-commit/[email protected]
+        continue-on-error: true
+
+      - name: pre-commit fix errors
+        uses: pre-commit/[email protected]
+        continue-on-error: true
+
+      - name: 'push readme'
+        uses: 'clouddrove/[email protected]'
+        continue-on-error: true
+        with:
+          actions_subcommand: 'push'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: 'Slack Notification'
+        uses: clouddrove/action-slack@v2
+        with:
+          status: ${{ job.status }}
+          fields: repo,author
+          author_name: 'CloudDrove Inc.'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_ANSIBLE }}
+        if: always()

.pre-commit-config.yaml

@@ -2,7 +2,7 @@
 repos:
 
   - repo: https://github.com/pre-commit/pre-commit-hooks.git
-    rev: v2.2.3
+    rev: v3.4.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
@@ -15,7 +15,7 @@ repos:
       - id: check-added-large-files
 
   - repo: https://github.com/ansible/ansible-lint.git
-    rev: v4.1.0
+    rev: v5.0.8
     hooks:
       - id: ansible-lint
         files: \.(yaml|yml)$

.yamllint

@@ -3,7 +3,7 @@ extends: default
 
 rules:
   line-length:
-    max: 120
+    max: 153
     level: warning
   truthy:
     allowed-values: ['true', 'false', 'yes', 'no']

README.md

@@ -107,11 +107,6 @@ Followiing things includes in this role:
   $ ansible-galaxy install clouddrove.ansible_role_php
 ```
 
-
-
-
-
-
 ## Feedback
 If you come accross a bug or have any feedback, please log it in our [issue tracker](https://github.com/clouddrove/ansible-role-php/issues), or feel free to drop us an email at [[email protected]](mailto:[email protected]).
 

defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 # php versions supported versions 7.0>
-php_version: 7.3
+php_version: 7.4
 
 # configurations
 php_dir: "/etc/php/{{ php_version }}"

handlers/main.yml

@@ -11,7 +11,6 @@
     state: reloaded
   when: state == "present"
 
-
 - name: restart php-fpm
   service:
     name: "php{{ php_version }}-fpm"

meta/main.yml

@@ -6,6 +6,7 @@ galaxy_info:
   author: Anmol Nagpal
   description: This ansible role for install php.
   company: "CloudDrove Inc."
+  role_name: ansible_role_php
   license: "license (BSD, MIT)"
   min_ansible_version: 2.4
   platforms:

tasks/configure.yml

@@ -22,6 +22,7 @@
     src: "{{ item }}"
     dest: "{{ php_fpm_dir }}/pool.d/{{ item | basename }}"
     force: true
+    mode: 0644
   with_fileglob:
     - ../templates/config/pool.d/*.conf
 
@@ -30,6 +31,7 @@
     src: "{{ item }}"
     dest: "{{ php_dir }}/mods-available/{{ item | basename }}"
     force: true
+    mode: 0644
   with_fileglob:
     - ../templates/config/mods-available/*.ini
 
@@ -38,12 +40,14 @@
     src: config/php.ini
     dest: "{{ php_fpm_dir }}/php.ini"
     force: true
+    mode: 0644
 
 - name: copy pecl extensions .ini files
   template:
     src: "{{ item }}"
     dest: "{{ php_dir }}/mods-available/{{ item | basename }}"
     force: true
+    mode: 0644
   with_fileglob:
     - ../templates/config/mods-available/*.ini
 
@@ -52,6 +56,7 @@
     src: config/php.ini
     dest: "{{ php_dir }}/apache2/php.ini"
     force: true
+    mode: 0644
   when: is_web_server_is_apache
   notify:
     - restart apache2

tasks/install.yml

@@ -32,7 +32,6 @@
       'php{{ php_version }}-xml',
       'php{{ php_version }}-zip',
       'php{{ php_version }}-dev',
-      'php{{ php_version }}-mongodb',
       'php{{ php_version }}-sqlite3',
       'pkg-config',
       'libssl-dev',
@@ -61,14 +60,3 @@
   command: pecl update-channels
   become: true
   when: state == "present"
-
-- name: enable pecl extensions
-  pear:
-    name: "pecl/{{ item }}"
-    state: "{{ state }}"
-  ignore_errors: true
-  with_items:
-    - mongodb
-    - apcu
-    - mcrypt-1.0.2
-    - redis