aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEgbert Verhage <egbert@eggiecode.org>2016-08-22 10:55:17 +0200
committerEgbert Verhage <egbert@eggiecode.org>2016-08-22 10:55:17 +0200
commit5083bef62ea6530be43d5246d7732cbcbfbdb4c7 (patch)
tree444e31eef4e7a1f69cfafe4ffba49ec455dc9358
parentf986e059343e124bfa4c404030359dd61cdeb9b0 (diff)
downloadansible-teamspeak-5083bef62ea6530be43d5246d7732cbcbfbdb4c7.tar.gz
ansible-teamspeak-5083bef62ea6530be43d5246d7732cbcbfbdb4c7.tar.xz
ansible-teamspeak-5083bef62ea6530be43d5246d7732cbcbfbdb4c7.zip
Add: gitignore for vim swap files
Fixed: teamspeak.ini_file in defaults Fixed: check if ini_file is not none on include of config.yml
-rw-r--r--.gitignore2
-rw-r--r--defaults/main.yml1
-rw-r--r--tasks/main.yml2
3 files changed, 4 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..783cd5b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*.swp
+
diff --git a/defaults/main.yml b/defaults/main.yml
index 0c6ece1..b85e3e1 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -10,6 +10,7 @@ teamspeak:
version: "3.0.12.4"
checksum: "sha256:6bb0e8c8974fa5739b90e1806687128342b3ab36510944f576942e67df7a1bd9"
keep: 2
+ ini_file: ts3server.ini
teamspeak_ini:
machine_id: ""
diff --git a/tasks/main.yml b/tasks/main.yml
index 35613bf..954dc52 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
+ when: teamspeak_ini is defined or teamspeak.ini_file is none
- name: Install TeamSpeak 3 systemctl service file
template: