diff --git a/.fixtures.yml b/.fixtures.yml index 2296adb..a03684d 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -2,5 +2,10 @@ # See https://github.com/puppetlabs/puppetlabs_spec_helper#using-fixtures for details --- fixtures: - forge_modules: -# stdlib: "puppetlabs/stdlib" + repositories: + stdlib: https://github.com/puppetlabs/puppetlabs-stdlib.git + apache: https://github.com/puppetlabs/puppetlabs-apache.git + htpasswd: https://github.com/citrininfo/puppet-htpasswd.git + vcsrepo: https://github.com/puppetlabs/puppetlabs-vcsrepo.git + git: https://github.com/puppetlabs-toy-chest/puppetlabs-git.git + concat: https://github.com/puppetlabs/puppetlabs-concat.git diff --git a/manifests/viewer.pp b/manifests/viewer.pp index d38b4e8..8cf2b55 100644 --- a/manifests/viewer.pp +++ b/manifests/viewer.pp @@ -1,5 +1,23 @@ +# @summary +# A class to configure the diff viewer webservice. For full details, see +# https://github.com/voxpupuli/puppet-catalog-diff-viewer +# +# @param remote +# The source git repository to fetch the catalog diff viewer tool from. +# +# @param password +# Specifiy the desired password to set for authentication into the viewer tool post installation. +# +# @param revision +# Specify the release or branch from the repository specified in $remote to utilize. +# +# @param port +# Specify the port to run the diff viewer tool on. +# +# @param listen_ip +# Specify what IP address apache should listen on for accessing the viewer tool. class catalog_diff::viewer ( - String $remote = 'https://github.com/camptocamp/puppet-catalog-diff-viewer.git', + String $remote = 'https://github.com/voxpupuli/puppet-catalog-diff-viewer.git', String $password = 'puppet', String $revision = 'master', Integer $port = 1495, @@ -35,7 +53,7 @@ htpasswd { 'puppet': username => 'puppet', - cryptpasswd => ht_crypt($password, $facts['dmi']['product']['uuid']), + cryptpasswd => htpasswd::ht_crypt($password, $facts['dmi']['product']['uuid']), target => '/var/www/.htpasswd', } diff --git a/metadata.json b/metadata.json index 198e895..258ac38 100644 --- a/metadata.json +++ b/metadata.json @@ -8,7 +8,26 @@ "project_page": "https://github.com/voxpupuli/puppet-catalog_diff", "issues_url": "https://github.com/voxpupuli/puppet-catalog_diff/issues", "dependencies": [ - + { + "name": "puppetlabs/apache", + "version_requirement": ">=6.0.0 < 8.0.0" + }, + { + "name": "citrin/htpasswd", + "version_requirement": ">=1.0.0 < 2.0.0" + }, + { + "name": "puppetlabs/vcsrepo", + "version_requirement": ">=4.0.0 < 6.0.0" + }, + { + "name": "puppetlabs/git", + "version_requirement": ">=0.5.0 < 1.0.0" + }, + { + "name": "puppetlabs/concat", + "version_requirement": ">=7.0.0 < 8.0.0" + } ], "operatingsystem_support": [ {