From 39b6c18f24d438b5579607e6e7f223f2f4ad860d Mon Sep 17 00:00:00 2001
From: Stu Tomlinson <stu@nosnilmot.com>
Date: Fri, 16 Sep 2022 11:30:52 +0100
Subject: [PATCH 1/2] Add new registration template parameters

Add 'company_employees' and 'opt_in' to registration template json files
---
 linux/automated-installer/reg_templ.json               | 6 ++++--
 windows/tsm/SilentInstaller/registration.template.json | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/linux/automated-installer/reg_templ.json b/linux/automated-installer/reg_templ.json
index b6cde1f..fa5e8d5 100644
--- a/linux/automated-installer/reg_templ.json
+++ b/linux/automated-installer/reg_templ.json
@@ -11,5 +11,7 @@
     "state":"[value]",
     "department":"[value]",
     "first_name":"[value]",
-    "email":"[value]"
-}
\ No newline at end of file
+    "email":"[value]",
+    "company_employees":"[value]",
+    "opt_in":"[value]"
+}
diff --git a/windows/tsm/SilentInstaller/registration.template.json b/windows/tsm/SilentInstaller/registration.template.json
index abb459b..6d4d84f 100644
--- a/windows/tsm/SilentInstaller/registration.template.json
+++ b/windows/tsm/SilentInstaller/registration.template.json
@@ -11,5 +11,7 @@
   "city" : "[value]",
   "state" : "[value]",
   "zip" : "[value]",
-  "country" : "[value]"
+  "country" : "[value]",
+  "company_employees" : "[value]",
+  "opt_in" : "[value]"
 }

From 776db1718fd025184b50e77515a7b54d2257f1ae Mon Sep 17 00:00:00 2001
From: Stu Tomlinson <stu@nosnilmot.com>
Date: Fri, 16 Sep 2022 14:44:38 +0100
Subject: [PATCH 2/2] Support using Authorization-To-Run (ATR) Service

Add support for specifying --activation-service to enable ATR for
license activation on Linux (it is default for new installs on Windows)

https://help.tableau.com/current/server/en-us/atr_service.htm
---
 linux/automated-installer/automated-installer | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/linux/automated-installer/automated-installer b/linux/automated-installer/automated-installer
index 33d445c..f0c5c21 100755
--- a/linux/automated-installer/automated-installer
+++ b/linux/automated-installer/automated-installer
@@ -307,6 +307,9 @@ check_arguments() {
           accepteula)
             accept_eula_arg='--accepteula'
             ;;
+          activation-service)
+            activation_service=1
+            ;;
           force)
             force_arg='-f'
             ;;
@@ -529,6 +532,7 @@ run_initialize_tsm() {
   initialize_tsm_cmd=("${install_dir}/packages/scripts.${version_string}/initialize-tsm")
 
   [ -n "${accept_eula_arg}"                     ] && initialize_tsm_cmd+=("--accepteula")
+  [ ${activation_service} -eq 1                 ] && initialize_tsm_cmd+=("--activation-service")
   [ -n "${force_arg}"                           ] && initialize_tsm_cmd+=("-f")
   [ ${verbose} -eq 0                            ] && initialize_tsm_cmd+=("-q") # "not verbose" becomes "quiet"
   [ ${add_user_to_groups} -eq 0                 ] && initialize_tsm_cmd+=("-g")
@@ -654,6 +658,7 @@ main() {
   local gateway_port=80
   local registration_file=''
   local accept_eula_arg=''
+  local activation_service=0
   local force_arg=''
   local license_key=''
   local group_username=''