From bafc53e7a2b770f4cf844dde25446e787a3ada7c Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Thu, 16 Jun 2016 15:51:43 +0200
Subject: [PATCH] ConfigJob: add configForLatestActivityExists()

---
 library/Director/Job/ConfigJob.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/library/Director/Job/ConfigJob.php b/library/Director/Job/ConfigJob.php
index 39b70951..1225f46b 100644
--- a/library/Director/Job/ConfigJob.php
+++ b/library/Director/Job/ConfigJob.php
@@ -52,9 +52,18 @@ class ConfigJob extends JobHook
 
     protected function shouldGenerate()
     {
-        return $this->getSetting('force_generate')
-                // -> last config?!
-            || $this->db()->countActivitiesSinceLastDeployedConfig() > 0;
+        return $this->getSetting('force_generate') === 'y'
+            || ! $this->configForLatestActivityExists();
+    }
+
+    protected function configForLatestActivityExists()
+    {
+        $db = $this->db();
+
+        return IcingaConfig::exists(
+            DirectorDeploymentLog::loadLatest($db)->getConfigHexChecksum(),
+            $db
+        );
     }
 
     protected function shouldDeploy(IcingaConfig $config)