add version to account download data. fix timezone setting in docker deploys

bubble-server/pom.xml

@@ -11,12 +11,12 @@
         <groupId>bubble</groupId>
         <artifactId>bubble</artifactId>
         <!-- @@BUBBLE_VERSION@@ this comment must remain above the version tag so that _set_version can update it -->
-        <version>1.5.2</version>
+        <version>1.4.56</version>
     </parent>
 
     <artifactId>bubble-server</artifactId>
     <!-- @@BUBBLE_VERSION@@ this comment must remain above the version tag so that _set_version can update it -->
-    <version>1.5.2</version>
+    <version>1.4.56</version>
 
     <repositories>
         <repository>

bubble-server/src/main/java/bubble/cloud/compute/ComputeDeploymentConfig.java

@@ -9,5 +9,6 @@ public class ComputeDeploymentConfig {
 
     @Getter @Setter private boolean sudo = true;
     @Getter @Setter private boolean hostname = true;
+    @Getter @Setter private boolean timezoneScript = false;
 
 }

bubble-server/src/main/java/bubble/service/account/download/AccountDownloadCollector.java

@@ -29,15 +29,16 @@ import static org.cobbzilla.util.system.Sleep.sleep;
 @Accessors(chain=true) @Slf4j
 public class AccountDownloadCollector implements Runnable {
 
-    private BubbleConfiguration configuration;
-    private String accountUuid;
-    private String networkUuid;
-    private AtomicReference<Map<String, List<String>>> ref;
-    private String remoteHost;
+    private final BubbleConfiguration configuration;
+    private final String accountUuid;
+    private final String networkUuid;
+    private final AtomicReference<Map<String, List<String>>> ref;
+    private final String remoteHost;
+    private final AccountMessageDAO messageDAO;
+    private final boolean sendMessage;
+    private final AccountDownloadService downloadService;
+
     @Setter private Thread thread;
-    private AccountMessageDAO messageDAO;
-    private boolean sendMessage;
-    private AccountDownloadService downloadService;
 
     public AccountDownloadCollector(BubbleConfiguration configuration,
                                     String accountUuid,
@@ -60,6 +61,7 @@ public class AccountDownloadCollector implements Runnable {
         try {
             AbstractCRUDDAO.getRawMode().set(true);
             final Map<String, List<String>> data = new HashMap<>();
+            data.put("BUBBLE-VERSION", List.of(configuration.getShortVersion(), configuration.getVersion()));
             configuration.getEntityClasses().forEach(clazz -> collectEntities(data, clazz, configuration, accountUuid));
             ref.set(data);
             if (sendMessage) {

bubble-server/src/main/java/bubble/service/account/download/AccountDownloadMonitor.java

@@ -25,13 +25,13 @@ import static org.cobbzilla.wizard.cache.redis.RedisService.EX;
 @AllArgsConstructor @Slf4j
 public class AccountDownloadMonitor implements Runnable {
 
-    private AccountDownloadService downloadService;
-    private Thread t;
-    private AtomicReference<Map<String, List<String>>> ref;
-    private String accountUuid;
-    private String networkUuid;
-    private AccountMessageDAO messageDAO;
-    private String remoteHost;
+    private final AccountDownloadService downloadService;
+    private final Thread t;
+    private final AtomicReference<Map<String, List<String>>> ref;
+    private final String accountUuid;
+    private final String networkUuid;
+    private final AccountMessageDAO messageDAO;
+    private final String remoteHost;
 
     @Override public void run() {
         try {

bubble-server/src/main/java/bubble/service/account/download/AccountDownloadService.java

@@ -109,7 +109,7 @@ public class AccountDownloadService {
 
     @AllArgsConstructor
     private static class AccountDownloadRequest {
-        private Thread t;
-        private AtomicReference<Map<String, List<String>>> ref;
+        private final Thread t;
+        private final AtomicReference<Map<String, List<String>>> ref;
     }
 }

bubble-server/src/main/resources/META-INF/bubble/bubble.properties

@@ -1,3 +1,3 @@
 # Do not edit this file directly
 # Use _set_version to update the Bubble version in all files
-bubble.version=Adventure 1.5.2
+bubble.version=Adventure 1.4.56

bubble-server/src/main/resources/ansible/roles/bubble/files/bubble_role.json

@@ -10,7 +10,6 @@
     {"name": "install_type", "value": "[[installType]]"},
     {"name": "promo_code_policy", "value": "[[#compare fork '==' true]][[configuration.promoCodePolicy]][[else]]disabled[[/compare]]"},
     {"name": "default_locale", "value": "[[network.locale]]"},
-    {"name": "time_zone", "value": "[[network.timezone]]"},
     {"name": "bubble_host", "value": "[[node.fqdn]]"},
     {"name": "bubble_cname", "value": "[[network.networkDomain]]"},
     {"name": "admin_user", "value": "[[node.ansibleUser]]"},

bubble-server/src/main/resources/ansible/roles/bubble/tasks/main.yml

@@ -1,9 +1,6 @@
 #
 # Copyright (c) 2020 Bubble, Inc.  All rights reserved. For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/
 #
-- name: Set system timezone
-  shell: timedatectl set-timezone {{ time_zone }}
-
 - name: Install helper template scripts
   template:
     src: "{{ item.src }}"

bubble-server/src/main/resources/ansible/roles/common/files/bubble_role.json

@@ -2,6 +2,8 @@
   "name": "common",
   "config": [
     {"name": "hostname", "value": "[[node.fqdn]]"},
-    {"name": "bubble_set_hostname", "value": "[[bubble_deploy_hostname]]"}
+    {"name": "time_zone", "value": "[[network.timezone]]"},
+    {"name": "bubble_set_hostname", "value": "[[bubble_deploy_hostname]]"},
+    {"name": "bubble_set_timezone_script", "value": "[[bubble_deploy_timezoneScript]]"}
   ]
 }

bubble-server/src/main/resources/ansible/roles/common/tasks/main.yml

@@ -6,6 +6,14 @@
     name: '{{ hostname }}'
   when: bubble_set_hostname == 'true'
 
+- name: Set system timezone via timedatectl
+  shell: timedatectl set-timezone {{ time_zone }}
+  when: bubble_set_timezone_script != 'true'
+
+- name: Set system timezone via script
+  shell: bash -c "function set_tz () { TZ=${1:?no timezone} ; ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone ; } ; set_tz {{ time_zone }}"
+  when: bubble_set_timezone_script == 'true'
+
 - name: Set log flag to true with EX of 7 days for non-sage nodes
   shell: echo 'set bubble.StandardSelfNodeService.bubble_server_logs_enabled "true" EX 604800' | redis-cli
   when: install_type != 'sage'

bubble-server/src/main/resources/models/defaults/cloudService.json

@@ -161,7 +161,8 @@
       "os": "phusion/baseimage:focal-1.0.0alpha1-amd64",
       "deployment": {
         "sudo": false,
-        "hostname": false
+        "hostname": false,
+        "timezoneScript": true
       },
       "packer": {
         "vars": [],

bubble-server/src/test/resources/models/system/cloudService.json

@@ -128,7 +128,8 @@
       "os": "phusion/baseimage:focal-1.0.0alpha1-amd64",
       "deployment": {
         "sudo": false,
-        "hostname": false
+        "hostname": false,
+        "timezoneScript": true
       },
       "packer": {
         "vars": [],

pom.xml

@@ -14,7 +14,7 @@
     <groupId>bubble</groupId>
     <artifactId>bubble</artifactId>
     <!-- @@BUBBLE_VERSION@@ this comment must remain above the version tag so that _set_version can update it -->
-    <version>1.5.2</version>
+    <version>1.4.56</version>
     <packaging>pom</packaging>
 
     <licenses>

utils/pom.xml

@@ -10,7 +10,7 @@ This code is available under the GNU Affero General Public License, version 3: h
     <groupId>bubble</groupId>
     <artifactId>utils</artifactId>
     <!-- @@BUBBLE_VERSION@@ this comment must remain above the version tag so that _set_version can update it -->
-    <version>1.5.2</version>
+    <version>1.4.56</version>
     <packaging>pom</packaging>
 
     <licenses>