From 1e1a791c752c31acd0a37977f2d72401206b718f Mon Sep 17 00:00:00 2001 From: Mischa ter Smitten Date: Mon, 15 Mar 2021 16:13:54 +0100 Subject: [PATCH] (Python) consistency changes --- Dockerfile | 2 +- defaults/main.yml | 2 +- handlers/main.yml | 2 +- meta/main.yml | 3 ++- tasks/acl.yml | 2 +- tasks/certificates.yml | 2 +- tasks/configuration.yml | 2 +- tasks/install.yml | 2 +- tasks/letsencrypt.yml | 2 +- tasks/main.yml | 2 +- tests/test.yml | 2 +- tests/vagrant.yml | 2 +- tests/vars/main.yml | 2 +- vars/main.yml | 2 +- 14 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index fc89ab2b..b1792787 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ MAINTAINER Mischa ter Smitten RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y python-minimal python-dev curl && \ apt-get clean -RUN curl -sL https://bootstrap.pypa.io/get-pip.py | python - +RUN curl -sL https://bootstrap.pypa.io/pip/2.7/get-pip.py | python - RUN rm -rf $HOME/.cache # ansible diff --git a/defaults/main.yml b/defaults/main.yml index ee5cf0da..13167bbd 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,4 +1,4 @@ -# defaults file for haproxy +# defaults file --- haproxy_use_ppa: true haproxy_version: 2.0 diff --git a/handlers/main.yml b/handlers/main.yml index 932320e5..ce489a5e 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,4 +1,4 @@ -# handlers file for haproxy +# handlers file --- - name: restart haproxy service: diff --git a/meta/main.yml b/meta/main.yml index e3daebe6..e36b9b7a 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,6 +1,7 @@ -# meta file for haproxy +# meta file --- galaxy_info: + namespace: oefenweb role_name: haproxy author: Mischa ter Smitten company: Oefenweb.nl B.V. diff --git a/tasks/acl.yml b/tasks/acl.yml index 5db1b9d5..6da70552 100644 --- a/tasks/acl.yml +++ b/tasks/acl.yml @@ -1,4 +1,4 @@ -# tasks file for haproxy +# tasks file --- - name: acl | create directories file: diff --git a/tasks/certificates.yml b/tasks/certificates.yml index 10fc7d5f..d91d65c9 100644 --- a/tasks/certificates.yml +++ b/tasks/certificates.yml @@ -1,4 +1,4 @@ -# tasks file for haproxy +# tasks file --- - name: certificates | create directories file: diff --git a/tasks/configuration.yml b/tasks/configuration.yml index b1fb1f01..b8271325 100644 --- a/tasks/configuration.yml +++ b/tasks/configuration.yml @@ -1,4 +1,4 @@ -# tasks file for haproxy +# tasks file --- - name: configuration | update file template: diff --git a/tasks/install.yml b/tasks/install.yml index 82675d5a..f63eb295 100644 --- a/tasks/install.yml +++ b/tasks/install.yml @@ -1,4 +1,4 @@ -# tasks file for haproxy +# tasks file --- - name: install | dependencies (pre) apt: diff --git a/tasks/letsencrypt.yml b/tasks/letsencrypt.yml index b2fda3c6..e0a04a28 100644 --- a/tasks/letsencrypt.yml +++ b/tasks/letsencrypt.yml @@ -1,4 +1,4 @@ -# tasks file for haproxy +# tasks file --- - name: letsencrypt | copy SSL deploy script template: diff --git a/tasks/main.yml b/tasks/main.yml index 88668267..0b3fea42 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,4 +1,4 @@ -# tasks file for haproxy +# tasks file --- - name: check version support fail: diff --git a/tests/test.yml b/tests/test.yml index 6db93075..c2fbb9f2 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -1,4 +1,4 @@ -# test file for haproxy +# test file --- - hosts: localhost connection: local diff --git a/tests/vagrant.yml b/tests/vagrant.yml index 039838ee..38089226 100644 --- a/tests/vagrant.yml +++ b/tests/vagrant.yml @@ -1,4 +1,4 @@ -# test file for haproxy +# test file --- - hosts: all remote_user: vagrant diff --git a/tests/vars/main.yml b/tests/vars/main.yml index f9425bb6..4fa73428 100644 --- a/tests/vars/main.yml +++ b/tests/vars/main.yml @@ -1,4 +1,4 @@ -# vars file for haproxy +# vars file --- # global parameters haproxy_global_raw_options: diff --git a/vars/main.yml b/vars/main.yml index 049ad2d2..169053a2 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,4 +1,4 @@ -# vars file for haproxy +# vars file --- haproxy_versions_supported: - '1.5'