diff --git a/data/defaults.yaml b/data/defaults.yaml --- a/data/defaults.yaml +++ b/data/defaults.yaml @@ -2648,12 +2648,8 @@ esnode3.internal.softwareheritage.org: id: 13 -stats_export::vhost::name: stats.export.softwareheritage.org -stats_export::vhost::docroot: "/var/www/%{hiera('stats_export::vhost::name')}" -stats_export::vhost::ssl_protocol: "%{hiera('apache::ssl_protocol')}" -stats_export::vhost::ssl_honorcipherorder: "%{hiera('apache::ssl_honorcipherorder')}" -stats_export::vhost::ssl_cipher: "%{hiera('apache::ssl_cipher')}" -stats_export::vhost::hsts_header: "%{hiera('apache::hsts_header')}" +stats_export::export_path: "/var/www/html/export" +stats_export::export_file: "%{hiera('stats_export::export_path')}/history_counters.json" postgresql::apt_config::pgdg::mirror: 'http://apt.postgresql.org/pub/repos/apt/' postgresql::apt_config::pgdg::keyid: B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 diff --git a/site-modules/profile/manifests/munin/master.pp b/site-modules/profile/manifests/munin/master.pp --- a/site-modules/profile/manifests/munin/master.pp +++ b/site-modules/profile/manifests/munin/master.pp @@ -8,6 +8,15 @@ extra_config => ["cgiurl_graph http://$master_hostname"], } + $export_path = lookup('stats_export::export_path') + + file {$export_path: + ensure => directory, + owner => 'root', + group => 'root', + mode => '0755', + } ~> Apache::Vhost[$master_hostname] + include ::profile::apache::common include ::apache::mod::rewrite include ::apache::mod::fcgid @@ -21,6 +30,7 @@ rewrite_rule => [ '^/favicon.ico /etc/munin/static/favicon.ico [L]', '^/static/(.*) /etc/munin/static/$1 [L]', + "^/export/(.*) ${export_path}/\$1 [L]", ], }, { diff --git a/site-modules/profile/manifests/munin/stats_export.pp b/site-modules/profile/manifests/munin/stats_export.pp --- a/site-modules/profile/manifests/munin/stats_export.pp +++ b/site-modules/profile/manifests/munin/stats_export.pp @@ -1,13 +1,7 @@ # stats_export master class class profile::munin::stats_export { - $vhost_name = lookup('stats_export::vhost::name') - $vhost_docroot = lookup('stats_export::vhost::docroot') - $vhost_ssl_protocol = lookup('stats_export::vhost::ssl_protocol') - $vhost_ssl_honorcipherorder = lookup('stats_export::vhost::ssl_honorcipherorder') - $vhost_ssl_cipher = lookup('stats_export::vhost::ssl_cipher') - $vhost_hsts_header = lookup('stats_export::vhost::hsts_header') - - $export_file = "${vhost_docroot}/history_counters.json" + $export_path = lookup('stats_export::export_path') + $export_file = lookup('stats_export::export_file') $packages = ['python3-click'] @@ -35,50 +29,6 @@ weekday => '*', require => [ File['/usr/local/bin/export-rrd'], - File[$vhost_docroot], - ], - } - - file {$vhost_docroot: - ensure => directory, - owner => 'www-data', - group => 'www-data', - mode => '0755', - } - - include ::profile::apache::common - include ::profile::ssl - - ::apache::vhost {"${vhost_name}_non-ssl": - servername => $vhost_name, - port => '80', - docroot => $vhost_docroot, - redirect_status => 'permanent', - redirect_dest => "https://${vhost_name}/", - } - - $ssl_cert_name = 'stats_export_softwareheritage_org' - $ssl_cert = $::profile::ssl::certificate_paths[$ssl_cert_name] - $ssl_chain = $::profile::ssl::chain_paths[$ssl_cert_name] - $ssl_key = $::profile::ssl::private_key_paths[$ssl_cert_name] - - ::apache::vhost {"${vhost_name}_ssl": - servername => $vhost_name, - port => '443', - ssl => true, - ssl_protocol => $vhost_ssl_protocol, - ssl_honorcipherorder => $vhost_ssl_honorcipherorder, - ssl_cipher => $vhost_ssl_cipher, - ssl_cert => $ssl_cert, - ssl_chain => $ssl_chain, - ssl_key => $ssl_key, - headers => [$vhost_hsts_header], - docroot => $vhost_docroot, - require => [ - File[$ssl_cert], - File[$ssl_chain], - File[$ssl_key], ], } - }