From 37418a347417bdb978c560434f1c91a56de28648 Mon Sep 17 00:00:00 2001 From: Fabio Alessandro Locati Date: Thu, 1 Dec 2016 10:50:56 +0000 Subject: Native YAML (#3593) --- univention/udm_dns_record.py | 10 ++++++---- univention/udm_dns_zone.py | 11 +++++++---- univention/udm_group.py | 15 +++++++++------ univention/udm_share.py | 9 +++++---- univention/udm_user.py | 33 ++++++++++++++++++--------------- 5 files changed, 45 insertions(+), 33 deletions(-) (limited to 'univention') diff --git a/univention/udm_dns_record.py b/univention/udm_dns_record.py index dab1e134..5d29b2c3 100644 --- a/univention/udm_dns_record.py +++ b/univention/udm_dns_record.py @@ -81,10 +81,12 @@ options: EXAMPLES = ''' # Create a DNS record on a UCS -- udm_dns_zone: name=www - zone=example.com - type=host_record - data=['a': '192.0.2.1'] +- udm_dns_zone: + name: www + zone: example.com + type: host_record + data: + - a: 192.0.2.1 ''' diff --git a/univention/udm_dns_zone.py b/univention/udm_dns_zone.py index baf844b5..dd576f4e 100644 --- a/univention/udm_dns_zone.py +++ b/univention/udm_dns_zone.py @@ -103,10 +103,13 @@ options: EXAMPLES = ''' # Create a DNS zone on a UCS -- udm_dns_zone: zone=example.com - type=forward_zone - nameserver=['ucs.example.com'] - interfaces=['192.0.2.1'] +- udm_dns_zone: + zone: example.com + type: forward_zone + nameserver: + - ucs.example.com + interfaces: + - 192.0.2.1 ''' diff --git a/univention/udm_group.py b/univention/udm_group.py index 588c7655..1db030ef 100644 --- a/univention/udm_group.py +++ b/univention/udm_group.py @@ -74,16 +74,19 @@ options: EXAMPLES = ''' # Create a POSIX group -- udm_group: name=g123m-1A +- udm_group: + name: g123m-1A # Create a POSIX group with the exact DN # C(cn=g123m-1A,cn=classes,cn=students,cn=groups,ou=school,dc=school,dc=example,dc=com) -- udm_group: name=g123m-1A - subpath='cn=classes,cn=students,cn=groups' - ou=school +- udm_group: + name: g123m-1A + subpath: 'cn=classes,cn=students,cn=groups' + ou: school # or -- udm_group: name=g123m-1A - position='cn=classes,cn=students,cn=groups,ou=school,dc=school,dc=example,dc=com' +- udm_group: + name: g123m-1A + position: 'cn=classes,cn=students,cn=groups,ou=school,dc=school,dc=example,dc=com' ''' diff --git a/univention/udm_share.py b/univention/udm_share.py index fa863995..2f7febfd 100644 --- a/univention/udm_share.py +++ b/univention/udm_share.py @@ -375,10 +375,11 @@ options: EXAMPLES = ''' # Create a share named home on the server ucs.example.com with the path /home. -- udm_share: name=home - path=/home - host=ucs.example.com - sambaName=Home +- udm_share: + name: home + path: /home + host: ucs.example.com + sambaName: Home ''' diff --git a/univention/udm_user.py b/univention/udm_user.py index 2eed02a2..ecd6e865 100644 --- a/univention/udm_user.py +++ b/univention/udm_user.py @@ -318,25 +318,28 @@ options: EXAMPLES = ''' # Create a user on a UCS -- udm_user: name=FooBar - password=secure_password - firstname=Foo - lastname=Bar +- udm_user: + name: FooBar + password: secure_password + firstname: Foo + lastname: Bar # Create a user with the DN # C(uid=foo,cn=teachers,cn=users,ou=school,dc=school,dc=example,dc=com) -- udm_user: name=foo - password=secure_password - firstname=Foo - lastname=Bar - ou=school - subpath='cn=teachers,cn=users' +- udm_user: + name: foo + password: secure_password + firstname: Foo + lastname: Bar + ou: school + subpath: 'cn=teachers,cn=users' # or define the position -- udm_user: name=foo - password=secure_password - firstname=Foo - lastname=Bar - position='cn=teachers,cn=users,ou=school,dc=school,dc=example,dc=com' +- udm_user: + name: foo + password: secure_password + firstname: Foo + lastname: Bar + position: 'cn=teachers,cn=users,ou=school,dc=school,dc=example,dc=com' ''' -- cgit v1.2.1