Skip to content
This repository has been archived by the owner on Jul 24, 2018. It is now read-only.

Commit

Permalink
Unset 'provider' param on all 'archive' res; release v1.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
antoineco committed Dec 8, 2016
1 parent 0f3aaa1 commit 4d12e18
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 11 deletions.
10 changes: 8 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
###1.6.1

* Unset `provider` parameter on all `archive` resources (from `puppet-archive` module)
- quick and dirty workaround until [SERVER-94](https://tickets.puppetlabs.com/browse/SERVER-94) gets fixed
- **Warning:** may break behind a HTTP proxy (untested)

###1.6.0

* Configurable `web.xml` files
- **Warning** replaces `default_servlet` instance parameter
- **Warning:** replaces `default_servlet` instance parameter
- New `tomcat::web` defined type to manage `web.xml` files
- See `default_servlet*`, `jsp_servlet*`, `sessionconfig_sessiontimeout` and `welcome_file_list` parameters
* Update systemd unit, expect tomcat script path as set in latest available packages
- **Warning** check the current location of your tomcat startup script, especially if using an old OS package version
- **Warning:** check the current location of your tomcat startup script, especially if using an old OS package version
* Replace or remove calls to deprecated `validate_*` stdlib functions
* Add support for Fedora 25 and Amazon Linux 2016.09
* Drop support for Fedora 22
Expand Down
10 changes: 5 additions & 5 deletions manifests/extras.pp
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
}

Archive {
provider => 'curl',
extract => false,
require => File['global extras directory'],
cleanup => false,
notify => $notify_service
#provider => 'curl',
extract => false,
require => File['global extras directory'],
cleanup => false,
notify => $notify_service
}

archive {
Expand Down
2 changes: 1 addition & 1 deletion manifests/install/archive.pp
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
extract_path => $::tomcat::catalina_home_real,
extract_command => 'tar xf %s --strip-components=1',
creates => "${::tomcat::catalina_home_real}/LICENSE",
provider => 'curl'
#provider => 'curl'
}


Expand Down
4 changes: 2 additions & 2 deletions manifests/instance.pp
Original file line number Diff line number Diff line change
Expand Up @@ -648,8 +648,8 @@
}

Archive {
provider => 'curl',
notify => $notify_service
#provider => 'curl',
notify => $notify_service
}

if !defined(File['tomcat instances root']) {
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "aco-tomcat",
"summary": "Puppet module for Tomcat",
"author": "Antoine Cotten",
"version": "1.6.0",
"version": "1.6.1",
"license": "Apache-2.0",
"project_page": "https://github.com/antoineco/aco-tomcat",
"source": "git://github.com/antoineco/aco-tomcat.git",
Expand Down

0 comments on commit 4d12e18

Please sign in to comment.