manifests/webserver.pp - Issue 4810150141493248: Issue 122 - Puppet ENC via Hiera

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: manifests/webserver.pp

Issue 4810150141493248: Issue 122 - Puppet ENC via Hiera (Closed)

Patch Set: 112 - Puppet ENC via Hiera Created Oct. 8, 2014, 3:02 a.m.

Left:
Right:

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

Jump to:

OLD	NEW
1 node 'web1' {	1 node 'web1' {

2 include base, statsclient	2 include statsclient

3	3

4 class {'web::server':	4 class {'web::server':

5 vhost => 'eyeo.com',	5 vhost => 'eyeo.com',

6 certificate => 'eyeo.com_sslcert.pem',	6 certificate => 'eyeo.com_sslcert.pem',

7 private_key => 'eyeo.com_sslcert.key',	7 private_key => 'eyeo.com_sslcert.key',

8 is_default => true,	8 is_default => true,

9 aliases => ['www.eyeo.com', 'eyeo.de', 'www.eyeo.de'],	9 aliases => ['www.eyeo.com', 'eyeo.de', 'www.eyeo.de'],

10 custom_config => '	10 custom_config => '

11 rewrite ^(/de)?/index\.html$ / permanent;	11 rewrite ^(/de)?/index\.html$ / permanent;

12 rewrite ^(/de)?/job\.html$ /jobs permanent;	12 rewrite ^(/de)?/job\.html$ /jobs permanent;

13 ',	13 ',

14 repository => 'web.eyeo.com',	14 repository => 'web.eyeo.com',

15 multiplexer_locations => ['/formmail'],	15 multiplexer_locations => ['/formmail'],

16 }	16 }

17	17

18 concat::fragment {'formmail_template':	18 concat::fragment {'formmail_template':

19 target => '/etc/sitescripts.ini',	19 target => '/etc/sitescripts.ini',

20 content => '[DEFAULT]	20 content => '[DEFAULT]

21 mailer=/usr/sbin/sendmail	21 mailer=/usr/sbin/sendmail

22 [multiplexer]	22 [multiplexer]

23 sitescripts.formmail.web.formmail =	23 sitescripts.formmail.web.formmail =

24 [formmail]	24 [formmail]

25 template=formmail/template/eyeo.mail',	25 template=formmail/template/eyeo.mail',

26 }	26 }

27

28 class {'nagios::client':

29 server_address => 'monitoring.adblockplus.org'

30 }

31 }	27 }

OLD	NEW