From efcd2ed3918547b676dc776930fd5edea619be13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lecour?= Date: Sun, 9 Sep 2018 22:59:56 +0200 Subject: [PATCH] packweb-apache: don't regenerate phpMyAdmin suffix each time --- CHANGELOG.md | 1 + packweb-apache/defaults/main.yml | 1 + packweb-apache/tasks/phpmyadmin.yml | 34 ++++++++++++++++++++++++----- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a016943..7c038372 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ The **patch** part changes incrementally at each release. ### Changed ### Fixed +* packweb-apache: don't regenerate phpMyAdmin suffix each time ### Security diff --git a/packweb-apache/defaults/main.yml b/packweb-apache/defaults/main.yml index 7f79e90d..fa7a701a 100644 --- a/packweb-apache/defaults/main.yml +++ b/packweb-apache/defaults/main.yml @@ -8,5 +8,6 @@ packweb_apache_modphp: True packweb_apache_fpm: False packweb_phpmyadmin_suffix: "" +packweb_phpmyadmin_suffix_file: "/etc/evolinux/phpmyadmin_suffix" packweb_mysql_variant: "debian" diff --git a/packweb-apache/tasks/phpmyadmin.yml b/packweb-apache/tasks/phpmyadmin.yml index dfa779c1..eac50843 100644 --- a/packweb-apache/tasks/phpmyadmin.yml +++ b/packweb-apache/tasks/phpmyadmin.yml @@ -23,16 +23,40 @@ changed_when: "'Disabling' in command_result.stderr" when: pma_default_config.stat.exists +- name: "phpmyadmin suffix dirname '{{ packweb_phpmyadmin_suffix_file | dirname }}' exists" + file: + dest: "{{ packweb_phpmyadmin_suffix_file | dirname }}" + mode: "0700" + owner: root + group: root + state: directory + +- name: set phpmyadmin suffix if provided + copy: + dest: "{{ packweb_phpmyadmin_suffix_file }}" + # The last character "\u000A" is a line feed (LF), it's better to keep it + content: "{{ packweb_phpmyadmin_suffix }}\u000A" + force: yes + when: packweb_phpmyadmin_suffix != "" + - name: generate random string for phpmyadmin suffix - command: "apg -a 1 -M N -n 1" + shell: "apg -a 1 -M N -n 1 > {{ packweb_phpmyadmin_suffix_file }}" + args: + creates: "{{ packweb_phpmyadmin_suffix_file }}" + +- name: read phpmyadmin suffix + command: "tail -n 1 {{ packweb_phpmyadmin_suffix_file }}" changed_when: False - check_mode: False - register: _random_phpmyadmin_suffix + check_mode: no + register: new_packweb_phpmyadmin_suffix - name: overwrite packweb_phpmyadmin_suffix set_fact: - packweb_phpmyadmin_suffix: "{{ _random_phpmyadmin_suffix.stdout }}" - when: packweb_phpmyadmin_suffix == "" + packweb_phpmyadmin_suffix: "{{ new_packweb_phpmyadmin_suffix.stdout }}" + +- debug: + var: packweb_phpmyadmin_suffix + verbosity: 1 - name: enable phpMyAdmin config blockinfile: