@@ -292,6 +293,7 @@ public class BubbleConfiguration extends PgRestServerConfiguration
                         {TAG_LOCALES, getAllLocales()},
                         {TAG_CLOUD_CONFIGS, accountDAO.activated() ? null : activationService.getCloudDefaults()},
                         {TAG_LOCKED, accountDAO.locked()},
+                        {TAG_RESTORE_MODE, thisNode.wasRestored()},

@@ -649,0 +651,4 @@
+            //       also, should this go into other method here that are locking network?
+            try { unlockNetwork(network.getUuid(), lock); } catch (Exception e1) { }
+            log.error("startNetwork: original SimpleViolationException: ", e);
+            throw e;

@@ -46,3 +46,3 @@
     find "./src/main" -type f -newer "$(find "./target" -type f -name "bubble*.jar" | head -1)"
   fi
-  mvn -DskipTests=true -Dcheckstyle.skip=true clean package || die "Error packaging jar"
+  INSTALL_WEB=web mvn -DskipTests=true -Dcheckstyle.skip=true clean package || die "Error packaging jar"

@@ -59,0 +60,4 @@
+if [[ $(jar tf ./target/bubble*.jar | grep "^site/$") ]] ; then
+  echo "Deploying new web..."
+  ssh ${HOST} "cd ~bubble && jar xf /tmp/bubble.jar site"
+fi

@@ -4,3 +4,3 @@
 #
 if [[ -z "${VULTR_API_KEY}" ]] ; then
-  echo "VULTR_API_KEY not defined in environment"
+  >&2 echo "VULTR_API_KEY not defined in environment"

@@ -77,1 +77,4 @@
     public boolean canDelete() { return status.isDeletable() || getCtimeAge() > BR_STATE_LOCK_TIMEOUT; }
+
+    public long getCreationTime() { return getCtime(); }
+    public void setCreationTime(long c) { /* noop */ }

@@ -112,6 +112,7 @@ public class AuthResource {
     @GET @Path(EP_READY)
     public Response getNodeIsReady(@Context ContainerRequest ctx) {
         try {
+            if (configuration.getThisNetwork().getState().equals(BubbleNetworkState.restoring)) return ok();

@@ -90,6 +92,7 @@ public class BubbleConfiguration extends PgRestServerConfiguration
     public static final String TAG_REQUIRE_SEND_METRICS = "requireSendMetrics";
     public static final String TAG_SUPPORT = "support";
     public static final String TAG_SECURITY_LEVELS = "securityLevels";
+    public static final String TAG_RESTORE_MODE = "isWaitingRestoring";

@@ -26,0 +32,4 @@
+    // backward compatibility - the following getter may be removed and default one may be used after some time, while
+    // ctime can be changed to be of simple `long` type
+    public long getCtime() { return ctime == null ? 0 : ctime; }
+

@@ -0,0 +96,4 @@
+
+# Remove old keys
+log "Removing node keys"
+echo "DELETE FROM bubble_node_key" | bsql.sh

@@ -8063,4 +8058,1 @@
-porno
-porns
-porny
 porta