Merge branch 'pr/35'

Author: kittychou

windows/README.md renamed to windows/tabadmin/README.md

@@ -1,51 +1,51 @@
---- 
-config.version: 15
-# Install some samples to look at.
-install.component.samples: true
-# use local authentication and not active directory
-wgserver.authenticate: local
-
-# The first in the list will be the primary (aka worker0). Then worker1, then worker2
-# The workers must have the worker installer run and waiting before you use the script to set up the primary.
-# REPLACE THESE IP ADDRESSES WITH THE APPROPRIATE ONES; DON'T FORGET THE workerX.host ENTRIES BELOW
-worker.hosts: 10.0.0.1, 10.0.0.2, 10.0.0.3
-#
-# Configure the number of processes to for each server component running on each server instance here. 
-# gateway port is the port you'd connect to use the web interface to the server. (defaults to 80, set to 8080 for demo
-# purposes here)
-#
-# worker0
-worker0.backgrounder.procs: 2
-worker0.cacheserver.procs: 2
-worker0.dataengine.procs: 1
-worker0.dataserver.procs: 2
-worker0.filestore.enabled: true
-worker0.gateway.enabled: true
-worker0.gateway.port: 8080
-worker0.vizportal.procs: 1
-worker0.vizqlserver.procs: 2
-worker0.zookeeper.procs: 1
-#worker1
-worker1.backgrounder.procs: 1
-worker1.cacheserver.procs: 1
-worker1.dataengine.procs: 1
-worker1.dataserver.procs: 1
-worker1.filestore.enabled: true
-worker1.gateway.enabled: true
-worker1.gateway.port: 8080
-worker1.vizportal.procs: 2
-worker1.vizqlserver.procs: 1
-worker1.zookeeper.procs: 1
-#worker 2
-worker2.backgrounder.procs: 1
-worker2.cacheserver.procs: 1
-worker2.dataengine.procs: 1
-worker2.dataserver.procs: 1
-worker2.filestore.enabled: true
-worker2.gateway.enabled: false
-worker2.gateway.port: 8080
-worker2.vizportal.procs: 1
-worker2.vizqlserver.procs: 2
-worker2.zookeeper.procs: 1
-
-
+--- 
+config.version: 15
+# Install some samples to look at.
+install.component.samples: true
+# use local authentication and not active directory
+wgserver.authenticate: local
+
+# The first in the list will be the primary (aka worker0). Then worker1, then worker2
+# The workers must have the worker installer run and waiting before you use the script to set up the primary.
+# REPLACE THESE IP ADDRESSES WITH THE APPROPRIATE ONES; DON'T FORGET THE workerX.host ENTRIES BELOW
+worker.hosts: 10.0.0.1, 10.0.0.2, 10.0.0.3
+#
+# Configure the number of processes to for each server component running on each server instance here. 
+# gateway port is the port you'd connect to use the web interface to the server. (defaults to 80, set to 8080 for demo
+# purposes here)
+#
+# worker0
+worker0.backgrounder.procs: 2
+worker0.cacheserver.procs: 2
+worker0.dataengine.procs: 1
+worker0.dataserver.procs: 2
+worker0.filestore.enabled: true
+worker0.gateway.enabled: true
+worker0.gateway.port: 8080
+worker0.vizportal.procs: 1
+worker0.vizqlserver.procs: 2
+worker0.zookeeper.procs: 1
+#worker1
+worker1.backgrounder.procs: 1
+worker1.cacheserver.procs: 1
+worker1.dataengine.procs: 1
+worker1.dataserver.procs: 1
+worker1.filestore.enabled: true
+worker1.gateway.enabled: true
+worker1.gateway.port: 8080
+worker1.vizportal.procs: 2
+worker1.vizqlserver.procs: 1
+worker1.zookeeper.procs: 1
+#worker 2
+worker2.backgrounder.procs: 1
+worker2.cacheserver.procs: 1
+worker2.dataengine.procs: 1
+worker2.dataserver.procs: 1
+worker2.filestore.enabled: true
+worker2.gateway.enabled: false
+worker2.gateway.port: 8080
+worker2.vizportal.procs: 1
+worker2.vizqlserver.procs: 2
+worker2.zookeeper.procs: 1
+
+

windows/ScriptedInstaller.py renamed to windows/tabadmin/ScriptedInstaller.py

@@ -1,6 +1,6 @@
-{
-	"runas_user":"workgroup\\serviceuser",
-	"runas_pass":"CHANGE ME",
-	"content_admin_user":"admin",
-	"content_admin_pass":"CHANGE ME"
+{
+	"runas_user":"workgroup\\serviceuser",
+	"runas_pass":"CHANGE ME",
+	"content_admin_user":"admin",
+	"content_admin_pass":"CHANGE ME"
 }

windows/sample-cluster-config.yml renamed to windows/tabadmin/sample-cluster-config.yml

@@ -0,0 +1,13 @@
+# Windows scripts for Tableau Services Manager (TSM)
+[![Community Supported](https://img.shields.io/badge/Support%20Level-Community%20Supported-457387.svg)](https://www.tableau.com/support-levels-it-and-developer-tools)
+----
+
+This subfolder contains scripts and samples that can be used for automating the installation of Tableau Server on Windows using Tableau Services Manager starting from 2018.2 release.
+
+[SilentInstaller](SilentInstaller/)
+-------------------
+SilentInstaller is a script for installing Tableau Services Manager, initializing TSM, and starting Tableau Server on Windows.  After successful completion, Tableau Server is ready for use.
+
+[AWS CloudFormation Templates](aws/)
+------------------------
+Contains sample AWS CloudFormation templates for deploying Tableau Server to Amazon Web Services(AWS).