From 862883eaccfec2a89dd2401fc88cf52f3490354e Mon Sep 17 00:00:00 2001
From: Bombar Maxime <bombar@crans.org>
Date: Sun, 17 May 2020 11:36:56 +0200
Subject: [PATCH] Make use of host_vars for postfix.

---
 host_vars/boeing.adm.crans.org      |  7 +++++++
 host_vars/sputnik.adm.crans.org.yml |  7 +++++++
 network.yml                         | 25 -------------------------
 postfix.yml                         |  6 ++++++
 4 files changed, 20 insertions(+), 25 deletions(-)
 create mode 100644 host_vars/boeing.adm.crans.org
 create mode 100644 host_vars/sputnik.adm.crans.org.yml
 create mode 100755 postfix.yml

diff --git a/host_vars/boeing.adm.crans.org b/host_vars/boeing.adm.crans.org
new file mode 100644
index 00000000..33b8f80c
--- /dev/null
+++ b/host_vars/boeing.adm.crans.org
@@ -0,0 +1,7 @@
+postfix:
+  primary: false
+  secondary: true
+  public: true
+  dkim: true
+  mailman: false
+  titanic: true
diff --git a/host_vars/sputnik.adm.crans.org.yml b/host_vars/sputnik.adm.crans.org.yml
new file mode 100644
index 00000000..c077ff2a
--- /dev/null
+++ b/host_vars/sputnik.adm.crans.org.yml
@@ -0,0 +1,7 @@
+postfix:
+  primary: false
+  secondary: true
+  public: true
+  dkim: true
+  mailman: false
+  titanic: false
diff --git a/network.yml b/network.yml
index d8b6e50f..1c5e9a39 100755
--- a/network.yml
+++ b/network.yml
@@ -190,28 +190,3 @@
       remote_as: 8218
   roles:
     - quagga-ipv6
-
-# Deploy postfix on mail servers
-- hosts: titanic.adm.crans.org
-  vars:
-    postfix:
-      primary: false
-      secondary: true
-      public: true
-      dkim: true
-      mailman: false
-      titanic: true
-  roles:
-    - postfix
-
-- hosts: sputnik.adm.crans.org
-  vars:
-    postfix:
-      primary: false
-      secondary: true
-      public: true
-      dkim: true
-      mailman: false
-      titanic: false
-  roles:
-    - postfix
diff --git a/postfix.yml b/postfix.yml
new file mode 100755
index 00000000..5ce4233b
--- /dev/null
+++ b/postfix.yml
@@ -0,0 +1,6 @@
+#!/usr/bin/env ansible-playbook
+# Postfix playbook
+---
+- hosts: sputnik.adm.crans.org, boeing.adm.crans.org
+  roles:
+    - postfix