diff --git a/modules/openstack_project/files/cacti/apache.conf b/modules/openstack_project/files/cacti/apache.conf new file mode 100644 index 0000000000..361facfa30 --- /dev/null +++ b/modules/openstack_project/files/cacti/apache.conf @@ -0,0 +1,30 @@ +# ************************************ +# Managed by Puppet +# ************************************ + +Alias /cacti /usr/share/cacti/site + +RewriteEngine on +RewriteRule ^/$ /cacti/graph_view.php [R,L] + + + Options +FollowSymLinks + AllowOverride None + order allow,deny + allow from all + + AddType application/x-httpd-php .php + + + php_flag magic_quotes_gpc Off + php_flag short_open_tag On + php_flag register_globals Off + php_flag register_argc_argv On + php_flag track_vars On + # this setting is necessary for some locales + php_value mbstring.func_overload 0 + php_value include_path . + + + DirectoryIndex index.php + diff --git a/modules/openstack_project/manifests/cacti.pp b/modules/openstack_project/manifests/cacti.pp index 473865dc8e..f1574b1707 100644 --- a/modules/openstack_project/manifests/cacti.pp +++ b/modules/openstack_project/manifests/cacti.pp @@ -11,10 +11,23 @@ class openstack_project::cacti ( include apache + a2mod { 'rewrite': + ensure => present, + } + package { 'cacti': ensure => present, } + file { '/etc/apache2/conf-available/cacti.conf': + ensure => present, + source => 'puppet:///modules/openstack_project/cacti/apache.conf', + mode => '0644', + owner => 'root', + group => 'root', + require => Package['cacti'], + } + file { '/usr/local/share/cacti/resource/snmp_queries': ensure => directory, owner => 'root',