← Back to branch summary

~dave-cheney/juju-core/063-set-development-version-to-1.9.5

« back to all changes in this revision

Viewing changes to environs/config/config.go

  • Committer: Dave Cheney
  • Date: 2012-12-18 01:24:11 UTC
  • Revision ID: david.cheney@canonical.com-20121218012411-2cfiorrt14vdfl28
add ssl-hostname-verification

Show diffs side-by-side

added added

removed removed

Lines of Context:
environs/config/config.go
237
237
        return n
238
238
}
239
239
 
240
 
// Development returns whether the environment is in development
241
 
// mode.
 
240
// Development returns whether the environment is in development mode.
242
241
func (c *Config) Development() bool {
243
242
        return c.m["development"].(bool)
244
243
}
245
244
 
 
245
// SSLHostnameVerification returns weather the environment has requested
 
246
// SSL hostname verification to be enabled.
 
247
func (c *Config) SSLHostnameVerification() bool {
 
248
        return c.m["ssl-hostname-verification"].(bool)
 
249
}
 
250
 
246
251
// UnknownAttrs returns a copy of the raw configuration attributes
247
252
// that are supposedly specific to the environment type. They could
248
253
// also be wrong attributes, though. Only the specific environment
274
279
}
275
280
 
276
281
var fields = schema.Fields{
277
 
        "type":                 schema.String(),
278
 
        "name":                 schema.String(),
279
 
        "default-series":       schema.String(),
280
 
        "authorized-keys":      schema.String(),
281
 
        "authorized-keys-path": schema.String(),
282
 
        "firewall-mode":        schema.String(),
283
 
        "agent-version":        schema.String(),
284
 
        "development":          schema.Bool(),
285
 
        "admin-secret":         schema.String(),
286
 
        "ca-cert":              schema.String(),
287
 
        "ca-cert-path":         schema.String(),
288
 
        "ca-private-key":       schema.String(),
289
 
        "ca-private-key-path":  schema.String(),
 
282
        "type":                      schema.String(),
 
283
        "name":                      schema.String(),
 
284
        "default-series":            schema.String(),
 
285
        "authorized-keys":           schema.String(),
 
286
        "authorized-keys-path":      schema.String(),
 
287
        "firewall-mode":             schema.String(),
 
288
        "agent-version":             schema.String(),
 
289
        "development":               schema.Bool(),
 
290
        "admin-secret":              schema.String(),
 
291
        "ca-cert":                   schema.String(),
 
292
        "ca-cert-path":              schema.String(),
 
293
        "ca-private-key":            schema.String(),
 
294
        "ca-private-key-path":       schema.String(),
 
295
        "ssl-hostname-verification": schema.Bool(),
290
296
}
291
297
 
292
298
var defaults = schema.Defaults{
293
 
        "default-series":       version.Current.Series,
294
 
        "authorized-keys":      "",
295
 
        "authorized-keys-path": "",
296
 
        "firewall-mode":        FwDefault,
297
 
        "agent-version":        schema.Omit,
298
 
        "development":          false,
299
 
        "admin-secret":         "",
300
 
        "ca-cert":              schema.Omit,
301
 
        "ca-cert-path":         "",
302
 
        "ca-private-key":       schema.Omit,
303
 
        "ca-private-key-path":  "",
 
299
        "default-series":            version.Current.Series,
 
300
        "authorized-keys":           "",
 
301
        "authorized-keys-path":      "",
 
302
        "firewall-mode":             FwDefault,
 
303
        "agent-version":             schema.Omit,
 
304
        "development":               false,
 
305
        "admin-secret":              "",
 
306
        "ca-cert":                   schema.Omit,
 
307
        "ca-cert-path":              "",
 
308
        "ca-private-key":            schema.Omit,
 
309
        "ca-private-key-path":       "",
 
310
        "ssl-hostname-verification": true,
304
311
}
305
312
 
306
313
var checker = schema.FieldMap(fields, defaults)