From ddc497e0fba6334362847fdf698318b5549ead16 Mon Sep 17 00:00:00 2001 From: slinderud Date: Sun, 10 Feb 2019 15:34:31 +0100 Subject: fixed templateing install and service file, updated install documentation and included new varnish vcl file --- ansible/roles/web/tasks/main.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'ansible/roles/web/tasks') diff --git a/ansible/roles/web/tasks/main.yml b/ansible/roles/web/tasks/main.yml index 1c89947..466dec8 100644 --- a/ansible/roles/web/tasks/main.yml +++ b/ansible/roles/web/tasks/main.yml @@ -31,7 +31,9 @@ 'libxml2-dev', 'build-essential', 'cpanminus', - 'apt-transport-https'] + 'apt-transport-https', + 'python-setuptools', + 'python3-pip'] state: present - name: Add packagecloud.io Varnish apt key. @@ -59,6 +61,12 @@ notify: - reload systemd +- name: Copy varnish-acl config + copy: + dest: /etc/varnish/auth.vcl + src: auth.vcl + notify: restart varnish + - name: Copy varnish config copy: dest: /etc/varnish/default.vcl @@ -87,3 +95,12 @@ - name: Install InfluxDB module cpanm: name: AnyEvent::InfluxDB + +- name: Install python dependencies + command: /usr/bin/pip3 install -r /opt/gondul/templating/requirements.txt + +- name: add systemd service file for gondul-template + copy: + dest: /etc/systemd/system/gondul-template.service + src: template.service + notify: restart gondul-template \ No newline at end of file -- cgit v1.2.3 From f1526d1b25cd04f3857d754f7e98d0729fe1cc49 Mon Sep 17 00:00:00 2001 From: Lasse Haugen Date: Tue, 12 Feb 2019 09:49:21 +0100 Subject: added newlines --- ansible/roles/web/tasks/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ansible/roles/web/tasks') diff --git a/ansible/roles/web/tasks/main.yml b/ansible/roles/web/tasks/main.yml index 466dec8..1ee2862 100644 --- a/ansible/roles/web/tasks/main.yml +++ b/ansible/roles/web/tasks/main.yml @@ -103,4 +103,5 @@ copy: dest: /etc/systemd/system/gondul-template.service src: template.service - notify: restart gondul-template \ No newline at end of file + notify: restart gondul-template + -- cgit v1.2.3 From dac472463220592672f69f8f589caad5f425f9c3 Mon Sep 17 00:00:00 2001 From: Lasse Haugen Date: Tue, 12 Feb 2019 09:58:42 +0100 Subject: renamed service --- ansible/roles/web/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ansible/roles/web/tasks') diff --git a/ansible/roles/web/tasks/main.yml b/ansible/roles/web/tasks/main.yml index 1ee2862..9d2ff2b 100644 --- a/ansible/roles/web/tasks/main.yml +++ b/ansible/roles/web/tasks/main.yml @@ -102,6 +102,6 @@ - name: add systemd service file for gondul-template copy: dest: /etc/systemd/system/gondul-template.service - src: template.service + src: gondul-template.service notify: restart gondul-template -- cgit v1.2.3 From 31e7ffd29f6bc74d742b24d5a9a1c463507857c0 Mon Sep 17 00:00:00 2001 From: slinderud Date: Tue, 12 Feb 2019 10:30:03 +0100 Subject: moved from pip to apt --- ansible/roles/web/tasks/main.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'ansible/roles/web/tasks') diff --git a/ansible/roles/web/tasks/main.yml b/ansible/roles/web/tasks/main.yml index 9d2ff2b..ddbf74d 100644 --- a/ansible/roles/web/tasks/main.yml +++ b/ansible/roles/web/tasks/main.yml @@ -32,8 +32,8 @@ 'build-essential', 'cpanminus', 'apt-transport-https', - 'python-setuptools', - 'python3-pip'] + 'python3-netaddr', + 'python3-flask'] state: present - name: Add packagecloud.io Varnish apt key. @@ -96,9 +96,6 @@ cpanm: name: AnyEvent::InfluxDB -- name: Install python dependencies - command: /usr/bin/pip3 install -r /opt/gondul/templating/requirements.txt - - name: add systemd service file for gondul-template copy: dest: /etc/systemd/system/gondul-template.service -- cgit v1.2.3 From b018cde6bdd90d219eabb29d4b5bb200e50191c9 Mon Sep 17 00:00:00 2001 From: Lasse Haugen Date: Tue, 12 Feb 2019 11:10:16 +0100 Subject: service file cleanup --- ansible/roles/web/tasks/main.yml | 1 - 1 file changed, 1 deletion(-) (limited to 'ansible/roles/web/tasks') diff --git a/ansible/roles/web/tasks/main.yml b/ansible/roles/web/tasks/main.yml index ddbf74d..b10593e 100644 --- a/ansible/roles/web/tasks/main.yml +++ b/ansible/roles/web/tasks/main.yml @@ -101,4 +101,3 @@ dest: /etc/systemd/system/gondul-template.service src: gondul-template.service notify: restart gondul-template - -- cgit v1.2.3 From 65be318e53ceb6f5e6022e24fd585930f4477dda Mon Sep 17 00:00:00 2001 From: Lasse Haugen Date: Tue, 12 Feb 2019 11:19:00 +0100 Subject: newline fuckups --- ansible/roles/web/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'ansible/roles/web/tasks') diff --git a/ansible/roles/web/tasks/main.yml b/ansible/roles/web/tasks/main.yml index b10593e..ddbf74d 100644 --- a/ansible/roles/web/tasks/main.yml +++ b/ansible/roles/web/tasks/main.yml @@ -101,3 +101,4 @@ dest: /etc/systemd/system/gondul-template.service src: gondul-template.service notify: restart gondul-template + -- cgit v1.2.3