Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: modules/nginx/templates/logrotate.erb

Issue 29785567: #11294 - Generate and store anonymized HTTPd logs (Closed)
Left Patch Set: #11294 - Remove $adblockplus::web::server::geoip parameter Created June 5, 2018, 1:46 p.m.
Right Patch Set: #11294 - Include input MD5 sum with archive file names Created June 5, 2018, 2:29 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « modules/nginx/manifests/init.pp ('k') | modules/private-stub/hiera/base.yaml » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /var/log/nginx/<%= @log %> { 1 /var/log/nginx/<%= @log %> {
2 daily 2 daily
3 rotate 30 3 rotate 30
4 compress 4 compress
5 delaycompress 5 delaycompress
6 missingok 6 missingok
7 nodateext 7 nodateext
8 sharedscripts 8 sharedscripts
9 postrotate 9 postrotate
10 [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid` 10 [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid`
11 test ! -e /var/log/nginx/<%= @log %>.2.gz || \ 11 set -- <%= scope.function_shellquote([@log]) %>
12 zcat /var/log/nginx/<%= @log %>.2.gz \ 12 set -- "/var/log/nginx/$1.2.gz" "/var/log/archive/$1"
13 | /usr/local/bin/anonymize-access-log \ 13 [ ! -f "$1" ] || zcat "$1" | /usr/local/bin/anonymize-access-log \
14 --geolite2-db /usr/share/GeoIP/GeoLite2-Country.mmdb \ 14 --geolite2-db /usr/share/GeoIP/GeoLite2-Country.mmdb \
15 --salt <%= scope.function_shellquote([@log_salt]) %> \ 15 --salt <%= scope.function_shellquote([@log_salt]) %> \
16 | gzip -9 > /var/log/archive/<%= @log %>.`date +%Y-%m-%d`.gz 16 | gzip -9 >"$2.`date +%Y-%m-%d`.`md5sum \"$1\" | cut -d' ' -f1`.gz"
17 endscript 17 endscript
18 } 18 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld