Reorganization.

3 files changed, 0 insertions, 108 deletions

diff --git a/roles/common/tasks/ldap.yml b/roles/common/tasks/ldap.yml
deleted file mode 100644
index cb1e835..0000000
--- a/roles/common/tasks/ldap.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-- name: Install OpenLDAP
-  apt: pkg={{ item }}
-  with_items:
-    - slapd
-    - ldap-utils
-    - ldapvi
-    - db-util
-    - python-ldap
-
-# Upon install slapd create and populate a database under /var/lib/ldap.
-# We clear it up and create a children directory to get finer-grain
-# control.
-- name: Clear empty /var/lib/ldap
-  # Don't remove the database (and fail) if it contains something else
-  # than its suffix or cn=admin,...
-  openldap: dbdirectory=/var/lib/ldap ignoredn=cn=admin
-            state=absent
-
-- name: Create directory /var/lib/ldap/fripost
-  file: path=/var/lib/ldap/fripost
-        owner=openldap group=openldap
-        state=directory
-        mode=0700
-
-- name: Copy /var/lib/ldap/fripost/DB_CONFIG
-  copy: src=var/lib/ldap/fripost/DB_CONFIG
-        dest=/var/lib/ldap/fripost/DB_CONFIG
-        owner=openldap group=openldap
-        mode=0600
-  notify:
-    # Not sure if required
-    - Restart slapd
-
-- name: Create directory /etc/ldap/fripost
-  file: path=/etc/ldap/fripost
-        owner=root group=root
-        state=directory
-        mode=0755
-
-- name: Copy fripost database definition
-  template: src=etc/ldap/database.ldif.j2
-            dest=/etc/ldap/fripost/database.ldif
-            owner=root group=root
-            mode=0600
-
-- name: Copy fripost schema
-  copy: src=etc/ldap/schema/fripost.ldif
-        dest=/etc/ldap/schema/fripost.ldif
-        owner=root group=root
-        mode=0644
-
-- name: Load fripost's schema and configure the database
-  openldap: target=/etc/ldap/{{ item }} state=present
-  with_items:
-    - schema/fripost.ldif
-    # TODO load other required schemas *before* loading the database
-    - fripost/database.ldif
-
-- name: Load LDAP modules
-  openldap: module={{ item }}.la state=present
-  with_items:
-    # TODO only if provider
-    - syncprov
-    # TODO only if writable
-    - constraint
-
-# TODO: authz constraint syncprov syncrepl
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index ed84cb5..355b2df 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -9,15 +9,3 @@
 - include: ipsec.yml    tags=strongswan,ipsec
 - include: logging.yml  tags=logging
 - include: mail.yml     tags=mail,postfix
-- include: sql.yml      tags=mysql,sql
-  # XXX: the conditional here is a bit dirty, because it clutters the
-  # output with 'skipping' notices.
-  when: "'MDA'     in group_names or
-         'webmail' in group_names or
-         'backup'  in group_names"
-- include: ldap.yml     tags=slapd,ldap
-  when: "'MDA'           in group_names or
-         'MSA'           in group_names or
-         'lists'         in group_names or
-         'LDAP-producer' in group_names or
-         'MX'            in group_names"
diff --git a/roles/common/tasks/sql.yml b/roles/common/tasks/sql.yml
deleted file mode 100644
index e32c863..0000000
--- a/roles/common/tasks/sql.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-- name: Install MySQL
-  apt: pkg={{ item }}
-  with_items:
-    # XXX: In non-interactive mode apt-get doesn't put a password on
-    # MySQL's root user; we fix that on the next task, but an intruder
-    # could exploit the race condition and for instance create dummy
-    # users.
-    - mysql-common
-    - mysql-server
-    - python-mysqldb
-
-- name: Force root to use UNIX permissions
-  mysql_user: name=root auth_plugin=auth_socket
-              state=present
-
-- name: Disallow anonymous and TCP/IP root login
-  mysql_user: name={{ item.name|default('') }} host={{ item.host }}
-              state=absent
-  with_items:
-    - {             host: '{{ inventory_hostname_short }}' }
-    - {             host: 'localhost' }
-    - {             host: '127.0.0.1'}
-    - {             host: '::1'}
-    - { name: root, host: '{{ inventory_hostname_short }}' }
-    - { name: root, host: '127.0.0.1'}
-    - { name: root, host: '::1'}
-
-- name: Start MySQL
-  service: name=mysql state=started