Skip to content

Fixup of problematic language relics #476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gcoxmoz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixup of problematic language relics #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ For a more customized configuration:
```puppet
class { 'openldap::client':
base => 'dc=example,dc=com',
uri => ['ldap://ldap.example.com', 'ldap://ldap-master.example.com:666'],
uri => ['ldap://ldap.example.com', 'ldap://ldap-provider.example.com:666'],
tls_cacert => '/etc/ssl/certs/ca-certificates.crt',
}
```
Expand Down Expand Up @@ -91,12 +91,12 @@ openldap::server::globalconf { 'security':
}
```

Configuring multiple olc serverIDs for multiple master or mirror mode
Configuring multiple olc serverIDs for multiple provider or mirror mode

```puppet
openldap::server::globalconf { 'ServerID':
ensure => present,
value => { 'ServerID' => [ '1 ldap://master1.example.com', '2 ldap://master2.example.com' ] }
value => { 'ServerID' => [ '1 ldap://provider1.example.com', '2 ldap://provider2.example.com' ] }
}
```

Expand Down
4 changes: 2 additions & 2 deletions REFERENCE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1476,7 +1476,7 @@ Specifies the maximum number of entries to return from a search operation.

##### `syncrepl`

Specify the current database as a replica which is kept up-to-date with the master content by establishing the current slapd(8) as a replication consumer site running a syncrepl replication engine.
Specify the current database as a consumer which is kept up-to-date with the provider content by establishing the current slapd(8) as a replication consumer site running a syncrepl replication engine.

##### `syncusesubentry`

Expand All @@ -1488,7 +1488,7 @@ Specifies the maximum number of seconds (in real time) slapd will spend answerin

##### `updateref`

This directive is only applicable in a slave slapd. It specifies the URL to return to clients which submit update requests upon the replica.
This directive is only applicable in a replica (or shadow) slapd. It specifies the URL to return to clients which submit update requests upon the replica.

#### Parameters

Expand Down
4 changes: 2 additions & 2 deletions lib/puppet/type/openldap_database.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ def should_to_s(_newvalue)
end

newproperty(:updateref) do
desc 'This directive is only applicable in a slave slapd. It specifies the URL to return to clients which submit update requests upon the replica.'
desc 'This directive is only applicable in a replica (or shadow) slapd. It specifies the URL to return to clients which submit update requests upon the replica.'
end

newproperty(:lastbind, boolean: true) do
Expand Down Expand Up @@ -232,7 +232,7 @@ def insync?(is)
end

newproperty(:syncrepl, array_matching: :all) do
desc 'Specify the current database as a replica which is kept up-to-date with the master content by establishing the current slapd(8) as a replication consumer site running a syncrepl replication engine.'
desc 'Specify the current database as a consumer which is kept up-to-date with the provider content by establishing the current slapd(8) as a replication consumer site running a syncrepl replication engine.'
end

newproperty(:limits, array_matching: :all) do
Expand Down
Loading