From f2dc55cd77aae4e6e9c4258a64547a16a90ea579 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Mon, 2 Dec 2013 17:29:36 +0100
Subject: oops

---
 main.yml                | 75 -------------------------------------------------
 roles/mx/tasks/main.yml | 75 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 75 deletions(-)
 delete mode 100644 main.yml
 create mode 100644 roles/mx/tasks/main.yml

diff --git a/main.yml b/main.yml
deleted file mode 100644
index bd04feb..0000000
--- a/main.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-- name: Install Postfix & Postgrey
-  apt: pkg={{ item }}
-  with_items:
-    - postfix
-    - postfix-pcre
-    - postfix-ldap
-    - postgrey
-    - libnet-ldap-perl
-    - libauthen-sasl-perl
-
-- name: Configure Postgrey
-  lineinfile: dest=/etc/default/postgrey
-              regexp='^POSTGREY_OPTS='
-              line='POSTGREY_OPTS="--privacy --unix=/var/spool/postfix-{{ postfix_instance[inst].name }}/private/postgrey"'
-              owner=root group=root
-              mode=0644
-  register: r
-  notify:
-    - Restart Postgrey
-
-- name: Start Postgrey
-  service: name=postgrey state=started
-  when: not r.changed
-
-- meta: flush_handlers
-
-- name: Configure Postfix
-  template: src=etc/postfix/main.cf.j2
-            dest=/etc/postfix-{{ postfix_instance[inst].name }}/main.cf
-            owner=root group=root
-            mode=0644
-  register: r
-  notify:
-    - Restart Postfix
-
-- name: Create directory /etc/postfix-.../virtual
-  file: path=/etc/postfix-{{ postfix_instance[inst].name }}/virtual
-        owner=root group=root
-        state=directory
-        mode=0755
-
-- name: Copy lookups tables
-  copy: src=etc/postfix/virtual/{{ item }}
-        dest=/etc/postfix-{{ postfix_instance[inst].name }}/virtual/{{ item }}
-        owner=root group=root
-        mode=0644
-  with_items:
-    - mailbox_domains.cf
-    - reserved_maps.pcre
-    - alias_maps.cf
-    - lists_maps.cf
-    - alias_catchall_maps.cf
-    - mailbox_maps.cf
-    - reserved_transport_maps
-    - transport_lists_maps.cf
-  notify:
-    - Restart Postfix
-
-- name: Compile the Reserved Transport Maps
-  postmap: cmd=postalias instance={{ postfix_instance[inst].name }}
-           src=/etc/postfix-{{ postfix_instance[inst].name }}/virtual/reserved_transport_maps db=cdb
-           owner=root group=root
-           mode=0644
-
-- name: Copy reserved-alias.pl
-  copy: src=usr/local/sbin/reserved-alias.pl
-        dest=/usr/local/sbin/reserved-alias.pl
-        owner=root group=root
-        mode=0755
-
-- name: Start Postfix
-  service: name=postfix state=started
-  when: not r.changed
-
-- meta: flush_handlers
diff --git a/roles/mx/tasks/main.yml b/roles/mx/tasks/main.yml
new file mode 100644
index 0000000..bd04feb
--- /dev/null
+++ b/roles/mx/tasks/main.yml
@@ -0,0 +1,75 @@
+- name: Install Postfix & Postgrey
+  apt: pkg={{ item }}
+  with_items:
+    - postfix
+    - postfix-pcre
+    - postfix-ldap
+    - postgrey
+    - libnet-ldap-perl
+    - libauthen-sasl-perl
+
+- name: Configure Postgrey
+  lineinfile: dest=/etc/default/postgrey
+              regexp='^POSTGREY_OPTS='
+              line='POSTGREY_OPTS="--privacy --unix=/var/spool/postfix-{{ postfix_instance[inst].name }}/private/postgrey"'
+              owner=root group=root
+              mode=0644
+  register: r
+  notify:
+    - Restart Postgrey
+
+- name: Start Postgrey
+  service: name=postgrey state=started
+  when: not r.changed
+
+- meta: flush_handlers
+
+- name: Configure Postfix
+  template: src=etc/postfix/main.cf.j2
+            dest=/etc/postfix-{{ postfix_instance[inst].name }}/main.cf
+            owner=root group=root
+            mode=0644
+  register: r
+  notify:
+    - Restart Postfix
+
+- name: Create directory /etc/postfix-.../virtual
+  file: path=/etc/postfix-{{ postfix_instance[inst].name }}/virtual
+        owner=root group=root
+        state=directory
+        mode=0755
+
+- name: Copy lookups tables
+  copy: src=etc/postfix/virtual/{{ item }}
+        dest=/etc/postfix-{{ postfix_instance[inst].name }}/virtual/{{ item }}
+        owner=root group=root
+        mode=0644
+  with_items:
+    - mailbox_domains.cf
+    - reserved_maps.pcre
+    - alias_maps.cf
+    - lists_maps.cf
+    - alias_catchall_maps.cf
+    - mailbox_maps.cf
+    - reserved_transport_maps
+    - transport_lists_maps.cf
+  notify:
+    - Restart Postfix
+
+- name: Compile the Reserved Transport Maps
+  postmap: cmd=postalias instance={{ postfix_instance[inst].name }}
+           src=/etc/postfix-{{ postfix_instance[inst].name }}/virtual/reserved_transport_maps db=cdb
+           owner=root group=root
+           mode=0644
+
+- name: Copy reserved-alias.pl
+  copy: src=usr/local/sbin/reserved-alias.pl
+        dest=/usr/local/sbin/reserved-alias.pl
+        owner=root group=root
+        mode=0755
+
+- name: Start Postfix
+  service: name=postfix state=started
+  when: not r.changed
+
+- meta: flush_handlers
-- 
cgit v1.2.3