From d21c3e07822e2a34668068ace4e24b4f97e60863 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Mon, 13 Jun 2016 17:03:55 +0200
Subject: [PATCH] Improve initial setup
---
tasks/buildcerts.yml | 2 ++
tasks/install.yml | 2 --
tasks/main.yml | 16 ++++++++--------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/tasks/buildcerts.yml b/tasks/buildcerts.yml
index d2e6450..a119b53 100644
--- a/tasks/buildcerts.yml
+++ b/tasks/buildcerts.yml
@@ -7,3 +7,5 @@
dest='/etc/haproxy/certs/{{ item.domain }}.pem'
regexp='(fullchain)|(privkey)\.pem'
with_items: '{{ proxy_certificates_letsencrypt|default([]) }}'
+ notify:
+ - "Proxy | Restart HAProxy"
diff --git a/tasks/install.yml b/tasks/install.yml
index e6f8ad2..fd74a69 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -17,8 +17,6 @@
- haproxy
- hatop
- socat
- - php5
- - php5-mysql
- name: "Proxy | create directories"
file:
diff --git a/tasks/main.yml b/tasks/main.yml
index 23205e0..41b46dd 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -5,6 +5,14 @@
set_fact: role_haproxy_started=true
tags: always
+- block:
+
+ - include: install.yml
+ - include: configure.yml
+ tags: Config
+
+ when: '"haproxy" not in excluded_roles'
+
- block:
- name: "Install Certs"
@@ -21,11 +29,3 @@
tags: Certs
when: '"letsencrypt" not in excluded_roles'
-
-- block:
-
- - include: install.yml
- - include: configure.yml
- tags: Config
-
- when: '"haproxy" not in excluded_roles'
--
GitLab