From ece5c30931e3cc5488853044eb6aec2dcd151cb9 Mon Sep 17 00:00:00 2001 From: Thomas Constans Date: Mon, 3 Apr 2023 13:33:59 +0200 Subject: [PATCH] up version include phpmyadmin WIP --- README.md | 6 ++++-- defaults/main.yml | 3 ++- tasks/main.yml | 5 ++++- tasks/php-fpm.yml | 11 +++++++++-- tasks/phpmyadmin.yml | 12 ++++++++++++ templates/www.conf | 3 +++ 6 files changed, 34 insertions(+), 6 deletions(-) create mode 100644 tasks/phpmyadmin.yml diff --git a/README.md b/README.md index 0e3807a..0a8ac93 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,7 @@ None Role Variables -------------- php_poolname: default www (version will be appended) -php_version: default 74 -php_fpm_listen_url: no default +php_version: default 81 php_fpm_pool_user: default apache php_fpm_pool_group: default apache php_fpm_listen_url: default 127.0.0.1:90{{ php_version }} @@ -26,6 +25,9 @@ php_min_spare_servers: 5 php_max_spare_servers: 35 php_pm_status_url: /phpstatus php_packages: [ 'php{{ php_version }}-php-common' ] +php_use_phpmyadmin: default false +pma_install_dir: /var/www/html +pma_version: 5.2.1 Dependencies ------------ diff --git a/defaults/main.yml b/defaults/main.yml index a569a4b..ae5d4d6 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,7 +1,7 @@ --- # defaults file for php-fpm php_poolname: www -php_version: 80 +php_version: 81 php_fpm_pool_user: apache php_fpm_pool_group: apache php_fpm_listen_url: 127.0.0.1:90{{ php_version }} @@ -12,4 +12,5 @@ php_pm_status_url: /phpstatus php_packages: [ 'php{{ php_version }}-php-common' ] php_min_spare_servers: 5 php_max_spare_servers: 35 +php_use_phpmyadmin: false diff --git a/tasks/main.yml b/tasks/main.yml index ccc7589..bfbaf9c 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,4 +1,7 @@ --- # tasks file for php-fpm - import_tasks: php-fpm.yml - tags: php \ No newline at end of file + tags: php +- import_tasks: phpmyadmin.yml + tags: phpmyadmin + when: php_use_phpmyadmin \ No newline at end of file diff --git a/tasks/php-fpm.yml b/tasks/php-fpm.yml index 052b873..20db8fb 100644 --- a/tasks/php-fpm.yml +++ b/tasks/php-fpm.yml @@ -1,16 +1,23 @@ --- # tasks file for php-fpm # +# + +- ansible.builtin.yum_repository: + name: remi + description: Remi Repo + mirrorlist: http://cdn.remirepo.net/enterprise/{{ ansible_distribution_major_version }}/safe/$basearch/mirror + state: present + - name: rpm key rpm_key: state: present - key: https://rpms.remirepo.net/RPM-GPG-KEY-remi2018 + key: https://rpms.remirepo.net/RPM-GPG-KEY-remi2022 - name: install repository definitions package: name: - epel-release - - https://rpms.remirepo.net/enterprise/remi-release-{{ ansible_distribution_major_version }}.rpm - yum-utils state: present diff --git a/tasks/phpmyadmin.yml b/tasks/phpmyadmin.yml new file mode 100644 index 0000000..55f1ba0 --- /dev/null +++ b/tasks/phpmyadmin.yml @@ -0,0 +1,12 @@ +--- +- name: "[pma] - get archive" + unarchive: + remote_src: yes + src: https://files.phpmyadmin.net/phpMyAdmin/{{ pma_version }}/phpMyAdmin-{{ pma_version }}-all-languages.zip + dest: "{{ pma_install_dir }}" + +- name: "[pma] - apache config" + template: + src: apache_pma.conf + dest: "{{ apache_config_dir }}/phpmyadmin.conf" + notify: restart apache diff --git a/templates/www.conf b/templates/www.conf index 68db55e..5dcec68 100644 --- a/templates/www.conf +++ b/templates/www.conf @@ -3,6 +3,9 @@ user = {{ php_fpm_pool_user }} group = {{ php_fpm_pool_group }} listen = {{ php_fpm_listen_url }} listen.backlog = 511 +listen.mode = 0660 +listen.owner = {{ php_fpm_pool_user }} +listen.group = {{ php_fpm_pool_group }} pm = {{ php_pm }} pm.max_children = {{ php_pm_max_children }} pm.start_servers = 5