From 8d06b830a5da10bc434f16cb7f640eb21e303049 Mon Sep 17 00:00:00 2001
From: Egbert Verhage <egbert@eggiecode.org>
Date: Mon, 22 Aug 2016 12:12:11 +0200
Subject: Update README

---
 README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'README.md')

diff --git a/README.md b/README.md
index 549c78a..61a531d 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,22 @@ Role Variables
 * <tt>teamspeak.checksum</tt>: SHA256 checksum of archive of TeamSpeak 3 server version for verification purposes. Example: "sha256:6bb0e8c8974fa5739b90e1806687128342b3ab36510944f576942e67df7a1bd9"
 * <tt>teamspeak.keep</tt>: Amount of TeamSpeak 3 server versions to keep installed, includes current version. A setting of "2" keeps the current and one previous version installed.
 
+* <tt>teamspeak_ini.machine_id</tt>: Teamspeak server machine ID, used for multiple instances on the save database.
+* <tt>teamspeak.voice</tt>: Properties of the voice server
+* <tt>teamspeak.voice.ip</tt>: Voice server bind IP
+* <tt>teamspeak.voice.create_default</tt>: Let teamspeak3 server on first start create default server (TODO #7)
+* <tt>teamspeak.voice.default_port</tt>: Default voice server port (TODO #7)
+* <tt>teamspeak.filetransfer</tt>: Properties of the file transfer server
+* <tt>teamspeak.filetransfer.ip</tt>: File transfer server bind IP
+* <tt>teamspeak.filetransfer.port</tt>: File transfer server listen port
+* <tt>teamspeak.query</tt>: Properties of the server query
+* <tt>teamspeak.query.ip</tt>: Server query bind IP
+* <tt>teamspeak.query.port</tt>: Server query listen port
+* <tt>teamspeak.db_plugin</tt>: Teamspeak database system (TODO #4) 
+* <tt>teamspeak.logpath</tt>: Teamspeak logpath. Must be absolute 
+* <tt>teamspeak.logquerycommand</tt>: Teamspeak log all query command
+
+
 <tt>vars/{debian,redhat}.yml</tt>:
 
 * <tt>systemd_service_file_path</tt>: Path where Systemd service files are installed.
-- 
cgit v1.2.3-70-g09d2


From 7a8008c94ce13515cd500d7b5ccfd1798690d765 Mon Sep 17 00:00:00 2001
From: Egbert Verhage <egbert@eggiecode.org>
Date: Tue, 23 Aug 2016 12:54:32 +0200
Subject: Readme update + Add check teamspeak_ini.disabled

---
 README.md         | 1 +
 defaults/main.yml | 1 +
 tasks/main.yml    | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index 61a531d..6ed9088 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,7 @@ Role Variables
 * <tt>teamspeak.version</tt>: Version of Teamspeak 3 Server to install. Defaults to "3.0.12.4".
 * <tt>teamspeak.checksum</tt>: SHA256 checksum of archive of TeamSpeak 3 server version for verification purposes. Example: "sha256:6bb0e8c8974fa5739b90e1806687128342b3ab36510944f576942e67df7a1bd9"
 * <tt>teamspeak.keep</tt>: Amount of TeamSpeak 3 server versions to keep installed, includes current version. A setting of "2" keeps the current and one previous version installed.
+* <tt>teamspeak.ini_file</tt>: Set the teamspeak ini file. If not set it will not generate. 
 
 * <tt>teamspeak_ini.machine_id</tt>: Teamspeak server machine ID, used for multiple instances on the save database.
 * <tt>teamspeak.voice</tt>: Properties of the voice server
diff --git a/defaults/main.yml b/defaults/main.yml
index 632c502..ca9739a 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -13,6 +13,7 @@ teamspeak:
   ini_file: ts3server.ini
 
 teamspeak_ini:
+  disabled: true
   machine_id: ""
   voice:
     ip: 0.0.0.0
diff --git a/tasks/main.yml b/tasks/main.yml
index 954dc52..4d93664 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -68,7 +68,7 @@
     - Restart TeamSpeak 3 Server
 
 - include: config.yml
-  when: teamspeak_ini is defined or teamspeak.ini_file is none 
+  when: teamspeak_ini is defined or teamspeak.ini_file is none and teamspeak_ini.disable is false 
 
 - name: Install TeamSpeak 3 systemctl service file
   template:
-- 
cgit v1.2.3-70-g09d2