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

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
andrea-manzi committed Sep 17, 2019
2 parents 7660f7e + 752869e commit 965519a
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
2019-09-16 Petr Vokac <petr.vokac@cern.ch>
* fix deprecation warnings
2018-06-04 Andrea Manzi <andrea.manzi@cern.ch>
* more fixes for C7
2018-01-18 Andrea Manzi <andrea.manzi@cern.ch>
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This is the puppet-xrootd module, it configures the Xrootd server and it's a dep
ASL 2.0

### Contact
Andrea Manzi <andrea.manzi@cern.ch>
DPM devel <dpm-devel-cern@cern.ch>

## Support
Tickets and issues at our [cern-it-sdc-id site](https://github.com/cern-it-sdc-id)
Tickets and issues at our [Jira](https://its.cern.ch/jira/projects/LCGDM/)
2 changes: 1 addition & 1 deletion manifests/service.pp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

$certificates_files = File[$certificate,$key]

if $::operatingsystemmajrelease and ($::operatingsystemmajrelease + 0) >= 7 {
if versioncmp($facts['os']['release']['major'], '7') >= 0 {

if $xrootd_instances == undef {
fail("xrootd_instances parameter should not be empty")
Expand Down
4 changes: 2 additions & 2 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
"license": "Apache License, Version 2.0",
"name": "lcgdm-xrootd",
"operatingsystem_support": [],
"project_page": "https://svnweb.cern.ch/trac/lcgdm",
"project_page": "http://lcgdm.web.cern.ch/dpm",
"requirements": [],
"source": "https://github.com/cern-it-sdc-id/puppet-xrootd",
"summary": "This module installs and configure a xrootd server",
"tags": [],
"version": "0.2.6"
"version": "0.2.7"
}

0 comments on commit 965519a

Please sign in to comment.