From dd4d33530269c681b27f50a4725711e8c31ad619 Mon Sep 17 00:00:00 2001
From: staticsafe <jogajog@sadiqsaif.com>
Date: Wed, 15 Apr 2020 10:23:45 -0400
Subject: [PATCH] make ipset.service import even if ipset already exists and
 then reload in main.yml

---
 ubuntu/roles/ipset-deploy/files/ipset.service | 5 ++---
 ubuntu/roles/ipset-deploy/tasks/main.yml      | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ubuntu/roles/ipset-deploy/files/ipset.service b/ubuntu/roles/ipset-deploy/files/ipset.service
index 35f1c2d..5a0238a 100644
--- a/ubuntu/roles/ipset-deploy/files/ipset.service
+++ b/ubuntu/roles/ipset-deploy/files/ipset.service
@@ -6,10 +6,9 @@ Before=netfilter-persistent.service
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/sbin/ipset -f /etc/ipset.conf restore
-ExecReload=/sbin/ipset -f /etc/ipset.conf restore
+ExecStart=/sbin/ipset -! -f /etc/ipset.conf restore
+ExecReload=/sbin/ipset -! -f /etc/ipset.conf restore
 ExecStop=/sbin/ipset flush
-ExectStopPost=/sbin/ipset destroy
 
 [Install]
 WantedBy=multi-user.target
diff --git a/ubuntu/roles/ipset-deploy/tasks/main.yml b/ubuntu/roles/ipset-deploy/tasks/main.yml
index 3a912dc..363631f 100644
--- a/ubuntu/roles/ipset-deploy/tasks/main.yml
+++ b/ubuntu/roles/ipset-deploy/tasks/main.yml
@@ -17,7 +17,7 @@
     src: "{{ ansible_fqdn }}.ipset"
     dest: /etc/ipset.conf
 
-- name: Restart ipset
+- name: Restart ipset service
   systemd:
     name: ipset
     state: restarted