Side by Side Diff: modules/statsmaster/templates/sitescripts.ini.erb
Issue 29366882:
Issue 3574 - Refactor Puppet class base into class adblockplus (Closed)
Patch Set: For comments 2 and 3
Created Dec. 6, 2016, 11:36 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« modules/private-stub/hiera/hosts.yaml ('K')
|
« modules/private-stub/hiera/hosts.yaml ('k')
|
no next file »
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 <% | 1 <% |
| 2 servers = scope.function_hiera('servers', {}) | 2 servers = scope.function_hiera('adblockplus::hosts', {}) |
| 3 filter_servers = servers.select { |hostname, record| record.fetch('role', nil) = = 'filterserver' } | 3 filter_servers = servers.select { |hostname, record| record.fetch('role', nil) = = 'filterserver' } |
| 4 fqdn = lambda { |hostname, record| record.fetch 'dns', "#{hostname}.adblockplus. org" } | 4 fqdn = lambda { |hostname, record| record.fetch 'dns', "#{hostname}.adblockplus. org" } |
| 5 -%> | 5 -%> |
| 6 [stats] | 6 [stats] |
| 7 geoip_db=/usr/share/GeoIP/GeoIP.dat | 7 geoip_db=/usr/share/GeoIP/GeoIP.dat |
| 8 geoipv6_db=/usr/share/GeoIP/GeoIPv6.dat | 8 geoipv6_db=/usr/share/GeoIP/GeoIPv6.dat |
| 9 | 9 |
| 10 # Subscription mirrors accumulated via Puppet | 10 # Subscription mirrors accumulated via Puppet |
| 11 <% filter_servers.each do |hostname, record| -%> | 11 <% filter_servers.each do |hostname, record| -%> |
| 12 mirror_<%= hostname %>=subscription ssh://stats@<%= fqdn.call(hostname, record) %>/access_log_easylist_downloads.1.gz | 12 mirror_<%= hostname %>=subscription ssh://stats@<%= fqdn.call(hostname, record) %>/access_log_easylist_downloads.1.gz |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 28 baseURL_download=https://downloads.adblockplus.org/ | 28 baseURL_download=https://downloads.adblockplus.org/ |
| 29 baseURL_update=https://update.adblockplus.org/ | 29 baseURL_update=https://update.adblockplus.org/ |
| 30 baseURL_notification=https://notification.adblockplus.org/ | 30 baseURL_notification=https://notification.adblockplus.org/ |
| 31 | 31 |
| 32 dataDirectory=/var/www/statsdata | 32 dataDirectory=/var/www/statsdata |
| 33 outputDirectory=/var/www/stats | 33 outputDirectory=/var/www/stats |
| 34 | 34 |
| 35 mainPageTemplate=stats/template/main.html | 35 mainPageTemplate=stats/template/main.html |
| 36 fileOverviewTemplate=stats/template/fileOverview.html | 36 fileOverviewTemplate=stats/template/fileOverview.html |
| 37 filePageTemplate=stats/template/fileStats.html | 37 filePageTemplate=stats/template/fileStats.html |
| OLD | NEW |
« modules/private-stub/hiera/hosts.yaml ('K')
|
« modules/private-stub/hiera/hosts.yaml ('k')
|
no next file »
|
no next file with comments »
