diff --git a/meta/main.yml b/meta/main.yml index 90e3f6214cac89c67ee471d5e601b06034b36162..0ac44d8308315a7415243f553bdda246cdd05a7c 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -6,4 +6,5 @@ galaxy_info: license: license (GPLv2, CC-BY, etc) #platforms: #categories: -dependencies: [] +dependencies: +- apache diff --git a/tasks/phpldapadmin.yml b/tasks/phpldapadmin.yml index b2ed81b85df336cb5c9de45973c6018908d70009..a2d4c682bce48a1a080e260c756a779e6779cb3e 100644 --- a/tasks/phpldapadmin.yml +++ b/tasks/phpldapadmin.yml @@ -19,20 +19,6 @@ when: phpldapadmin_debconf.changed command: /usr/sbin/dpkg-reconfigure --frontend noninteractive slapd -- name: Enable mod-ssl in Apache - apache2_module: - name: ssl - state: present - notify: - - Restart Apache - -- name: Disable default Apache site - file: - path: /etc/apache2/sites-enabled/000-default.conf - state: absent - notify: - - Restart Apache - - name: Add phpLDAPadmin Apache site template: src: phpmyadmin.conf.j2 @@ -41,10 +27,4 @@ group: root mode: '0644' notify: - - Restart Apache - -- name: Allow HTTPS port - ufw: - rule: allow - port: https - proto: tcp + - Reload Apache diff --git a/templates/phpmyadmin.conf.j2 b/templates/phpmyadmin.conf.j2 index 9c9ce9acf342d2a372b2965096f17b151065f731..621ae7c7998451f3b30c1835e92e1996d772d484 100644 --- a/templates/phpmyadmin.conf.j2 +++ b/templates/phpmyadmin.conf.j2 @@ -1,13 +1,4 @@ {# Apache virtualhost template for phpLDAPadmin #} <VirtualHost _default_:443> DocumentRoot /usr/share/phpldapadmin - SSLEngine on - SSLCertificateFile {{ openldap_tls_cert }} - SSLCertificateKeyFile {{ openldap_tls_key }} - SSLProtocol all -SSLv2 -SSLv3 - SSLCipherSuite !kRSA:!3DES:!RC4:!DES:!MD5:!aNULL:!NULL:AESGCM+ECDH:AES256+ECDH:AES128:+SHA1; - SSLHonorCipherOrder on - SSLCompression off - ErrorLog ${APACHE_LOG_DIR}/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined </virtualHost>