modules/web/manifests/server.pp - Issue 5778562212691968: Added redirects for legacy URLs to eyeo.com configuration and added host name aliases

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/web/manifests/server.pp

Issue 5778562212691968: Added redirects for legacy URLs to eyeo.com configuration and added host name aliases (Closed)

Patch Set: Created Jan. 14, 2014, 10:41 a.m.

Left:
Right:

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

Jump to:

OLD	NEW
1 class web::server($vhost, $repository, $multiplexer_locations = undef) {	1 class web::server(

	2 $vhost,

	3 $repository,

	4 $is_default = false,

	5 $aliases = undef,

	6 $custom_config = undef,

	7 $multiplexer_locations = undef) {

2 File {	8 File {

3 owner => 'root',	9 owner => 'root',

4 group => 'root',	10 group => 'root',

5 mode => 0644,	11 mode => 0644,

6 }	12 }

7	13

8 Cron {	14 Cron {

9 environment => ['MAILTO=admin@adblockplus.org', 'PYTHONPATH=/opt/sitescripts '],	15 environment => ['MAILTO=admin@adblockplus.org', 'PYTHONPATH=/opt/sitescripts '],

10 }	16 }

11	17

(...skipping 70 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
82 mode => 755,	88 mode => 755,

83 }	89 }

84	90

85 cron {'update_repo':	91 cron {'update_repo':

86 ensure => present,	92 ensure => present,

87 command => "hg pull -q -R /home/www/${repository} && python -m sitescripts.c ms.bin.generate_static_pages /home/www/${repository} /var/www/${vhost}",	93 command => "hg pull -q -R /home/www/${repository} && python -m sitescripts.c ms.bin.generate_static_pages /home/www/${repository} /var/www/${vhost}",

88 user => www,	94 user => www,

89 minute => '*/10',	95 minute => '*/10',

90 }	96 }

91 }	97 }

OLD	NEW