diff --git a/inventory/group_vars/mirrorlist b/inventory/group_vars/mirrorlist index 8ca012acf1..12a30fb452 100644 --- a/inventory/group_vars/mirrorlist +++ b/inventory/group_vars/mirrorlist @@ -15,4 +15,6 @@ install_command: /usr/sbin/virt-install -n ${inventory_hostname} -r ${mem_size} # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file -tcp_ports: [ 80 ] \ No newline at end of file +tcp_ports: [ 80 ] +collectd_apache: true + diff --git a/tasks/collectd/client.yml b/tasks/collectd/client.yml index 7cd8238fbe..73395e3567 100644 --- a/tasks/collectd/client.yml +++ b/tasks/collectd/client.yml @@ -16,8 +16,8 @@ - restart collectd # install collectd-network config -- name: /etc/collectd.d/nework.conf - copy: src=$files/collectd/network-client.conf dest=/etc/collectd/network.conf +- name: /etc/collectd.d/network.conf + copy: src=$files/collectd/network-client.conf dest=/etc/collectd.d/network.conf notify: - restart collectd @@ -29,7 +29,7 @@ when_set: $collectd_apache - name: /etc/collectd/apache.conf - copy: src=$files/collectd/apache.conf dest=/etc/collectd/apache.conf + copy: src=$files/collectd/apache.conf dest=/etc/collectd.d/apache.conf notify: - restart collectd when_set: $collectd_apache diff --git a/tasks/mirrorlist.yml b/tasks/mirrorlist.yml index f15196df9e..ad0fa6e114 100644 --- a/tasks/mirrorlist.yml +++ b/tasks/mirrorlist.yml @@ -26,7 +26,7 @@ # nuke mirrormanager.conf so that it doesn't start up - name: kill /etc/httpd/conf.d/mirrrormanager.conf - copy: content="blanked on purpose" dest=/etc/httpd/conf.d/mirrormanager.conf + copy: 'content="#blanked on purpose" dest=/etc/httpd/conf.d/mirrormanager.conf' notify: - restart apache tags: