Remove onDomainConfigured

2018-01-26 22:52:54 -08:00
parent 7ce79505ee
commit 64f90abac7
2 changed files with 7 additions and 19 deletions
@@ -108,7 +108,7 @@ function initialize(callback) {
        certificates.initialize,
        settings.initialize,
        configureDefaultServer,
-        onDomainConfigured,
+        cron.initialize, // required for caas heartbeat before activation
        onActivated
    ], function (error) {
        if (error) return callback(error);
@@ -130,17 +130,6 @@ function uninitialize(callback) {
    ], callback);
 }

-function onDomainConfigured(callback) {
-    callback = callback || NOOP_CALLBACK;
-
-    if (!config.adminFqdn()) return callback();
-
-    async.series([
-        clients.addDefaultClients,
-        cron.initialize // required for caas heartbeat before activation
-    ], callback);
-}
-
 function onActivated(callback) {
    callback = callback || NOOP_CALLBACK;

@@ -213,10 +202,9 @@ function dnsSetup(adminFqdn, domain, zoneName, provider, dnsConfig, callback) {
            config.setAdminLocation('my');
            config.setZoneName(zoneName);

-            callback();
+            clients.addDefaultClients(config.adminOrigin(), callback);

            async.series([ // do not block
-                onDomainConfigured,
                configureWebadmin
            ], NOOP_CALLBACK);
        });