diff --git a/code/.travis.yml b/.travis.yml similarity index 100% rename from code/.travis.yml rename to .travis.yml diff --git a/CHANGELOG b/CHANGELOG index 805f7a9..46ca206 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +2017-07-07 Frederic Schaer + * change how certs are managed to restart Xrootd services if they change 2016-05-31 Frederic Schaer * completed support for CentOS7 * xrootd service restarted if certificate updated diff --git a/manifests/params.pp b/manifests/params.pp index dba956c..861ae8e 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -72,6 +72,6 @@ $pss_setopt = undef $oss_statlib = undef $oss_localroot = undef - $certificate= '/etc/grid-security/hostcert.pem' + $certificate = '/etc/grid-security/hostcert.pem' $key = '/etc/grid-security/hostkey.pem' } diff --git a/manifests/service.pp b/manifests/service.pp index 17864cf..3def0e9 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -5,7 +5,7 @@ $xrootd_instances = undef, $cmsd_instances = undef, $certificate = $xrootd::params::certificate, - $key = $xrootd::params::key + $key = $xrootd::params::key, ) inherits xrootd::params { Class[xrootd::config] -> Class[xrootd::service] @@ -16,20 +16,8 @@ $files = File[$sysconfigfile, $configfile] } - if $certificate != undef and $key != undef { - if ! defined(File[$certificate]) { - file{$certificate: - ensure => present - } - } - if ! defined(File[$key]) { - file{$key: - ensure => present - } - } - $certificates_files = File[$certificate, $key] - } - + $certificates_files = File[$certificate,$key] + if $::operatingsystemmajrelease and ($::operatingsystemmajrelease + 0) >= 7 { if $xrootd_instances == undef { diff --git a/metadata.json b/metadata.json index ab6cfb4..9879d31 100644 --- a/metadata.json +++ b/metadata.json @@ -19,5 +19,5 @@ "source": "https://github.com/cern-it-sdc-id/puppet-xrootd", "summary": "This module installs and configure a xrootd server", "tags": [], - "version": "0.2.1" + "version": "0.2.2" }