phpMyAdmin configuration

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

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

apache/tasks/phpmyadmin.yml

@@ -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

apache/templates/evolinux-default.conf.j2

@@ -106,14 +106,8 @@
             Include /etc/apache2/ipaddr_whitelist.conf
         </Directory>
 
-        # phpMyAdmin
+# BEGIN phpMyAdmin section
-        #Alias /phpmyadmin /var/www
+# END phpMyAdmin section
-        #Alias /pma-42 /usr/share/phpmyadmin/
-        #Include /etc/phpmyadmin/apache.conf
-        #<Directory /usr/share/phpmyadmin/>
-        #    Require all denied
-        #    Include /etc/apache2/ipaddr_whitelist.conf
-        #</Directory>
 
         CustomLog /var/log/apache2/access.log vhost_combined
         ErrorLog /var/log/apache2/error.log

evolinux-base/templates/default_www/index.html.j2

@@ -58,14 +58,12 @@
 
         <ul id="evolinks">
             <li><a href="/munin/{{ ansible_domain }}/{{ ansible_fqdn }}/">Stats système</a></li>
-            <li><a href="/server-status">Server Status</a></li>
+            <!-- <li><a href="/server-status">Server Status</a></li> -->
-            <!--
+            <!-- <li><a href="/phpmyadmin-__PHPMYADMIN_SUFFIX__/">Accès PhpMyAdmin</a></li> -->
-            <li><a href="/phpmyadmin-__PHPMYADMIN_SUFFIX__/">Accès PhpMyAdmin</a></li>
+            <!-- <li><a href="/mysqlreport.html">Dernier rapport MySQL Tuner</a></li> -->
-            <li><a href="/mysqlreport.html">Dernier rapport MySQL Tuner</a></li>
+            <!-- <li><a href="/cgi-bin/awstats.pl">Stats web</a></li> -->
-            <li><a href="/cgi-bin/awstats.pl">Stats web</a></li>
+            <!-- <li><a href="/info.php">Infos PHP</a></li> -->
-            <li><a href="/info.php">Infos PHP</a></li>
+            <!-- <li><a href="/opcache.php">Infos OpCache PHP</a></li> -->
-            <li><a href="/opcache.php">Infos OpCache PHP</a></li>
-            -->
         </ul>
 
         <p class="footer">

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: ""

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
+      <Directory /usr/share/phpmyadmin/>
+          Require all denied
+          Include /etc/apache2/ipaddr_whitelist.conf
+      </Directory>
+
+- name: enable phpmyadmin link in default site index
+  lineinfile:
+    dest: /var/www/index.html
+    line: '            <li><a href="/phpmyadmin-__PHPMYADMIN_SUFFIX__/">Accès PhpMyAdmin</a></li>'
+    regexp: "__PHPMYADMIN_SUFFIX__" 
+
+- name: replace phpmyadmin suffix in default site index
+  replace:
+    dest: /var/www/index.html
+    regexp: '__PHPMYADMIN_SUFFIX__'
+    replace: "{{ packweb_phpmyadmin_suffix }}"