diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py index 8298f82a7fcda586490b7fc31e4a3bc58e7a5b97..832a643e6c8bd34d902969fd4021a7bc3f7b131c 100644 --- a/molecule/default/tests/test_default.py +++ b/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): diff --git a/tasks/main.yml b/tasks/main.yml index 3a98a4227ec61657451c49b4c39e8eb5b2501fe0..ca097accdeb043194070c3df5e12d5fb288c5c09 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,9 +1,17 @@ --- - 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 }}" diff --git a/templates/tinyproxy.conf b/templates/tinyproxy.conf index 1a720c3187a4e573d0ae58097548ff33bf39c540..abca4fc6ac21a50a23b04e2a28ad7824f1b9cbe9 100644 --- a/templates/tinyproxy.conf +++ b/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 %}