From d2bc318f6ee5779ef3eac85890cfd76de9f77a50 Mon Sep 17 00:00:00 2001 From: Egbert Verhage Date: Sun, 21 Aug 2016 12:54:27 +0200 Subject: Fixed issue #1 --- tasks/config.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 tasks/config.yml (limited to 'tasks') diff --git a/tasks/config.yml b/tasks/config.yml new file mode 100644 index 0000000..0b41513 --- /dev/null +++ b/tasks/config.yml @@ -0,0 +1,16 @@ +--- +# Config files and actions for teamspeak3 server +- name: Short facts + set_fact: + ts3server_dir: "{{ teamspeak.home }}/{{ teamspeak.symlink }}/teamspeak3-server_linux_amd64" + +- name: Create ts3server.ini + template: + src: ts3server.ini.j2 + dest: "{{ ts3server_dir }}/ts3server.ini" + mode: 0644 + owner: "{{ teamspeak.user }}" + group: "{{ teamspeak.user }}" + register: ts3server_ini + + -- cgit v1.2.3-70-g09d2 From f986e059343e124bfa4c404030359dd61cdeb9b0 Mon Sep 17 00:00:00 2001 From: Egbert Verhage Date: Sun, 21 Aug 2016 13:25:59 +0200 Subject: Fix: Added update include to main.yml --- tasks/main.yml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'tasks') diff --git a/tasks/main.yml b/tasks/main.yml index 3486eb2..35613bf 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -67,6 +67,9 @@ notify: - Restart TeamSpeak 3 Server +- include: config.yml + when: teamspeak_ini is defined + - name: Install TeamSpeak 3 systemctl service file template: src: teamspeak3-server.service.j2 -- cgit v1.2.3-70-g09d2 From 5083bef62ea6530be43d5246d7732cbcbfbdb4c7 Mon Sep 17 00:00:00 2001 From: Egbert Verhage Date: Mon, 22 Aug 2016 10:55:17 +0200 Subject: 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 --- .gitignore | 2 ++ defaults/main.yml | 1 + tasks/main.yml | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 .gitignore (limited to 'tasks') 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: -- cgit v1.2.3-70-g09d2 From 42951afe19694ee875f4f815ea3b38ae1a8d4724 Mon Sep 17 00:00:00 2001 From: Egbert Verhage Date: Mon, 22 Aug 2016 11:58:19 +0200 Subject: Bug: Indent in default.yml with voice in teamspeak_ini Add: Create logs folder --- defaults/main.yml | 6 +++--- tasks/config.yml | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'tasks') diff --git a/defaults/main.yml b/defaults/main.yml index b85e3e1..632c502 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -21,9 +21,9 @@ teamspeak_ini: filetransfer: ip: 0.0.0.0 port: 10011 - query: - ip: 0.0.0.0 - port: 33003 + query: + ip: 0.0.0.0 + port: 33003 db_plugin: ts3db_sqlite3 logpath: /var/log/teamspeak3-server logquerycommands: false diff --git a/tasks/config.yml b/tasks/config.yml index 0b41513..11e57ff 100644 --- a/tasks/config.yml +++ b/tasks/config.yml @@ -13,4 +13,11 @@ group: "{{ teamspeak.user }}" register: ts3server_ini +- name: Create teamspeak 3 server logs folder + file: + path: "{{ teamspeak_ini.logpath }}" + state: directory + mode: 0755 + owner: "{{ teamspeak.user }}" + group: "{{ teamspeak.user }}" -- cgit v1.2.3-70-g09d2 From 7a8008c94ce13515cd500d7b5ccfd1798690d765 Mon Sep 17 00:00:00 2001 From: Egbert Verhage 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 'tasks') diff --git a/README.md b/README.md index 61a531d..6ed9088 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ Role Variables * teamspeak.version: Version of Teamspeak 3 Server to install. Defaults to "3.0.12.4". * teamspeak.checksum: SHA256 checksum of archive of TeamSpeak 3 server version for verification purposes. Example: "sha256:6bb0e8c8974fa5739b90e1806687128342b3ab36510944f576942e67df7a1bd9" * teamspeak.keep: Amount of TeamSpeak 3 server versions to keep installed, includes current version. A setting of "2" keeps the current and one previous version installed. +* teamspeak.ini_file: Set the teamspeak ini file. If not set it will not generate. * teamspeak_ini.machine_id: Teamspeak server machine ID, used for multiple instances on the save database. * teamspeak.voice: 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