diff --git a/CHANGELOG.md b/CHANGELOG.md index 69e639e..937686d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,35 +1,38 @@ # Change Log Release notes for the claranet/puppet-varnish module. ------------------------------------------ +## 4.1.2 - 2017-10-12 + * Fixing syntax error in previous release + ## 4.1.1 - 2017-10-12 * Varnish 4+ requires passing multiple listen interfaces by specifying multiple `-a` flags, not a single comma-separated value. * Various Puppet 3 fixes ## 4.1.0 - 2017-10-10 * New parameter: `varnish::instance_name` - allows setting Varnish's instance name - fixes [#44](https://github.com/claranet/puppet-varnish/issues/44) * Parameter `listen` now accepts an array to set multiple listen interfaces - fixes [#33](https://github.com/claranet/puppet-varnish/issues/33) ## 4.0.0 - 2017-10-04 * Major version increase after module move to Claranet GitHub org * Adds Varnish 5 support (5.0, 5.1 and 5.2) * Removes old repository and moves to Pacakgecloud * Default Varnish version changed to 4.1 for all OS families * Systemd service set up depending on Varnish/OS version ## 3.0.0 - 2015-07-20 * Add support for Debian Wheezy + Jessie * Fix Varnish vcl_reload command ## 2.4.1 - 2015-06-25 * Relax puppetlabs-apt version dependency because of librarian issues ## 2.4.0 - 2015-06-12 * Added support for Ubuntu 14.04 * Passing secret is now optional (but still supported) ## 2.3.0 - 2015-04-13 * Added support for Ubuntu 12.04 * Improved tests for Varnish 4 on EL6 diff --git a/manifests/config.pp b/manifests/config.pp index f28c3a6..9ea5481 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -1,53 +1,52 @@ # == Class varnish::config # # This class is called from varnish # class varnish::config { if versioncmp("${::varnish::version_major}.${::varnish::version_minor}",'4.1') >= 0 { $jail_opt = '-j unix,user=varnish,ccgroup=varnish' } else { $jail_opt = '-u varnish -g varnish' } # Deploy Varnish 4+ SELinux hack on RHEL6 if $::osfamily == 'RedHat' and $::operatingsystemmajrelease == '6' and $::varnish::version_major != '3' { if $::selinux_current_mode == 'enforcing' { ::selinux::module { 'varnishpol': - ensure => present, - source_te => 'puppet:///modules/varnish/varnishpol.te', - builder => 'simple', - before => Service[$::varnish::service_name], - notify => Service[$::varnish::service_name], + ensure => present, + source => 'puppet:///modules/varnish/varnishpol.te', + before => Service[$::varnish::service_name], + notify => Service[$::varnish::service_name], } } } file { $::varnish::params::sysconfig: owner => 'root', group => 'root', mode => '0644', content => template('varnish/sysconfig.erb'), } if $::varnish::params::service_provider == 'systemd' { file { '/etc/systemd/system/varnish.service': ensure => file, owner => 'root', group => 'root', mode => '0644', content => template('varnish/varnish.service.erb'), notify => Exec['varnish_systemctl_daemon_reload'], } exec { 'varnish_systemctl_daemon_reload': command => '/bin/systemctl daemon-reload', refreshonly => true, require => File['/etc/systemd/system/varnish.service'], notify => Service[$::varnish::service_name], } } } diff --git a/metadata.json b/metadata.json index 24f3e5f..cc7f3e2 100644 --- a/metadata.json +++ b/metadata.json @@ -1,47 +1,47 @@ { "name" : "claranet-varnish", - "version" : "4.1.1", + "version" : "4.1.2", "source" : "https://github.com/claranet/puppet-varnish", "author" : "Claranet", "license" : "Apache-2.0", "summary" : "Install and configure Varnish Cache", "description" : "Install and configure Varnish Cache", "project_page" : "https://github.com/claranet/puppet-varnish", "issues_url" : "https://github.com/claranet/puppet-varnish/issues", "tags" : [ "varnish", "cache", "http" ], "operatingsystem_support": [ { "operatingsystem": "RedHat", "operatingsystemrelease": [ "6", "7" ] }, { "operatingsystem": "CentOS", "operatingsystemrelease": [ "6", "7" ] }, { "operatingsystem": "OracleLinux", "operatingsystemrelease": [ "6", "7" ] }, { "operatingsystem": "Scientific", "operatingsystemrelease": [ "6", "7" ] }, { "operatingsystem": "Ubuntu", "operatingsystemrelease": [ "14.04", "16.04" ] }, { "operatingsystem": "Debian", "operatingsystemrelease": [ "7", "8" ] } ], "requirements": [ { "name": "puppet", "version_requirement": ">= 3.8.7" } ], "dependencies": [ { "name": "stahnma/epel", "version_requirement": ">= 1.2.0 < 2.0.0" }, { "name": "puppet/selinux", "version_requirement": ">= 0.8.0 < 1.0.0" }, { "name": "puppetlabs/apt", "version_requirement": ">= 2.0.0 < 3.0.0" }, { "name": "puppetlabs/stdlib", "version_requirement": ">=1.0.0 < 5.0.0" } ] }