Issue 3638 - Generate statsmaster filter mirror configuration with concat

modules/statsmaster/templates/sitescripts.ini.erb

-<%
-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
 mirror_download4=download ssh://stats@download4.adblockplus.org/access_log_downloads.1.gz
 mirror_download5=download ssh://stats@download5.adblockplus.org/access_log_downloads.1.gz
 mirror_update1=update ssh://stats@update1.adblockplus.org/access_log_update.1.gz
 
 baseURL_subscription=https://easylist-downloads.adblockplus.org/
 baseURL_download=https://downloads.adblockplus.org/
 baseURL_update=https://update.adblockplus.org/
 baseURL_notification=https://notification.adblockplus.org/
 
 dataDirectory=/var/www/statsdata
 outputDirectory=/var/www/stats
 
 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 addressing, are we still
following this policy or we should just fix this kind of things when we find
them? If not, let's create a ticket to fix the styles and stuff like this.

[mathias, 2016/12/12 11:02:56]

Actually, it is not an unrelated change. I wanted the concat::fragments that are
appended to be spaced from the initial content by a single line.