manifests/webserver.pp - Issue 29325543: Issue 2974 - Integrate facebook.adblockplus.me with 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 29325543: Issue 2974 - Integrate facebook.adblockplus.me with Hiera (Closed)

Patch Set: Created Sept. 2, 2015, 1:10 p.m.

Left:
Right:

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

Jump to:

View unified diff | Download patch

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

2 include 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 => '

(...skipping 106 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
117	117

118 class {'web::server':	118 class {'web::server':

119 vhost => 'youtube.adblockplus.me',	119 vhost => 'youtube.adblockplus.me',

120 certificate => 'youtube.adblockplus.me_sslcert.pem',	120 certificate => 'youtube.adblockplus.me_sslcert.pem',

121 private_key => 'youtube.adblockplus.me_sslcert.key',	121 private_key => 'youtube.adblockplus.me_sslcert.key',

122 is_default => true,	122 is_default => true,

123 repository => 'youtube.adblockplus.me',	123 repository => 'youtube.adblockplus.me',

124 }	124 }

125 }	125 }

126	126

127 node 'web-fb-abp-me-1' {

128 include statsclient

129

130 class {'web::server':

131 vhost => 'facebook.adblockplus.me',

132 certificate => 'facebook.adblockplus.me_sslcert.pem',

133 private_key => 'facebook.adblockplus.me_sslcert.key',

134 is_default => true,

135 repository => 'facebook.adblockplus.me',

136 }

137 }

138

139 node 'web-aa-org-1' {	127 node 'web-aa-org-1' {

140 include statsclient	128 include statsclient

141	129

142 class {'web::server':	130 class {'web::server':

143 vhost => 'acceptableads.org',	131 vhost => 'acceptableads.org',

144 certificate => 'acceptableads.org_sslcert.pem',	132 certificate => 'acceptableads.org_sslcert.pem',

145 private_key => 'acceptableads.org_sslcert.key',	133 private_key => 'acceptableads.org_sslcert.key',

146 is_default => true,	134 is_default => true,

147 repository => 'web.acceptableads.org',	135 repository => 'web.acceptableads.org',

148 }	136 }

149 }	137 }

OLD	NEW

« no previous file with comments | « hiera/roles/web/facebook.yaml ('k') | modules/private-stub/hiera/hosts.yaml » ('j') | no next file with comments »