From 66683c244fc1e9e900ee8fbd064c490a262930fa Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Thu, 5 May 2016 11:16:23 +0200
Subject: [PATCH] General improvements
---
defaults/main.yml | 5 +++++
tasks/uninstallv1.yml | 2 +-
templates/etc-apache2-sites-available-sd-agent | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/defaults/main.yml b/defaults/main.yml
index 08bd2ab..12b16e8 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -21,3 +21,8 @@ sd_agent_plugins_dir: '/usr/share/python/sd-agent/checks.d/plugins'
sd_plugins_files_dir: "{{ playbook_dir }}/files/sd-plugins"
sd_uninstallv1: no
+
+apache_conf_dir: 'conf.d'
+apache_conf_ext: ''
+
+mysql_root_password: 'root'
diff --git a/tasks/uninstallv1.yml b/tasks/uninstallv1.yml
index c567f1e..d1982d9 100644
--- a/tasks/uninstallv1.yml
+++ b/tasks/uninstallv1.yml
@@ -14,7 +14,7 @@
state=absent
# Remove /usr/bin/sd-agent
-- name: "ServerDensity | Create Plugins Directory"
+- name: "ServerDensity | Remove Plugins Directory"
file:
dest=/usr/bin/sd-agent
state=absent
diff --git a/templates/etc-apache2-sites-available-sd-agent b/templates/etc-apache2-sites-available-sd-agent
index 75396b9..3c227ca 100644
--- a/templates/etc-apache2-sites-available-sd-agent
+++ b/templates/etc-apache2-sites-available-sd-agent
@@ -1,5 +1,5 @@
<VirtualHost *:80>
- Include /etc/apache2/conf-available/global-redirect.conf
+ Include /etc/apache2/{{ apache_conf_dir }}/global-redirect.conf
ServerName {{ inventory_hostname }}
<Location /server-status>
--
GitLab