moved temp check

2026-07-28 16:54:59 +02:00 · 2015-12-01 09:50:13 -08:00
parent bc6064addd
commit 739fd6614b
1 changed files with 3 additions and 2 deletions
@@ -276,11 +276,12 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
                "in the Apache config", target_name)
            raise errors.PluginError("No vhost selected")

+        elif temp:
+            return vhost
        elif not vhost.ssl:
            addrs = self._get_proposed_addrs(vhost, "443")
            # TODO: Conflicts is too conservative
-            if not any(vhost.enabled and vhost.conflicts(addrs) for vhost in self.vhosts)\
-                    and not temp:
+            if not any(vhost.enabled and vhost.conflicts(addrs) for vhost in self.vhosts):
                vhost = self.make_vhost_ssl(vhost)
            else:
                logger.error(