Merge branch 'dev' into 'master'

Install latest version from Artifactory

See merge request ics-ansible-galaxy/ics-ans-role-tinyproxy!1

molecule/default/tests/test_default.py

@@ -9,7 +9,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
 def test_tinyproxy_is_installed(host):
     tinyproxy = host.package("tinyproxy")
     assert tinyproxy.is_installed
-    assert tinyproxy.version.startswith("1.8.3")
+    assert tinyproxy.version.startswith("1.11.1")
 
 
 def test_tinyproxy_running_and_enabled(host):

tasks/main.yml

 ---
 - name: Install tinyproxy
   yum:
-    name: tinyproxy
+    name: https://artifactory.esss.lu.se/artifactory/rpm-ics/centos/7/x86_64/tinyproxy-1.11.1-0.x86_64.rpm
     state: present
 
+- name: Create directory for PID file
+  file:
+    path: /run/tinyproxy
+    state: directory
+    owner: tinyproxy
+    group: tinyproxy
+    mode: '0755'
+
 - name: Copy error html files
   template:
     src: "{{ item }}"

templates/tinyproxy.conf

@@ -47,7 +47,7 @@ FilterDefaultDeny {{ tinyproxy_filtering.default_deny }}
 
 {% if tinyproxy_upstream %}
 {% for proxy in tinyproxy_upstream_proxies %}
-Upstream {{ proxy.address }}:{{ proxy.port }} {% if proxy.url is defined %} "{{ proxy.url }}" {% endif %}
+Upstream http {{ proxy.address }}:{{ proxy.port }} {% if proxy.url is defined %} "{{ proxy.url }}" {% endif %}
 {% endfor %}
 {% endif %}