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