Skip to content

Commit 069b5ea

Browse files
committed
fully qualify ht_crypt & add testing dependencies
1 parent 0b61067 commit 069b5ea

File tree

3 files changed

+29
-3
lines changed

3 files changed

+29
-3
lines changed

.fixtures.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,9 @@
33
---
44
fixtures:
55
forge_modules:
6-
# stdlib: "puppetlabs/stdlib"
6+
stdlib: "puppetlabs/stdlib"
7+
apache: "puppetlabs/apache"
8+
htpasswd: "citrin/htpasswd"
9+
vcsrepo: "puppetlabs/vcsrepo"
10+
git: "puppetlabs/git"
11+
concat: "puppetlabs/concat"

manifests/viewer.pp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# A class to configure the diff viewer webservice. For full details, see
2+
# https://github.com/camptocamp/puppet-catalog-diff-viewer
13
class catalog_diff::viewer (
24
String $remote = 'https://github.com/camptocamp/puppet-catalog-diff-viewer.git',
35
String $password = 'puppet',
@@ -35,7 +37,7 @@
3537

3638
htpasswd { 'puppet':
3739
username => 'puppet',
38-
cryptpasswd => ht_crypt($password, $facts['dmi']['product']['uuid']),
40+
cryptpasswd => htpasswd::ht_crypt($password, $facts['dmi']['product']['uuid']),
3941
target => '/var/www/.htpasswd',
4042
}
4143

metadata.json

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,26 @@
88
"project_page": "https://github.com/voxpupuli/puppet-catalog_diff",
99
"issues_url": "https://github.com/voxpupuli/puppet-catalog_diff/issues",
1010
"dependencies": [
11-
11+
{
12+
"name": "puppetlabs/apache",
13+
"version_requirement": ">=6.0.0 < 8.0.0"
14+
},
15+
{
16+
"name": "citrin/htpasswd",
17+
"version_requirement": ">=1.0.0 < 2.0.0"
18+
},
19+
{
20+
"name": "puppetlabs/vcsrepo",
21+
"version_requirement": ">=4.0.0 < 6.0.0"
22+
},
23+
{
24+
"name": "puppetlabs/git",
25+
"version_requirement": ">=0.5.0 < 1.0.0"
26+
},
27+
{
28+
"name": "puppetlabs/concat",
29+
"version_requirement": ">=7.0.0 < 8.0.0"
30+
}
1231
],
1332
"operatingsystem_support": [
1433
{

0 commit comments

Comments
 (0)