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

Commit

Permalink
Drop dependency on fetchcrl module; fixes #4.
Browse files Browse the repository at this point in the history
  • Loading branch information
XMol committed Oct 16, 2018
1 parent dc7f5a4 commit 79e3813
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 27 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
2018-10-16 Xavier Mol <[email protected]>
* Drop dependency on fetchcrl -- ref issue #4
2016-10-31 Xavier Mol <[email protected]>
* Make the module agnostic towards the numerous xrootd parameters.
2016-08-23 Andrea Manzi <[email protected]>
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,6 @@ All of which have been explained before at least nonce.
This module does _not_ ensure that the xrootd package for installation can
be found. Administrators have to prepare the environment appropriately!

This module requires that a class 'fetchcrl' has been declared in the Puppet catalogue.

### License
ASL 2.0

Expand Down
9 changes: 1 addition & 8 deletions manifests/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,14 @@
$grid_security = $xrootd::params::grid_security,
) inherits xrootd::params {

exec {'run-fetchcrl-atleastonce':
path => '/bin:/usr/bin:/sbin:/usr/sbin',
command => 'fetch-crl',
unless => "ls -U ${grid_security}/certificates/*.r0",
require => Class['fetchcrl'],
}

ensure_resource('group', $xrootd_group_name, $xrootd_group)
ensure_resource('user', $xrootd_user_name, $xrootd_user)

File {
owner => $xrootd_user_name,
group => $xrootd_group_name,
}

file { [$configdir, $logdir, $spooldir, $all_pidpath]:
ensure => directory,
}
Expand Down
12 changes: 6 additions & 6 deletions manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
$xrootd_user = { gid => 'xrootd' }
$xrootd_group_name = 'xrootd'
$xrootd_group = { ensure => 'present' }
$configdir = "/etc/xrootd"
$logdir = "/var/log/xrootd"
$spooldir = "/var/spool/xrootd"
$all_pidpath = "/var/run/xrootd"
$configdir = '/etc/xrootd'
$logdir = '/var/log/xrootd'
$spooldir = '/var/spool/xrootd'
$all_pidpath = '/var/run/xrootd'

# Unlike the other *_instances_options, this is an array of hashes.
$xrootd_instances_options = [ {"default" => "-l ${logdir}/xrootd.log -c ${configdir}/xrootd-clustered.cfg -k fifo"} ]
$xrootd_instances_options = [ {'default' => "-l ${logdir}/xrootd.log -c ${configdir}/xrootd-clustered.cfg -k fifo"} ]
$cmsd_instances_options = undef # { "default" => "-l /var/log/xrootd/cmsd.log -c /etc/xrootd/xrootd-clustered.cfg -k fifo" }
$purd_instances_options = undef # { "default" => "-l /var/log/xrootd/purd.log -c /etc/xrootd/xrootd-clustered.cfg -k fifo" }
$xfrd_instances_options = undef # { "default" => "-l /var/log/xrootd/xfrd.log -c /etc/xrootd/xrootd-clustered.cfg -k fifo" }

$exports = undef

$daemon_corefile_limit = "unlimited"
$daemon_corefile_limit = 'unlimited'

$grid_security = '/etc/grid-security'
$certificate = "${grid_security}/hostcert.pem"
Expand Down
18 changes: 7 additions & 11 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
{
"author": "puppet",
"dependencies": [
{
"name": "puppet/fetchcrl",
"version_requirement": "\u003e\u003d 1.1.1"
},
{
"name": "puppetlabs/stdlib",
"version_requirement": "\u003e\u003d 2.0.0"
}
],
"description": "This module installs and configure a xrootd server",
"description": "This module installs and configures a xrootd server",
"license": "Apache License, Version 2.0",
"name": "lcgdm-xrootd",
"operatingsystem_support": [],
"project_page": "https://svnweb.cern.ch/trac/lcgdm",
"name": "gridka-xrootd",
"operatingsystem_support": [ "Scientific Linux 6", "CentOS7"],
"project_page": "http://www.gridka.de",
"requirements": [],
"source": "https://github.com/cern-it-sdc-id/puppet-xrootd",
"summary": "This module installs and configure a xrootd server",
"source": "https://github.com/KIT-SCC/gridka-xrootd",
"summary": "This module installs and configures a xrootd server",
"tags": [],
"version": "0.2.3"
"version": "0.3.0"
}

0 comments on commit 79e3813

Please sign in to comment.