modules/filterserver/manifests/init.pp - Issue 29527816: #2762 - Fix provisioning of geoip to filter servers

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments.

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Side by Side Diff: modules/filterserver/manifests/init.pp

Issue 29527816: #2762 - Fix provisioning of geoip to filter servers (Closed)

Patch Set: Created Aug. 25, 2017, 5:51 p.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

OLD	NEW
1 class filterserver($is_default = false) {	1 class filterserver($is_default = false) {

2	2

3 include adblockplus::web	3 include adblockplus::web

4 include nginx	4 include nginx

	5 include geoip

5	6

6 user {'subscriptionstat':	7 user {'subscriptionstat':

7 ensure => absent,	8 ensure => absent,

8 }	9 }

9	10

10 user {'rsync':	11 user {'rsync':

11 ensure => present,	12 ensure => present,

12 comment => 'Filter list mirror user',	13 comment => 'Filter list mirror user',

13 home => '/home/rsync',	14 home => '/home/rsync',

14 managehome => true	15 managehome => true

(...skipping 75 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
90 File['/home/rsync/.ssh/id_rsa'],	91 File['/home/rsync/.ssh/id_rsa'],

91 User['rsync']	92 User['rsync']

92 ],	93 ],

93 command => 'rsync -e "ssh -o CheckHostIP=no" -ltprz --delete rsync@filtermas ter.adblockplus.org:. /var/www/easylist/',	94 command => 'rsync -e "ssh -o CheckHostIP=no" -ltprz --delete rsync@filtermas ter.adblockplus.org:. /var/www/easylist/',

94 environment => hiera('cron::environment', []),	95 environment => hiera('cron::environment', []),

95 user => rsync,	96 user => rsync,

96 hour => '*',	97 hour => '*',

97 minute => '2-52/10'	98 minute => '2-52/10'

98 }	99 }

99 }	100 }

OLD	NEW