Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CHEF
cookbooks
cernvm-fs
Commits
389b137a
Commit
389b137a
authored
Dec 04, 2020
by
Christopher Huhn
Browse files
Merge branch 'master' into upstream_packages
parents
3f53c55f
0106ae90
Changes
8
Hide whitespace changes
Inline
Side-by-side
attributes/client.rb
View file @
389b137a
...
...
@@ -2,4 +2,6 @@ default[:cvmfs][:client][:default_local][:default_domain] = node['domain']
default
[
:cvmfs
][
:client
][
:default_local
][
:cache_base
]
=
'/var/cache/cvmfs'
default
[
:cvmfs
][
:client
][
:default_local
][
:quota_limit
]
=
20000
default
[
:cvmfs
][
:client
][
:default_local
][
:max_ttl
]
=
30
default
[
:cvmfs
][
:client
][
:config_d
]
=
Mash
.
new
default
[
'cvmfs'
][
'client'
][
'domain_d'
]
=
{}
default
[
'cvmfs'
][
'client'
][
'config_d'
]
=
{}
attributes/default.rb
View file @
389b137a
default
[
'cvmfs'
][
'version'
]
=
''
default
[
'cvmfs'
][
'keys'
]
=
{}
default
[
'cvmfs'
][
'client'
][
'package'
]
=
'cvmfs'
default
[
:cvmfs
][
:version
]
=
String
.
new
default
[
:cvmfs
][
:keys
]
=
Mash
.
new
metadata.rb
View file @
389b137a
name
"cernvm-fs"
maintainer
"
GSI
,
H
PC Department"
maintainer
'
GSI H
elmholtzzentrum fuer Schwerionenforschung GmbH'
maintainer_email
"hpc@gsi.de"
license
"Apache 2.0"
description
"Deploy and configure CernVM-FS clients and servers."
long_description
IO
.
read
(
File
.
join
(
File
.
dirname
(
__FILE__
),
'README.md'
))
version
"0.3.0"
source_url
'https://git.gsi.de:chef/cookbooks/cernvm-fs/'
issues_url
'https://git.gsi.de:chef/cookbooks/cernvm-fs/issues'
version
"0.4.0"
depends
"sys"
,
'>= 1.51.0'
depends
"apache2"
,
'< 6.0'
supports
"debian"
,
">= 7.0"
recipes/apt_repository.rb
View file @
389b137a
...
...
@@ -2,49 +2,34 @@
#
#
# # Deploy the APT key for `gsi-repository`
# sys_apt_key "Deploy APT key for the GSI package repository" do
# key <<KEY
# -----BEGIN PGP PUBLIC KEY BLOCK-----
# Version: GnuPG v1.4.12 (GNU/Linux)
# mQENBFidegQBCADOdF8kqd2KtAdc1kF5I/bvKpb9urStw93EKua6YoalYmCYMNfg
# x9pq9Np+dqr52ph/LN9AWICe3oHwUGRKU3vE9S15LXrKtgdmAYedEJKIliLt8H9i
# BZF2Ma0JK/Nk5mMzK0W1n2gcDEg1GmK+/XWYzKCMsdearrIU8LJ9+iQHBEydLJIO
# vqP2pvsGWxj5ogY9X+q23+ZzzHgH6SMIpwM+iKQa22bm1nHm8J9eWMJBKBFz1sX4
# dWQvhkY6NgUg6unGDWF+RLOJhT31fPMiEB4vB6tKXSI0PYHNLrpERgG8Sl4/EFdk
# ONHcfjmFnWbQ/X9udtRXwBmFvDNfZ0hYI41nABEBAAG0M0dTSSByZXBvc2l0b3J5
# IHNpZ25pbmcga2V5IDIwMTcgPGxpbnV4Z3JvdXBAZ3NpLmRlPokBPQQTAQgAJwUC
# WJ16BAIbAwUJCWYBgAULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRCrZFFowbvN
# DkGyCACtYMTeSuyls2PzbYOgO3PRnOCdG8D+iqwAvLI8BL8HNITobm9bIIwTslwu
# 0QvZc8Jb53LL1USF9uSmqCK0miHexH4Gaybc1WFM1o4xvqzneQlVOWyrq8oqKEB6
# wBuHEbpCi+9i8fIfnVbKd3r+IbE/9W5JcSmWDItywz7ei1v1/ZXb27/FgxgcPtnh
# CBgXEeEIL8s7SCM1CsR+d87sc7dIATBERK+nGVxTKwnQntWrqk5p2Oq3fJ0NU8kJ
# 3yHCZ0ll93J7lZLX4pCbdLdLPiw3/DMvR4QzqEuH0HnzBc52OdF/HJ4acM7adv0K
# TqAhv92xvOIhIXrSMzovp29qSkZP
# =O1Gt
# -----END PGP PUBLIC KEY BLOCK-----
# KEY
# end
# sys_apt_repository 'cvmfs' do
# config "deb\thttp://mirror.gsi.de/distrib/gsi-repository "\
# "#{node['lsb']['codename']} main"
# end
cvmfs_release_package_url
=
'https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest_all.deb'
cvmfs_release_package_file
=
::
File
.
join
(
Chef
::
Config
[
:file_cache_path
],
cvmfs_release_package_url
.
split
(
'/'
).
last
)
remote_file
cvmfs_release_package_file
do
source
cvmfs_release_package_url
package
'gnupg'
# Deploy the APT key for `gsi-repository`
sys_apt_key
"Deploy APT key for the GSI package repository"
do
key
<<
KEY
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.12 (GNU/Linux)
mQENBFidegQBCADOdF8kqd2KtAdc1kF5I/bvKpb9urStw93EKua6YoalYmCYMNfg
x9pq9Np+dqr52ph/LN9AWICe3oHwUGRKU3vE9S15LXrKtgdmAYedEJKIliLt8H9i
BZF2Ma0JK/Nk5mMzK0W1n2gcDEg1GmK+/XWYzKCMsdearrIU8LJ9+iQHBEydLJIO
vqP2pvsGWxj5ogY9X+q23+ZzzHgH6SMIpwM+iKQa22bm1nHm8J9eWMJBKBFz1sX4
dWQvhkY6NgUg6unGDWF+RLOJhT31fPMiEB4vB6tKXSI0PYHNLrpERgG8Sl4/EFdk
ONHcfjmFnWbQ/X9udtRXwBmFvDNfZ0hYI41nABEBAAG0M0dTSSByZXBvc2l0b3J5
IHNpZ25pbmcga2V5IDIwMTcgPGxpbnV4Z3JvdXBAZ3NpLmRlPokBPQQTAQgAJwUC
WJ16BAIbAwUJCWYBgAULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRCrZFFowbvN
DkGyCACtYMTeSuyls2PzbYOgO3PRnOCdG8D+iqwAvLI8BL8HNITobm9bIIwTslwu
0QvZc8Jb53LL1USF9uSmqCK0miHexH4Gaybc1WFM1o4xvqzneQlVOWyrq8oqKEB6
wBuHEbpCi+9i8fIfnVbKd3r+IbE/9W5JcSmWDItywz7ei1v1/ZXb27/FgxgcPtnh
CBgXEeEIL8s7SCM1CsR+d87sc7dIATBERK+nGVxTKwnQntWrqk5p2Oq3fJ0NU8kJ
3yHCZ0ll93J7lZLX4pCbdLdLPiw3/DMvR4QzqEuH0HnzBc52OdF/HJ4acM7adv0K
TqAhv92xvOIhIXrSMzovp29qSkZP
=O1Gt
-----END PGP PUBLIC KEY BLOCK-----
KEY
end
dpkg_package
cvmfs_release_package_file
do
notifies
:update
,
'apt_update[cvmfs-release]'
,
:immediately
sys_apt_repository
'cvmfs'
do
config
"deb
\t
http://mirror.gsi.de/distrib/gsi-repository "
\
"
#{
node
[
'lsb'
][
'codename'
]
}
main"
end
apt_update
'cvmfs-release'
recipes/client.rb
View file @
389b137a
...
...
@@ -2,7 +2,7 @@
# Cookbook Name:: cernvm-fs
# Recipe:: client
#
# Copyright 2013-20
19
GSI Helmholtzzentrum fuer Schwerionenforschung GmbH
# Copyright 2013-20
20
GSI Helmholtzzentrum fuer Schwerionenforschung GmbH
#
# Authors:
# Matteo Dessalvi <m.dessalvi@gsi.de>
...
...
@@ -74,20 +74,43 @@ template '/etc/cvmfs/default.local' do
)
end
directory
'/etc/cvmfs/config.d'
# Each repository needs its configuration file
unless
node
[
'cvmfs'
][
'client'
][
'config_d'
].
empty?
node
[
'cvmfs'
][
'client'
][
'config_d'
].
each
do
|
repo
,
config
|
#
# Domain configs:
#
directory
'/etc/cvmfs/domain.d'
node
[
'cvmfs'
][
'client'
][
'domain_d'
].
each
do
|
repo
,
attrs
|
# node attributes are strings
config
=
{
'http_proxy'
=>
'DIRECT'
}
config
.
merge!
(
attrs
)
template
"/etc/cvmfs/domain.d/
#{
repo
}
.conf"
do
source
'etc_cvmfs_config.d_generic.conf.erb'
mode
"0644"
variables
(
config:
config
)
end
config
[
'http_proxy'
]
=
'DIRECT'
unless
config
.
has_key?
'http_proxy'
end
#
# Repository configs
#
directory
'/etc/cvmfs/config.d'
template
"/etc/cvmfs/config.d/
#{
repo
}
.conf"
do
source
'etc_cvmfs_config.d_generic.conf.erb'
mode
"0644"
variables
(
:repo
=>
repo
,
:config
=>
config
)
end
# Each repository needs its configuration file
node
[
'cvmfs'
][
'client'
][
'config_d'
].
each
do
|
repo
,
attrs
|
# node attributes are strings
config
=
{
'http_proxy'
=>
'DIRECT'
}
config
.
merge!
(
attrs
)
template
"/etc/cvmfs/config.d/
#{
repo
}
.conf"
do
source
'etc_cvmfs_config.d_generic.conf.erb'
mode
"0644"
variables
(
config:
config
)
end
end
recipes/default.rb
View file @
389b137a
...
...
@@ -30,7 +30,7 @@ else
when
/^8/
package
'cvmfs-client'
when
/^9/
package
node
[
'cvmfs
'
][
'
client'
][
'package'
]
package
'cvmfs
-
client'
else
log
"Platform version
#{
node
[
:platform_version
]
}
not supported!"
do
level
:warn
...
...
templates/default/etc_cvmfs_config.d_generic.conf.erb
View file @
389b137a
# /etc/cvmfs/config.d/
<%=
@repo
%>
.local
#
# DO NOT CHANGE THIS FILE MANUALLY!
#
...
...
test/integration/cernvm-fs/serverspec/localhost/default_spec.rb
View file @
389b137a
require
'spec_helper'
# TODO: find a good way to determine which variant of CVMFS we have installed
# `grep-status -s Package,Status -P cvmfs-release` ???
# For now:
if
true
cvmfs_client_package
=
'cvmfs'
else
cvmfs_client_package
=
'cvmfs-client'
end
describe
package
(
cvmfs_client_package
)
do
describe
package
(
'cvmfs-client'
)
do
it
{
should
be_installed
}
end
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment