Skip to content

Commit 6c736b2

Browse files
authored
Merge pull request #430 from ghoneycutt/param_spelling
Param spelling
2 parents 9aa4487 + f09ed29 commit 6c736b2

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

REFERENCE.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717

1818
### Data types
1919

20-
* [`Ssh::Key::Type`](#Ssh--Key--Type): From https://github.com/puppetlabs/puppetlabs-sshkeys_core/blob/master/lib/puppet/type/sshkey.rb v1.0.2
21-
* [`Ssh::Log_level`](#Ssh--Log_level)
22-
* [`Ssh::Permit_root_login`](#Ssh--Permit_root_login): 'without-password' is a deprecated alias for 'prohibit-password'
20+
* [`Ssh::Key::Type`](#Ssh--Key--Type): validate SSH key types
21+
* [`Ssh::Log_level`](#Ssh--Log_level): validate SSH log levels
22+
* [`Ssh::Permit_root_login`](#Ssh--Permit_root_login): validate configuration options for permit_root_login
2323
* [`Ssh::Ssh_Config`](#Ssh--Ssh_Config): ssh_config configuration file parameters
2424
* [`Ssh::Sshd_Config`](#Ssh--Sshd_Config): sshd_config configuration file parameters
25-
* [`Ssh::Syslog_facility`](#Ssh--Syslog_facility)
26-
* [`Ssh::Yes_no`](#Ssh--Yes_no)
25+
* [`Ssh::Syslog_facility`](#Ssh--Syslog_facility): validate syslog facilities used by SSH
26+
* [`Ssh::Yes_no`](#Ssh--Yes_no): validate SSH configuration that uses yes/no.
2727

2828
## Classes
2929

@@ -2653,7 +2653,7 @@ Alias of `Enum['ssh-dss', 'ssh-ed25519', 'ssh-rsa', 'ecdsa-sha2-nistp256', 'ecds
26532653

26542654
### <a name="Ssh--Log_level"></a>`Ssh::Log_level`
26552655

2656-
The Ssh::Log_level data type.
2656+
validate SSH log levels
26572657

26582658
Alias of `Enum['QUIET', 'FATAL', 'ERROR', 'INFO', 'VERBOSE', 'DEBUG', 'DEBUG1', 'DEBUG2', 'DEBUG3']`
26592659

@@ -2848,7 +2848,7 @@ Struct[{
28482848
Optional['PermitRootLogin'] => Ssh::Permit_root_login,
28492849
Optional['PermitTTY'] => Ssh::Yes_no,
28502850
Optional['PermitTunnel'] => Enum['yes', 'point-to-point', 'ethernet', 'no'],
2851-
Optional['PermitUserEnvironmen'] => String[1],
2851+
Optional['PermitUserEnvironment'] => String[1],
28522852
Optional['PermitUserRC'] => Ssh::Yes_no,
28532853
Optional['PerSourceMaxStartups'] => String[1],
28542854
Optional['PerSourceNetBlockSize'] => String[1],
@@ -2885,13 +2885,13 @@ Struct[{
28852885

28862886
### <a name="Ssh--Syslog_facility"></a>`Ssh::Syslog_facility`
28872887

2888-
The Ssh::Syslog_facility data type.
2888+
validate syslog facilities used by SSH
28892889

28902890
Alias of `Enum['DAEMON', 'USER', 'AUTH', 'LOCAL0', 'LOCAL1', 'LOCAL2', 'LOCAL3', 'LOCAL4', 'LOCAL5', 'LOCAL6', 'LOCAL7', 'AUTHPRIV']`
28912891

28922892
### <a name="Ssh--Yes_no"></a>`Ssh::Yes_no`
28932893

2894-
The Ssh::Yes_no data type.
2894+
validate SSH configuration that uses yes/no.
28952895

28962896
Alias of `Enum['yes', 'no']`
28972897

metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
}
9898
],
9999
"description": "Manage SSH",
100-
"pdk-version": "3.0.0",
100+
"pdk-version": "3.3.0",
101101
"template-url": "https://github.com/tailored-automation/pdk-templates#main",
102-
"template-ref": "heads/main-0-g53868f7"
102+
"template-ref": "heads/main-0-g8e0611a"
103103
}

spec/defines/config_file_server_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ class { 'ssh::server':
145145
'PermitRootLogin' => 'prohibit-password',
146146
'PermitTTY' => 'yes',
147147
'PermitTunnel' => 'point-to-point',
148-
'PermitUserEnvironmen' => 'test',
148+
'PermitUserEnvironment' => 'test',
149149
'PermitUserRC' => 'yes',
150150
'PerSourceMaxStartups' => 'test',
151151
'PerSourceNetBlockSize' => 'test',
@@ -251,7 +251,7 @@ class { 'ssh::server':
251251
|PermitRootLogin prohibit-password
252252
|PermitTTY yes
253253
|PermitTunnel point-to-point
254-
|PermitUserEnvironmen test
254+
|PermitUserEnvironment test
255255
|PermitUserRC yes
256256
|PerSourceMaxStartups test
257257
|PerSourceNetBlockSize test

spec/type_aliases/sshd_config_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@
262262
'Banner', 'CASignatureAlgorithms', 'ChannelTimeout', 'ChrootDirectory', 'Ciphers', 'DenyGroups', 'DenyUsers',
263263
'ForceCommand', 'HostbasedAcceptedAlgorithms', 'HostCertificate', 'HostKey', 'HostKeyAgent', 'HostKeyAlgorithms',
264264
'Include', 'IPQoS', 'KexAlgorithms', 'ListenAddress', 'LogVerbose', 'MACs', 'Match', 'MaxStartups', 'PermitListen',
265-
'PermitOpen', 'PermitUserEnvironmen', 'PerSourceMaxStartups', 'PerSourceNetBlockSize', 'PidFile', 'PubkeyAcceptedAlgorithms',
265+
'PermitOpen', 'PermitUserEnvironment', 'PerSourceMaxStartups', 'PerSourceNetBlockSize', 'PidFile', 'PubkeyAcceptedAlgorithms',
266266
'RekeyLimit', 'RevokedKeys', 'RDomain', 'SetEnv', 'Subsystem', 'TrustedUserCAKeys', 'VersionAddendum', 'XAuthLocation'
267267
].each do |directive|
268268
describe directive.inspect do

types/sshd_config.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
Optional['PermitRootLogin'] => Ssh::Permit_root_login,
7070
Optional['PermitTTY'] => Ssh::Yes_no,
7171
Optional['PermitTunnel'] => Enum['yes', 'point-to-point', 'ethernet', 'no'],
72-
Optional['PermitUserEnvironmen'] => String[1],
72+
Optional['PermitUserEnvironment'] => String[1],
7373
Optional['PermitUserRC'] => Ssh::Yes_no,
7474
Optional['PerSourceMaxStartups'] => String[1],
7575
Optional['PerSourceNetBlockSize'] => String[1],

0 commit comments

Comments
 (0)