aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEgbert Verhage <egbert@eggiecode.org>2016-08-23 12:54:32 +0200
committerEgbert Verhage <egbert@eggiecode.org>2016-08-23 12:54:32 +0200
commit7a8008c94ce13515cd500d7b5ccfd1798690d765 (patch)
tree79f078b91ed8dece4638416016f662c6f7d7782c
parent8d06b830a5da10bc434f16cb7f640eb21e303049 (diff)
downloadansible-teamspeak-7a8008c94ce13515cd500d7b5ccfd1798690d765.tar.gz
ansible-teamspeak-7a8008c94ce13515cd500d7b5ccfd1798690d765.tar.xz
ansible-teamspeak-7a8008c94ce13515cd500d7b5ccfd1798690d765.zip
Readme update + Add check teamspeak_ini.disabled
-rw-r--r--README.md1
-rw-r--r--defaults/main.yml1
-rw-r--r--tasks/main.yml2
3 files changed, 3 insertions, 1 deletions
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: