From 22ec01c0f565968433ec38895ba2c8a4f22bb7c4 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 30 Nov 2018 07:47:36 +0000
Subject: [PATCH] Port varnish role to Fedora 29

From varnish changelog:

- varnish.params is gone. To override startup configuration,
  use /etc/systemd/system/varnish.service
---
 roles/varnish/tasks/main.yml           | 14 +++++++++++---
 roles/varnish/templates/varnish.f29.j2 | 16 ++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 roles/varnish/templates/varnish.f29.j2

diff --git a/roles/varnish/tasks/main.yml b/roles/varnish/tasks/main.yml
index 5ed59a8d35..46646d5bae 100644
--- a/roles/varnish/tasks/main.yml
+++ b/roles/varnish/tasks/main.yml
@@ -16,7 +16,7 @@
   - varnish
   - selinux
 
-- name: install varnish /etc/sysconfig/varnish file (el7
+- name: install varnish /etc/sysconfig/varnish file (el7)
   copy: src=varnish.el7 dest=/etc/sysconfig/varnish owner=root group=root
   notify:
   - restart varnish
@@ -24,13 +24,21 @@
   - varnish
   when: ansible_distribution_major_version|int == 7
 
-- name: install varnish /etc/sysconfig/varnish file (fedora)
+- name: install varnish /etc/sysconfig/varnish file (fedora 25-28)
   template: src=varnish.f25.j2 dest=/etc/varnish/varnish.params owner=root group=root
   notify:
   - restart varnish
   tags:
   - varnish
-  when: ansible_distribution_major_version|int > 24
+  when: ansible_distribution_major_version|int >= 25 and ansible_distribution_major_version|int < 29
+
+- name: install varnish /etc/systemd/system/varnish.service file (fedora 29+)
+  template: src=varnish.f29.j2 dest=/etc/systemd/system/varnish.service owner=root group=root
+  notify:
+  - restart varnish
+  tags:
+  - varnish
+  when: ansible_distribution_major_version|int >= 29
 
 - name: install /etc/varnish/default.vcl (proxies)
   template: src={{ varnish_group }}.vcl.j2 dest=/etc/varnish/default.vcl owner=root group=root
diff --git a/roles/varnish/templates/varnish.f29.j2 b/roles/varnish/templates/varnish.f29.j2
new file mode 100644
index 0000000000..961d04255d
--- /dev/null
+++ b/roles/varnish/templates/varnish.f29.j2
@@ -0,0 +1,16 @@
+{% if "proxy" in inventory_hostname %}
+{% set VARNISH_LISTEN_PORT=6081 %}
+{% else %}
+{% set VARNISH_LISTEN_PORT=80 %}
+{% endif %}
+
+{% if varnish_group == 'kojipkgs' %}
+{% set VARNISH_STORAGE="malloc,48GB" %}
+{% elif varnish_group == 's390kojipkgs' %}
+{% set VARNISH_STORAGE="file,/var/lib/varnish/varnish_storage.bin,20G" %}
+{% else %}
+{% set VARNISH_STORAGE="malloc,256M" %}
+{% endif %}
+
+[Service]
+ExecStart=/usr/sbin/varnishd -a :{{VARNISH_LISTEN_PORT}} -f /etc/varnish/default.vcl -s {{VARNISH_STORAGE}}