modules/filterserver/manifests/init.pp - Issue 29481626: #1980 - Introduce class adblockplus::web

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 29481626: #1980 - Introduce class adblockplus::web (Closed)

Patch Set: Created July 6, 2017, 11:49 a.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 nginx	4 include nginx

4	5

5 if !defined(File['/var/www']) {

6 file {'/var/www':

7 ensure => directory,

8 owner => nginx,

9 mode => '0755',

10 require => User['nginx']

11 }

12 }

13

14 user {'subscriptionstat':	6 user {'subscriptionstat':

15 ensure => absent,	7 ensure => absent,

16 }	8 }

17	9

18 user {'rsync':	10 user {'rsync':

19 ensure => present,	11 ensure => present,

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

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

22 managehome => true	14 managehome => true

23 }	15 }

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

99 User['rsync']	91 User['rsync']

100 ],	92 ],

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

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

103 user => rsync,	95 user => rsync,

104 hour => '*',	96 hour => '*',

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

106 }	98 }

107 }	99 }

OLD	NEW