Skip to content
This repository was archived by the owner on Mar 28, 2019. It is now read-only.

Commit 31f2111

Browse files
danieldreierdanieldreier
committed
Merge pull request #211 from tampakrap/server_config_cleanup2
more server config cleanup
2 parents 78edfcc + 51daf35 commit 31f2111

File tree

3 files changed

+143
-103
lines changed

3 files changed

+143
-103
lines changed

‎manifests/server.pp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
$bindaddress = '0.0.0.0',
136136
$ca = false,
137137
$config_version = '/usr/bin/git --git-dir $confdir/environments/$environment/.git rev-parse --short HEAD 2>/dev/null || echo',
138-
$dns_alt_names = undef,
138+
$dns_alt_names = [],
139139
$enc = '',
140140
$enc_exec = '',
141141
$ensure = 'present',
@@ -148,7 +148,6 @@
148148
$modulepath = [],
149149
$parser = undef,
150150
$manage_puppetdb = false,
151-
$report = true,
152151
$report_dir = $puppet::params::report_dir,
153152
$reportfrom = undef,
154153
$reports = ['store', 'https'],

‎manifests/server/config.pp‎

Lines changed: 142 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
$environmentpath_ensure = 'absent'
1919
}
2020

21-
if $puppet::server::basemodulepath {
21+
if ! empty($puppet::server::basemodulepath) {
2222
$basemodulepath_ensure = 'present'
2323
} else {
2424
$basemodulepath_ensure = 'absent'
@@ -41,7 +41,7 @@
4141
$manifest_ensure = 'absent'
4242
}
4343

44-
if $puppet::server::modulepath {
44+
if ! empty($puppet::server::modulepath) {
4545
$modulepath_ensure = 'present'
4646
} else {
4747
$modulepath_ensure = 'absent'
@@ -59,124 +59,180 @@
5959
$default_manifest_ensure = 'absent'
6060
}
6161

62-
ini_setting {
63-
'environmentpath':
64-
ensure => $environmentpath_ensure,
65-
setting => 'environmentpath',
66-
value => $puppet::server::environmentpath;
62+
ini_setting { 'environmentpath':
63+
ensure => $environmentpath_ensure,
64+
setting => 'environmentpath',
65+
value => $puppet::server::environmentpath,
66+
}
6767

68-
'basemodulepath':
69-
ensure => $basemodulepath_ensure,
70-
setting => 'basemodulepath',
71-
value => join(flatten([$puppet::server::basemodulepath]), ':');
68+
ini_setting { 'basemodulepath':
69+
ensure => $basemodulepath_ensure,
70+
setting => 'basemodulepath',
71+
value => join(flatten([$puppet::server::basemodulepath]), ':'),
72+
}
7273

73-
'default_manifest':
74-
ensure => $default_manifest_ensure,
75-
setting => 'default_manifest',
76-
value => $puppet::server::default_manifest;
74+
ini_setting { 'default_manifest':
75+
ensure => $default_manifest_ensure,
76+
setting => 'default_manifest',
77+
value => $puppet::server::default_manifest,
78+
}
7779

78-
'modulepath':
79-
ensure => $modulepath_ensure,
80-
setting => 'modulepath',
81-
value => join(flatten([$puppet::server::modulepath]), ':');
80+
ini_setting { 'modulepath':
81+
ensure => $modulepath_ensure,
82+
setting => 'modulepath',
83+
value => join(flatten([$puppet::server::modulepath]), ':'),
84+
}
8285

83-
'manifest':
84-
ensure => $manifest_ensure,
85-
setting => 'manifest',
86-
value => $puppet::server::manifest;
86+
ini_setting { 'manifest':
87+
ensure => $manifest_ensure,
88+
setting => 'manifest',
89+
value => $puppet::server::manifest,
90+
}
8791

88-
'config_version':
89-
ensure => $config_version_ensure,
90-
setting => 'config_version',
91-
value => $puppet::server::config_version;
92+
ini_setting { 'config_version':
93+
ensure => $config_version_ensure,
94+
setting => 'config_version',
95+
value => $puppet::server::config_version,
96+
}
9297

93-
'user':
94-
setting => 'user',
95-
value => $puppet::user;
96-
'group':
97-
setting => 'group',
98-
value => $puppet::group;
98+
ini_setting { 'user':
99+
setting => 'user',
100+
value => $puppet::user,
101+
}
102+
103+
ini_setting { 'group':
104+
setting => 'group',
105+
value => $puppet::group,
106+
}
107+
108+
ini_setting { 'stringify_facts_master':
109+
setting => 'stringify_facts',
110+
section => 'main',
111+
value => $puppet::server::stringify_facts,
99112
}
100113

101114
ini_setting { 'ca':
102115
setting => 'ca',
103116
value => $puppet::server::ca,
104117
}
105118

106-
if $puppet::server::servertype == 'standalone' {
107-
ini_setting { 'bindaddress':
108-
setting => 'bindaddress',
109-
value => $puppet::server::bindaddress,
110-
}
119+
if $puppet::server::servertype == 'standalone' and $puppet::server::bindaddress {
120+
$bindaddress_ensure = 'present'
121+
} else {
122+
$bindaddress_ensure = 'absent'
123+
}
124+
125+
ini_setting { 'bindaddress':
126+
ensure => $bindaddress_ensure,
127+
setting => 'bindaddress',
128+
value => $puppet::server::bindaddress,
111129
}
112130

113131
if $puppet::server::ssl_client_header {
114-
ini_setting {
115-
'ssl_client_header':
116-
setting => 'ssl_client_header',
117-
value => $puppet::server::ssl_client_header;
118-
'ssl_client_verify_header':
119-
setting => 'ssl_client_verify_header',
120-
value => $puppet::server::ssl_client_verify_header;
121-
}
132+
$ssl_client_ensure = 'present'
133+
} else {
134+
$ssl_client_ensure = 'absent'
122135
}
123136

124-
if $puppet::server::report {
125-
ini_setting {
126-
'master_report':
127-
setting => 'report',
128-
value => $puppet::server::report;
129-
'reporturl':
130-
setting => 'reporturl',
131-
value => $puppet::server::reporturl;
132-
}
137+
ini_setting { 'ssl_client_header':
138+
ensure => $ssl_client_ensure,
139+
setting => 'ssl_client_header',
140+
value => $puppet::server::ssl_client_header,
141+
}
142+
143+
ini_setting { 'ssl_client_verify_header':
144+
ensure => $ssl_client_ensure,
145+
setting => 'ssl_client_verify_header',
146+
value => $puppet::server::ssl_client_verify_header,
147+
}
148+
149+
if ! empty($puppet::server::reports) {
150+
$reports_ensure = 'present'
151+
} else {
152+
$reports_ensure = 'absent'
153+
}
154+
155+
ini_setting { 'reports':
156+
ensure => $reports_ensure,
157+
setting => 'reports',
158+
value => join(flatten([ $puppet::server::reports ]), ', '),
159+
}
160+
161+
if $puppet::server::reporturl {
162+
$reporturl_ensure = 'present'
163+
} else {
164+
$reporturl_ensure = 'absent'
165+
}
166+
167+
ini_setting { 'reporturl':
168+
ensure => $reporturl_ensure,
169+
setting => 'reporturl',
170+
value => $puppet::server::reporturl,
133171
}
134172

135173
if $puppet::server::reportfrom {
136-
ini_setting {
137-
'reportfrom':
138-
setting => 'reportfrom',
139-
value => $puppet::server::reportfrom;
140-
}
174+
$reportfrom_ensure = 'present'
175+
} else {
176+
$reportfrom_ensure = 'absent'
141177
}
142178

143-
unless empty($puppet::server::reports) {
144-
ini_setting { 'reports':
145-
setting => 'reports',
146-
value => join(flatten([ $puppet::server::reports ]), ', '),
147-
}
179+
ini_setting { 'reportfrom':
180+
ensure => $reportfrom_ensure,
181+
setting => 'reportfrom',
182+
value => $puppet::server::reportfrom,
148183
}
149184

150185
if $puppet::server::enc == 'exec' {
151-
ini_setting {
152-
'node_terminus':
153-
setting => 'node_terminus',
154-
value => 'exec';
155-
'external_nodes':
156-
setting => 'external_nodes',
157-
value => $puppet::server::enc_exec;
158-
}
186+
$enc_ensure = 'present'
187+
} else {
188+
$enc_ensure = 'absent'
189+
}
190+
191+
ini_setting { 'node_terminus':
192+
ensure => $enc_ensure,
193+
setting => 'node_terminus',
194+
value => 'exec',
195+
}
196+
197+
ini_setting { 'external_nodes':
198+
ensure => $enc_ensure,
199+
setting => 'external_nodes',
200+
value => $puppet::server::enc_exec,
159201
}
160202

161203
if $puppet::server::parser {
162-
ini_setting { 'parser':
163-
setting => 'parser',
164-
value => $puppet::server::parser,
165-
}
204+
$parser_ensure = 'present'
205+
} else {
206+
$parser_ensure = 'absent'
166207
}
167208

168-
if $puppet::server::dns_alt_names {
169-
ini_setting { 'dns_alt_names':
170-
setting => 'dns_alt_names',
171-
value => $puppet::server::dns_alt_names
172-
}
209+
ini_setting { 'parser':
210+
ensure => $parser_ensure,
211+
setting => 'parser',
212+
value => $puppet::server::parser,
213+
}
214+
215+
if ! empty($puppet::server::dns_alt_names) {
216+
$dns_alt_names_ensure = 'present'
217+
} else {
218+
$dns_alt_names_ensure = 'absent'
219+
}
220+
221+
ini_setting { 'dns_alt_names':
222+
ensure => $dns_alt_names_ensure,
223+
setting => 'dns_alt_names',
224+
value => join(flatten([ $puppet::server::dns_alt_names ]), ', ')
173225
}
174226

175227
if $puppet::server::autosign {
176-
ini_setting { 'autosign':
177-
setting => 'autosign',
178-
value => $puppet::server::autosign
179-
}
228+
$autosign_ensure = 'present'
229+
} else {
230+
$autosign_ensure = 'absent'
180231
}
181232

233+
ini_setting { 'autosign':
234+
ensure => $autosign_ensure,
235+
setting => 'autosign',
236+
value => $puppet::server::autosign,
237+
}
182238
}

‎manifests/server/unicorn.pp‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,6 @@
1111
Unicorn::App['puppetmaster'],
1212
],
1313
}
14-
Ini_setting {
15-
ensure => 'present',
16-
section => 'master',
17-
path => $puppet::params::puppet_conf,
18-
}
19-
ini_setting {
20-
'ssl_client_header':
21-
ensure => present,
22-
setting => 'ssl_client_header',
23-
value => 'HTTP_X_CLIENT_DN';
24-
'ssl_client_verify_header':
25-
ensure => present,
26-
setting => 'ssl_client_verify_header',
27-
value => 'HTTP_X_CLIENT_VERIFY';
28-
}
2914

3015
$servername = pick($::puppet::server::servername, $::clientcert, $::fqdn)
3116
$unicorn_socket = "unix:${puppet::params::puppet_rundir}/puppetmaster_unicorn.sock"

0 commit comments

Comments
 (0)