Skip to content

Commit 3d01fb9

Browse files
author
ivan
committed
Remove trailing whitespace
1 parent 5d7f27e commit 3d01fb9

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

doc/howto/config.rst

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ attribute_map_dir
6161
Format::
6262

6363
"attribute_map_dir": "attribute-maps"
64-
64+
6565
Points to a directory which has the attribute maps in Python modules.
6666
A typical map file will looks like this::
6767

@@ -91,9 +91,9 @@ The *to* and *fro* sub-dictionaries then contain the mapping between the names.
9191

9292
As you see the format is again a python dictionary where the key is the
9393
name to convert from, and the value is the name to convert to.
94-
95-
Since *to* in most cases is the inverse of the *fro* file, the
96-
software allowes you to only specify one of them and it will
94+
95+
Since *to* in most cases is the inverse of the *fro* file, the
96+
software allowes you to only specify one of them and it will
9797
automatically create the other.
9898

9999
cert_file
@@ -109,11 +109,11 @@ This is the public part of the service private/public key pair.
109109
contact_person
110110
^^^^^^^^^^^^^^
111111

112-
This is only used by *make_metadata.py* when it constructs the metadata for
112+
This is only used by *make_metadata.py* when it constructs the metadata for
113113
the service described by the configuration file.
114114
This is where you describe who can be contacted if questions arise
115115
about the service or if support is needed. The possible types are according to
116-
the standard **technical**, **support**, **administrative**, **billing**
116+
the standard **technical**, **support**, **administrative**, **billing**
117117
and **other**.::
118118

119119
contact_person: [{
@@ -179,9 +179,9 @@ a file accessible on the server the service runs on, or somewhere on the net.::
179179
}],
180180
},
181181

182-
The above configuration means that the service should read two local
182+
The above configuration means that the service should read two local
183183
metadata files, and on top of that load one from the net. To verify the
184-
authenticity of the file downloaded from the net, the local copy of the
184+
authenticity of the file downloaded from the net, the local copy of the
185185
public key should be used.
186186
This public key must be acquired by some out-of-band method.
187187

@@ -198,16 +198,16 @@ Where you describe the organization responsible for the service.::
198198
}
199199

200200
.. note:: You can specify the language of the name, or the language used on
201-
the webpage, by entering a tuple, instead of a simple string,
201+
the webpage, by entering a tuple, instead of a simple string,
202202
where the second part is the language code. If you don't specify a
203203
language the default is "en" (English).
204204

205205
service
206206
^^^^^^^
207207

208-
Which services the server will provide; those are combinations of "idp", "sp"
208+
Which services the server will provide; those are combinations of "idp", "sp"
209209
and "aa".
210-
So if a server is a Service Provider (SP) then the configuration
210+
So if a server is a Service Provider (SP) then the configuration
211211
could look something like this::
212212

213213
"service": {
@@ -225,7 +225,7 @@ could look something like this::
225225
},
226226
}
227227
},
228-
228+
229229
There are two options common to all services: 'name' and 'endpoints'.
230230
The remaining options are specific to one or the other of the service types.
231231
Which one is specified along side the name of the option.
@@ -312,17 +312,17 @@ An example might be::
312312
}
313313
}
314314
}
315-
316-
*lifetime*
317-
This is the maximum amount of time before the information should be
318-
regarded as stale. In an Assertion this is represented in the NotOnOrAfter
319-
attribute.
315+
316+
*lifetime*
317+
This is the maximum amount of time before the information should be
318+
regarded as stale. In an Assertion this is represented in the NotOnOrAfter
319+
attribute.
320320
*attribute_restrictions*
321321
By default there is no restrictions as to which attributes should be
322-
return. Instead all the attributes and values that are gathered by the
322+
return. Instead all the attributes and values that are gathered by the
323323
database backends will be returned if nothing else is stated.
324324
In the example above the SP with the entity identifier
325-
"urn:mace:umu.se:saml:roland:sp"
325+
"urn:mace:umu.se:saml:roland:sp"
326326
has an attribute restriction: only the attributes
327327
'givenName' and 'surName' are to be returned. There is no limitations as to
328328
what values on these attributes that can be returned.
@@ -332,7 +332,7 @@ An example might be::
332332
the friendly name, and the saml attribute name will be taken from the uri/oid
333333
defined in the attribute map.
334334

335-
If restrictions on values are deemed necessary those are represented by
335+
If restrictions on values are deemed necessary those are represented by
336336
regular expressions.::
337337

338338
"service": {
@@ -380,7 +380,7 @@ idp
380380

381381
Defines the set of IdPs that this SP is allowed to use; if unset, all listed
382382
IdPs may be used. If set, then the value is expected to be a list with entity
383-
identifiers for the allowed IdPs.
383+
identifiers for the allowed IdPs.
384384
A typical configuration, when the allowed set of IdPs are limited, would look
385385
something like this::
386386

@@ -404,7 +404,7 @@ Example::
404404
"optional_attributes": ["title"],
405405
}
406406
}
407-
407+
408408
Since the attribute names used here are the user friendly ones an attribute map
409409
must exist, so that the server can use the full name when communicating
410410
with other servers.
@@ -422,7 +422,7 @@ Example::
422422
}
423423
}
424424

425-
Again as for *optional_attributes* the names given are expected to be
425+
Again as for *optional_attributes* the names given are expected to be
426426
the user friendly names.
427427

428428
want_assertions_signed
@@ -444,7 +444,7 @@ Example::
444444

445445

446446
idp/aa/sp
447-
^^^^^^^^^
447+
^^^^^^^^^
448448

449449
If the configuration is covering both two or three different service types
450450
(like if one server is actually acting as both an IdP and a SP) then in some
@@ -516,7 +516,7 @@ Example::
516516
subject_data
517517
""""""""""""
518518

519-
The name of a database where the map between a local identifier and
519+
The name of a database where the map between a local identifier and
520520
a distributed identifier is kept. By default this is a shelve database.
521521
So if you just specify name, then a shelve database with that name
522522
is created. On the other hand if you specify a tuple then the first
@@ -548,8 +548,8 @@ Gives information about common identifiers for virtual_organizations::
548548
},
549549

550550
Keys in this dictionary are the identifiers for the virtual organizations.
551-
The arguments per organization are 'nameid_format' and 'common_identifier'.
552-
Useful if all the IdPs and AAs that are involved in a virtual organization
551+
The arguments per organization are 'nameid_format' and 'common_identifier'.
552+
Useful if all the IdPs and AAs that are involved in a virtual organization
553553
have common attribute values for users that are part of the VO.
554554

555555
Complete example
@@ -622,9 +622,9 @@ A slightly more complex configuration::
622622
"key_file" : "./mykey.pem",
623623
"cert_file" : "./mycert.pem",
624624
"xmlsec_binary" : "/usr/local/bin/xmlsec1",
625-
"metadata" : {
625+
"metadata" : {
626626
"local": ["example.xml"],
627-
"remote": [{
627+
"remote": [{
628628
"url":"https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=saml2",
629629
"cert":"kalmar2.pem"}]
630630
},
@@ -640,9 +640,9 @@ A slightly more complex configuration::
640640
"type": "technical",
641641
}]
642642
}
643-
644-
Uses metadata files, both local and remote, and will talk to whatever
645-
IdP that appears in any of the metadata files.
643+
644+
Uses metadata files, both local and remote, and will talk to whatever
645+
IdP that appears in any of the metadata files.
646646

647647
Other considerations
648648
::::::::::::::::::::

0 commit comments

Comments
 (0)