Skip to content
This repository has been archived by the owner on Oct 14, 2019. It is now read-only.

Commit

Permalink
change the cert management
Browse files Browse the repository at this point in the history
  • Loading branch information
andrea-manzi committed Jul 8, 2016
1 parent 18f12f1 commit f414352
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 17 deletions.
File renamed without changes.
2 changes: 2 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
2017-07-07 Frederic Schaer <[email protected]>
* change how certs are managed to restart Xrootd services if they change
2016-05-31 Frederic Schaer <[email protected]>
* completed support for CentOS7
* xrootd service restarted if certificate updated
Expand Down
2 changes: 1 addition & 1 deletion manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
18 changes: 3 additions & 15 deletions manifests/service.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

0 comments on commit f414352

Please sign in to comment.