Unified Diff: modules/statsmaster/templates/sitescripts.ini.erb
Issue 29367240:
Issue 3638 - Generate statsmaster filter mirror configuration with concat (Closed)
Patch Set:
Created Dec. 12, 2016, 10 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« modules/adblockplus/manifests/host/statsmaster.pp ('k')
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: modules/statsmaster/templates/sitescripts.ini.erb |
| =================================================================== |
| --- a/modules/statsmaster/templates/sitescripts.ini.erb |
| +++ b/modules/statsmaster/templates/sitescripts.ini.erb |
| @@ -1,22 +1,7 @@ |
| -<% |
| -servers = scope.function_hiera('adblockplus::hosts', {}) |
| -filter_servers = servers.select { |hostname, record| record.fetch('role', nil) == 'filterserver' } |
| -fqdn = lambda { |hostname, record| record.fetch 'fqdn', "#{hostname}.adblockplus.org" } |
| --%> |
| [stats] |
| geoip_db=/usr/share/GeoIP/GeoIP.dat |
| geoipv6_db=/usr/share/GeoIP/GeoIPv6.dat |
| -# Subscription mirrors accumulated via Puppet |
| -<% filter_servers.each do |hostname, record| -%> |
| -mirror_<%= hostname %>=subscription ssh://stats@<%= fqdn.call(hostname, record) %>/access_log_easylist_downloads.1.gz |
| -<% end -%> |
| - |
| -# Notification mirrors accumulated via Puppet |
| -<% filter_servers.each do |hostname, record| -%> |
| -mirror_n_<%= hostname %>=notification ssh://stats@<%= fqdn.call(hostname, record) %>/access_log_notification.1.gz |
| -<% end -%> |
| - |
| mirror_download1=download ssh://stats@download1.adblockplus.org/access_log_downloads.1.gz |
| mirror_download2=download ssh://stats@download2.adblockplus.org/access_log_downloads.1.gz |
| mirror_download3=download ssh://stats@download3.adblockplus.org/access_log_downloads.1.gz |
| @@ -35,3 +20,4 @@ |
| mainPageTemplate=stats/template/main.html |
| fileOverviewTemplate=stats/template/fileOverview.html |
| filePageTemplate=stats/template/fileStats.html |
| + |
|
f.lopez
2016/12/12 10:21:52
This is an unrelated change for the ticket you are
mathias
2016/12/12 11:02:56
Actually, it is not an unrelated change. I wanted
|
« no previous file with comments
|
« modules/adblockplus/manifests/host/statsmaster.pp ('k')
|
no next file »
|
no next file with comments »
