From be4e811c477891e861870c34c52b0d85ecd45eff Mon Sep 17 00:00:00 2001 From: Gregory Colpart Date: Thu, 7 Sep 2017 01:16:45 +0200 Subject: [PATCH] phpMyAdmin configuration --- apache/defaults/main.yml | 2 - apache/tasks/main.yml | 5 --- apache/tasks/phpmyadmin.yml | 32 --------------- apache/templates/evolinux-default.conf.j2 | 10 +---- .../templates/default_www/index.html.j2 | 14 +++---- packweb-apache/defaults/main.yml | 2 + packweb-apache/tasks/phpmyadmin.yml | 39 ++++++++++++++++++- 7 files changed, 48 insertions(+), 56 deletions(-) delete mode 100644 apache/tasks/phpmyadmin.yml diff --git a/apache/defaults/main.yml b/apache/defaults/main.yml index 6b28d670..276f5a38 100644 --- a/apache/defaults/main.yml +++ b/apache/defaults/main.yml @@ -9,8 +9,6 @@ apache_evolinux_default_enabled: True apache_evolinux_default_ssl_cert: /etc/ssl/certs/ssl-cert-snakeoil.pem apache_evolinux_default_ssl_key: /etc/ssl/private/ssl-cert-snakeoil.key -apache_phpmyadmin_set: False -apache_phpmyadmin_suffix: "" apache_serverstatus_suffix: "" apache_log2mail_include: True diff --git a/apache/tasks/main.yml b/apache/tasks/main.yml index c9d60dc5..9cd52ae6 100644 --- a/apache/tasks/main.yml +++ b/apache/tasks/main.yml @@ -134,11 +134,6 @@ check_mode: no tags: - apache - when: apache_phpmyadmin_set - -- include: phpmyadmin.yml - when: apache_phpmyadmin_set and _default_index.stat.exists - # - block: # - name: generate random string for serverstatus suffix diff --git a/apache/tasks/phpmyadmin.yml b/apache/tasks/phpmyadmin.yml deleted file mode 100644 index a8b24e05..00000000 --- a/apache/tasks/phpmyadmin.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- - -- block: - - name: packages are installed - apt: - name: '{{ item }}' - state: present - with_items: - - phpmyadmin - - apg - - - name: generate random string for phpmyadmin suffix - command: "apg -a 1 -M N -n 1" - changed_when: False - register: _random_phpmyadmin_suffix - - - name: overwrite apache_phpmyadmin_suffix - set_fact: - apache_phpmyadmin_suffix: "{{ _random_phpmyadmin_suffix.stdout }}" - when: apache_phpmyadmin_suffix == "" - tags: - - apache - - phpmyadmin - -- name: replace phpmyadmin suffix in default site index - replace: - dest: /var/www/index.html - regexp: '__PHPMYADMIN_SUFFIX__' - replace: "{{ apache_phpmyadmin_suffix }}" - tags: - - apache - - phpmyadmin diff --git a/apache/templates/evolinux-default.conf.j2 b/apache/templates/evolinux-default.conf.j2 index ec860f7e..5136eb33 100644 --- a/apache/templates/evolinux-default.conf.j2 +++ b/apache/templates/evolinux-default.conf.j2 @@ -106,14 +106,8 @@ Include /etc/apache2/ipaddr_whitelist.conf - # phpMyAdmin - #Alias /phpmyadmin /var/www - #Alias /pma-42 /usr/share/phpmyadmin/ - #Include /etc/phpmyadmin/apache.conf - # - # Require all denied - # Include /etc/apache2/ipaddr_whitelist.conf - # +# BEGIN phpMyAdmin section +# END phpMyAdmin section CustomLog /var/log/apache2/access.log vhost_combined ErrorLog /var/log/apache2/error.log diff --git a/evolinux-base/templates/default_www/index.html.j2 b/evolinux-base/templates/default_www/index.html.j2 index f37691ca..981732ee 100644 --- a/evolinux-base/templates/default_www/index.html.j2 +++ b/evolinux-base/templates/default_www/index.html.j2 @@ -58,14 +58,12 @@

diff --git a/packweb-apache/defaults/main.yml b/packweb-apache/defaults/main.yml index 6a2da764..8282d081 100644 --- a/packweb-apache/defaults/main.yml +++ b/packweb-apache/defaults/main.yml @@ -6,3 +6,5 @@ packweb_enable_evoadmin_vhost: True packweb_fhs_retrictions: True packweb_apache_modphp: True packweb_apache_fpm: False + +packweb_phpmyadmin_suffix: "" diff --git a/packweb-apache/tasks/phpmyadmin.yml b/packweb-apache/tasks/phpmyadmin.yml index c955270e..ec70bdeb 100644 --- a/packweb-apache/tasks/phpmyadmin.yml +++ b/packweb-apache/tasks/phpmyadmin.yml @@ -2,8 +2,11 @@ - name: Install phpmyadmin apt: - name: phpmyadmin + name: '{{ item }}' state: present + with_items: + - phpmyadmin + - apg - name: Check if phpmyadmin default configuration is present stat: @@ -20,3 +23,37 @@ changed_when: "'Disabling' in command_result.stderr" when: pma_default_config.stat.exists +- name: generate random string for phpmyadmin suffix + command: "apg -a 1 -M N -n 1" + changed_when: False + register: _random_phpmyadmin_suffix + +- name: overwrite packweb_phpmyadmin_suffix + set_fact: + packweb_phpmyadmin_suffix: "{{ _random_phpmyadmin_suffix.stdout }}" + when: packweb_phpmyadmin_suffix == "" + +- name: enable phpMyAdmin config + blockinfile: + dest: /etc/apache2/sites-available/000-evolinux-default.conf + marker: "# {mark} phpMyAdmin section" + block: | + Alias /phpmyadmin /var/www + Alias /phpmyadmin-{{ packweb_phpmyadmin_suffix }} /usr/share/phpmyadmin/ + Include /etc/phpmyadmin/apache.conf + + Require all denied + Include /etc/apache2/ipaddr_whitelist.conf + + +- name: enable phpmyadmin link in default site index + lineinfile: + dest: /var/www/index.html + line: '

  • Accès PhpMyAdmin
    • ' + regexp: "__PHPMYADMIN_SUFFIX__" + +- name: replace phpmyadmin suffix in default site index + replace: + dest: /var/www/index.html + regexp: '__PHPMYADMIN_SUFFIX__' + replace: "{{ packweb_phpmyadmin_suffix }}"