Skip to content

Commit a057b6a

Browse files
authored
Merge pull request #7 from ploperations/release-prep
2.0.0 release prep
2 parents 2b6110d + 98d0c82 commit a057b6a

4 files changed

Lines changed: 93 additions & 58 deletions

File tree

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
documentation=$(pdk bundle exec puppet strings generate --format markdown)
3333
if [ $(echo $documentation | grep -Ec "[1-9]+ undocumented|\[warn\]") -gt 0 ]; then
3434
echo "Please resolve documentation issues detected below:"
35-
echo $documentation
35+
echo "$documentation"
3636
exit 1
3737
fi
3838
if output=$(git status --porcelain) && [ ! -z "$output" ]; then

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
44

5+
## [2.0.0](https://github.com/ploperations/ploperations-ssl/tree/2.0.0) (2021-09-18)
6+
7+
[Full Changelog](https://github.com/ploperations/ploperations-ssl/compare/1.0.0...2.0.0)
8+
9+
### Changed
10+
11+
- Dropped old Puppet versions, added new ones, sync to current standards [\#6](https://github.com/ploperations/ploperations-ssl/pull/6) ([genebean](https://github.com/genebean))
12+
513
## [1.0.0](https://github.com/ploperations/ploperations-ssl/tree/1.0.0) (2020-03-02)
614

715
[Full Changelog](https://github.com/ploperations/ploperations-ssl/compare/132268db8eee957e11a9ac079f76386491065fd1...1.0.0)

REFERENCE.md

Lines changed: 83 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
11
# Reference
2+
23
<!-- DO NOT EDIT: This document was generated by Puppet Strings -->
34

45
## Table of Contents
56

6-
**Classes**
7+
### Classes
78

89
* [`ssl`](#ssl): Maintain SSL certs and private keys
910
* [`ssl::params`](#sslparams): Determine default parameters for ssl
1011

11-
**Defined types**
12+
### Defined types
1213

1314
* [`ssl::cert`](#sslcert): Deploy SSL certificates and keys in a couple of common formats
1415
* [`ssl::cert::haproxy`](#sslcerthaproxy): Install key and certs combination for HAProxy
1516
* [`ssl::cert::nginx`](#sslcertnginx): DEPRECATED
1617
* [`ssl::hashfile`](#sslhashfile): Create certificate hash file
1718

18-
**Functions**
19+
### Functions
1920

2021
* [`ssl::ensure_newline`](#sslensure_newline): Ensure there's a trailing newline
2122
* [`ssl::pem::join`](#sslpemjoin): Join certs and keys into a single PEM. Ensure the correct newlines exist.
2223

2324
## Classes
2425

25-
### ssl
26+
### <a name="ssl"></a>`ssl`
2627

2728
You can store SSL certs in your control repo. Simply create a profile and put
2829
the certs in its files directory. (Note that you don't actually have to create
@@ -44,37 +45,41 @@ ssl::keys:
4445
4546
#### Parameters
4647
47-
The following parameters are available in the `ssl` class.
48+
The following parameters are available in the `ssl` class:
49+
50+
* [`cert_source`](#cert_source)
51+
* [`keys`](#keys)
52+
* [`manage_ssl_dir`](#manage_ssl_dir)
4853

49-
##### `cert_source`
54+
##### <a name="cert_source"></a>`cert_source`
5055

5156
Data type: `String[1]`
5257

5358
Where to find cert files with the file() function.
5459

55-
##### `keys`
60+
##### <a name="keys"></a>`keys`
5661

5762
Data type: `Hash[String[1], String[1]]`
5863

5964
Private keys indexed by key names.
6065

61-
Default value: {}
66+
Default value: `{}`
6267

63-
##### `manage_ssl_dir`
68+
##### <a name="manage_ssl_dir"></a>`manage_ssl_dir`
6469

6570
Data type: `Boolean`
6671

6772
Enable or disable a file resource for the ssl directory
6873

69-
Default value: `true`
74+
Default value: ``true``
7075

71-
### ssl::params
76+
### <a name="sslparams"></a>`ssl::params`
7277

7378
Determine default parameters for ssl
7479

7580
## Defined types
7681

77-
### ssl::cert
82+
### <a name="sslcert"></a>`ssl::cert`
7883

7984
Deploy SSL certificates and keys in a couple of common formats
8085

@@ -99,59 +104,66 @@ ssl::cert { 'www.example.com': }
99104

100105
#### Parameters
101106

102-
The following parameters are available in the `ssl::cert` defined type.
107+
The following parameters are available in the `ssl::cert` defined type:
108+
109+
* [`key_name`](#key_name)
110+
* [`cert_dir`](#cert_dir)
111+
* [`key_dir`](#key_dir)
112+
* [`user`](#user)
113+
* [`group`](#group)
114+
* [`mode`](#mode)
103115

104-
##### `key_name`
116+
##### <a name="key_name"></a>`key_name`
105117

106118
Data type: `String[1]`
107119

108120
The name of the certificate
109121

110-
Default value: $title
122+
Default value: `$title`
111123

112-
##### `cert_dir`
124+
##### <a name="cert_dir"></a>`cert_dir`
113125

114126
Data type: `Optional[String[1]]`
115127

116128
The directory that certs are stored in. If no values is provided then the
117129
value from $ssl::cert_dir is used.
118130

119-
Default value: `undef`
131+
Default value: ``undef``
120132

121-
##### `key_dir`
133+
##### <a name="key_dir"></a>`key_dir`
122134

123135
Data type: `Optional[String[1]]`
124136

125137
The directory that certificate keys are stored in. If no values is provided
126138
then the value from $ssl::key_dir is used.
127139

128-
Default value: `undef`
140+
Default value: ``undef``
129141

130-
##### `user`
142+
##### <a name="user"></a>`user`
131143

132144
Data type: `String[1]`
133145

134146
The user to set as the owner of the generated files
135147

136-
Default value: 'root'
148+
Default value: `'root'`
137149

138-
##### `group`
150+
##### <a name="group"></a>`group`
139151

140152
Data type: `String[1]`
141153

142154
THe group to set as the owner of the generated files
143155

144-
Default value: '0'
156+
Default value: `'0'`
145157

146-
##### `mode`
158+
##### <a name="mode"></a>`mode`
147159

148160
Data type: `String[1]`
149161

150162
The file mode to be set on each generated file
151163

152-
Default value: '0640'
164+
Default value: `'0640'`
153165

154-
### ssl::cert::haproxy
166+
### <a name="sslcerthaproxy"></a>`ssl::cert::haproxy`
155167

156168
Install key and certs combination for HAProxy.
157169

@@ -182,49 +194,55 @@ ssl::cert::haproxy { 'www.example.com':
182194

183195
#### Parameters
184196

185-
The following parameters are available in the `ssl::cert::haproxy` defined type.
197+
The following parameters are available in the `ssl::cert::haproxy` defined type:
186198

187-
##### `key_name`
199+
* [`key_name`](#key_name)
200+
* [`path`](#path)
201+
* [`user`](#user)
202+
* [`group`](#group)
203+
* [`mode`](#mode)
204+
205+
##### <a name="key_name"></a>`key_name`
188206

189207
Data type: `String[1]`
190208

191209
The name of the certificate
192210

193-
Default value: $title
211+
Default value: `$title`
194212

195-
##### `path`
213+
##### <a name="path"></a>`path`
196214

197215
Data type: `Stdlib::Unixpath`
198216

199217
The full path of the certificate, including the certificate's name.
200218

201-
Default value: "/etc/haproxy/certs.d/${key_name}.crt"
219+
Default value: `"/etc/haproxy/certs.d/${key_name}.crt"`
202220

203-
##### `user`
221+
##### <a name="user"></a>`user`
204222

205223
Data type: `String[1]`
206224

207225
The user that owns the certificate
208226

209-
Default value: 'root'
227+
Default value: `'root'`
210228

211-
##### `group`
229+
##### <a name="group"></a>`group`
212230

213231
Data type: `String[1]`
214232

215233
The group that owns the certificate
216234

217-
Default value: '0'
235+
Default value: `'0'`
218236

219-
##### `mode`
237+
##### <a name="mode"></a>`mode`
220238

221239
Data type: `String[1]`
222240

223241
The file mode of the certificate file
224242

225-
Default value: '0400'
243+
Default value: `'0400'`
226244

227-
### ssl::cert::nginx
245+
### <a name="sslcertnginx"></a>`ssl::cert::nginx`
228246

229247
This is only here to simplify some of our legacy code.
230248

@@ -233,59 +251,66 @@ We recommend using `ssl::cert` and configuring NGINX to use the
233251

234252
#### Parameters
235253

236-
The following parameters are available in the `ssl::cert::nginx` defined type.
254+
The following parameters are available in the `ssl::cert::nginx` defined type:
255+
256+
* [`key_name`](#key_name)
257+
* [`cert_dir`](#cert_dir)
258+
* [`key_dir`](#key_dir)
259+
* [`user`](#user)
260+
* [`group`](#group)
261+
* [`mode`](#mode)
237262

238-
##### `key_name`
263+
##### <a name="key_name"></a>`key_name`
239264

240265
Data type: `String[1]`
241266

242267
The name of the certificate
243268

244-
Default value: $title
269+
Default value: `$title`
245270

246-
##### `cert_dir`
271+
##### <a name="cert_dir"></a>`cert_dir`
247272

248273
Data type: `Optional[String[1]]`
249274

250275
The directory that certs are stored in. If no values is provided then the
251276
value from $ssl::cert_dir is used.
252277

253-
Default value: `undef`
278+
Default value: ``undef``
254279

255-
##### `key_dir`
280+
##### <a name="key_dir"></a>`key_dir`
256281

257282
Data type: `Optional[String[1]]`
258283

259284
The directory that certificate keys are stored in. If no values is provided
260285
then the value from $ssl::key_dir is used.
261286

262-
Default value: `undef`
287+
Default value: ``undef``
263288

264-
##### `user`
289+
##### <a name="user"></a>`user`
265290

266291
Data type: `String[1]`
267292

268293
The user to set as the owner of the generated files
269294

270-
Default value: 'root'
295+
Default value: `'root'`
271296

272-
##### `group`
297+
##### <a name="group"></a>`group`
273298

274299
Data type: `String[1]`
275300

276301
THe group to set as the owner of the generated files
277302

278-
Default value: '0'
303+
Default value: `'0'`
279304

280-
##### `mode`
305+
##### <a name="mode"></a>`mode`
281306

282307
Data type: `String[1]`
283308

284309
The file mode to be set on each generated file
285310

286-
Default value: '0640'
311+
Default value: `'0640'`
287312

288-
### ssl::hashfile
313+
### <a name="sslhashfile"></a>`ssl::hashfile`
289314

290315
Create certificate hash file
291316

@@ -301,17 +326,19 @@ Create certificate hash file
301326

302327
#### Parameters
303328

304-
The following parameters are available in the `ssl::hashfile` defined type.
329+
The following parameters are available in the `ssl::hashfile` defined type:
330+
331+
* [`certdir`](#certdir)
305332

306-
##### `certdir`
333+
##### <a name="certdir"></a>`certdir`
307334

308335
Data type: `Stdlib::Unixpath`
309336

310337
The directory ssl certs are stored in
311338

312339
## Functions
313340

314-
### ssl::ensure_newline
341+
### <a name="sslensure_newline"></a>`ssl::ensure_newline`
315342

316343
Type: Puppet Language
317344

@@ -351,7 +378,7 @@ Data type: `String[0]`
351378

352379
A string to ensure ends with a new line (aka '\n')
353380

354-
### ssl::pem::join
381+
### <a name="sslpemjoin"></a>`ssl::pem::join`
355382

356383
Type: Puppet Language
357384

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ploperations-ssl",
3-
"version": "1.0.0",
3+
"version": "2.0.0",
44
"author": "ploperations",
55
"summary": "Manage SSL certificates and keys",
66
"license": "Apache-2.0",

0 commit comments

Comments
 (0)