diff --git a/defaults/main.yml b/defaults/main.yml index 08bd2ab01776841d1ee76e14cd0f4724a8567c5f..12b16e8ae3ab2b4f0afb13c78072525cec246cc6 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 c567f1e8019a22def3ec3a684da94cb7601359f3..d1982d903354112564722d0475ab8ff2d562ce0f 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 75396b913585d2bbb62b7ad06f9d7568181d51a6..3c227ca0962520c2b318f6bcfaf8b2e6970b7e02 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>