Skip to content

Commit

Permalink
replace dependency puppet/wget with puppet/archive, closes #4
Browse files Browse the repository at this point in the history
  • Loading branch information
fraenki committed May 7, 2020
1 parent 6840742 commit fa90e39
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 20 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

### Changed
- Replace dependency puppet/wget with puppet/archive ([#4])

## [3.1.0] - 2020-04-20

### Changed
Expand Down Expand Up @@ -37,5 +40,6 @@ migrate from maestrodev/sonarqube to this version with only minor modifications.
[Unreleased]: https://github.com/markt-de/puppet-sonarqube/compare/v3.1.0...HEAD
[3.1.0]: https://github.com/markt-de/puppet-sonarqube/compare/v3.0.0...v3.1.0
[3.0.0]: https://github.com/markt-de/puppet-sonarqube/compare/v2.6.7...v3.0.0
[#4]: https://github.com/markt-de/puppet-sonarqube/pull/4
[#2]: https://github.com/markt-de/puppet-sonarqube/pull/2
[#1]: https://github.com/markt-de/puppet-sonarqube/pull/1
7 changes: 0 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,6 @@ The `sonarqube` class provides an easy way to configure security with LDAP, Crow
notify => Service['sonar'],
}


# Module Requirements

* puppet/wget
* maestrodev/maven (only if additional SonarQube plugins are needed to be installed)
* puppetlabs/stdlib

# Fork

This is a fork of maestrodev/puppet-sonarqube with the following PRs (partially) applied:
Expand Down
9 changes: 3 additions & 6 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@
group => $group,
}

# wget from https://github.com/maestrodev/puppet-wget
include wget

$package_name = 'sonarqube'

if $home != undef {
Expand Down Expand Up @@ -97,9 +94,9 @@
system => $user_system,
}
->
wget::fetch { 'download-sonar':
source => "${source_url}",
destination => $tmpzip,
archive { $tmpzip:
ensure => present,
source => $source_url,
}
->
# ===== Create folder structure =====
Expand Down
8 changes: 3 additions & 5 deletions manifests/runner/install.pp
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
$download_url,
$installroot,
) {
include wget

if ! defined(Package[unzip]) {
package { 'unzip':
ensure => present,
Expand All @@ -16,9 +14,9 @@

$tmpzip = "/usr/local/src/${package_name}-dist-${version}.zip"

wget::fetch { 'download-sonar-runner':
source => "${download_url}/${version}/sonar-runner-dist-${version}.zip",
destination => $tmpzip,
archive { $tmpzip:
ensure => present,
source => "${download_url}/${version}/sonar-runner-dist-${version}.zip",
} ->

file { "${installroot}/${package_name}-${version}":
Expand Down
4 changes: 2 additions & 2 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"issues_url": "https://github.com/markt-de/puppet-sonarqube/issues",
"dependencies": [
{
"name": "puppet/wget",
"version_requirement": ">=1.0.0 <3.0.0"
"name": "puppet/archive",
"version_requirement": ">=4.0.0 <5.0.0"
},
{
"name": "maestrodev/maven",
Expand Down

0 comments on commit fa90e39

Please sign in to comment.