Skip to content

Commit a2f0837

Browse files
TheMeierTheMeier
authored
Merge pull request #225 from voxpupuli/modulesync
modulesync 10.1.0-26-ga82038c
2 parents d5f7c1f + a7a4e09 commit a2f0837

File tree

5 files changed

+45
-317
lines changed

5 files changed

+45
-317
lines changed

‎.github/CONTRIBUTING.md‎

Lines changed: 0 additions & 272 deletions
This file was deleted.

‎.msync.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# Managed by modulesync - DO NOT EDIT
33
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
44

5-
modulesync_config_version: '10.1.0'
5+
modulesync_config_version: '10.2.0'

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
55

66
group :test do
7-
gem 'voxpupuli-test', '~> 11.0', :require => false
7+
gem 'voxpupuli-test', '~> 12.0', :require => false
88
gem 'puppet_metadata', '~> 5.0', :require => false
99
end
1010

‎manifests/domain.pp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -52,24 +52,24 @@
5252
file { "/etc/cvmfs/domain.d/${domain}.local":
5353
ensure => file,
5454
content => epp('cvmfs/repo.local.epp', {
55-
'repo' => $domain,
56-
'cvmfs_quota_limit' => $cvmfs_quota_limit,
57-
'cvmfs_server_url' => $cvmfs_server_url,
58-
'cvmfs_http_proxy' => $cvmfs_http_proxy,
59-
'cvmfs_timeout' => $cvmfs_timeout,
60-
'cvmfs_timeout_direct' => $cvmfs_timeout_direct,
61-
'cvmfs_nfiles' => $cvmfs_nfiles,
62-
'cvmfs_public_key' => $cvmfs_public_key,
63-
'cvmfs_keys_dir' => $cvmfs_keys_dir,
64-
'cvmfs_max_ttl' => $cvmfs_max_ttl,
65-
'cvmfs_env_variables' => $cvmfs_env_variables,
66-
'cvmfs_use_geoapi' => $cvmfs_use_geoapi,
67-
'cvmfs_follow_redirects' => $cvmfs_follow_redirects,
68-
'cvmfs_external_fallback_proxy' => $cvmfs_external_fallback_proxy,
69-
'cvmfs_external_timeout' => $cvmfs_external_timeout,
70-
'cvmfs_external_http_proxy' => $cvmfs_external_http_proxy,
71-
'cvmfs_external_timeout_direct' => $cvmfs_external_timeout_direct,
72-
'cvmfs_external_url' => $cvmfs_external_url,
55+
'repo' => $domain,
56+
'cvmfs_quota_limit' => $cvmfs_quota_limit,
57+
'cvmfs_server_url' => $cvmfs_server_url,
58+
'cvmfs_http_proxy' => $cvmfs_http_proxy,
59+
'cvmfs_timeout' => $cvmfs_timeout,
60+
'cvmfs_timeout_direct' => $cvmfs_timeout_direct,
61+
'cvmfs_nfiles' => $cvmfs_nfiles,
62+
'cvmfs_public_key' => $cvmfs_public_key,
63+
'cvmfs_keys_dir' => $cvmfs_keys_dir,
64+
'cvmfs_max_ttl' => $cvmfs_max_ttl,
65+
'cvmfs_env_variables' => $cvmfs_env_variables,
66+
'cvmfs_use_geoapi' => $cvmfs_use_geoapi,
67+
'cvmfs_follow_redirects' => $cvmfs_follow_redirects,
68+
'cvmfs_external_fallback_proxy' => $cvmfs_external_fallback_proxy,
69+
'cvmfs_external_timeout' => $cvmfs_external_timeout,
70+
'cvmfs_external_http_proxy' => $cvmfs_external_http_proxy,
71+
'cvmfs_external_timeout_direct' => $cvmfs_external_timeout_direct,
72+
'cvmfs_external_url' => $cvmfs_external_url,
7373
}),
7474
owner => 'root',
7575
group => 'root',

‎manifests/mount.pp‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -119,31 +119,31 @@
119119
file { "/etc/cvmfs/config.d/${repo}.local":
120120
ensure => file,
121121
content => epp('cvmfs/repo.local.epp', {
122-
'repo' => $repo,
123-
'cvmfs_server_url' => $cvmfs_server_url,
124-
'cvmfs_quota_limit' => $cvmfs_quota_limit,
125-
'cvmfs_http_proxy' => $cvmfs_http_proxy,
126-
'cvmfs_timeout' => $cvmfs_timeout,
127-
'cvmfs_timeout_direct' => $cvmfs_timeout_direct,
128-
'cvmfs_nfiles' => $cvmfs_nfiles,
129-
'cvmfs_public_key' => $cvmfs_public_key,
130-
'cvmfs_keys_dir' => $cvmfs_keys_dir,
131-
'cvmfs_max_ttl' => $cvmfs_max_ttl,
132-
'cvmfs_env_variables' => $cvmfs_env_variables,
133-
'cvmfs_use_geoapi' => $cvmfs_use_geoapi,
134-
'cvmfs_mount_rw' => $cvmfs_mount_rw,
135-
'cvmfs_memcache_size' => $cvmfs_memcache_size,
136-
'cvmfs_claim_ownership' => $cvmfs_claim_ownership,
137-
'cvmfs_id_map_file_prefix' => $_cvmfs_id_map_file_prefix,
138-
'cvmfs_uid_map' => $cvmfs_uid_map,
139-
'cvmfs_gid_map' => $cvmfs_gid_map,
140-
'cvmfs_follow_redirects' => $cvmfs_follow_redirects,
141-
'cvmfs_external_fallback_proxy' => $cvmfs_external_fallback_proxy,
142-
'cvmfs_external_timeout' => $cvmfs_external_timeout,
143-
'cvmfs_external_timeout_direct' => $cvmfs_external_timeout_direct,
144-
'cvmfs_external_url' => $cvmfs_external_url,
145-
'cvmfs_external_http_proxy' => $cvmfs_external_http_proxy,
146-
'cvmfs_repository_tag' => $cvmfs_repository_tag,
122+
'repo' => $repo,
123+
'cvmfs_server_url' => $cvmfs_server_url,
124+
'cvmfs_quota_limit' => $cvmfs_quota_limit,
125+
'cvmfs_http_proxy' => $cvmfs_http_proxy,
126+
'cvmfs_timeout' => $cvmfs_timeout,
127+
'cvmfs_timeout_direct' => $cvmfs_timeout_direct,
128+
'cvmfs_nfiles' => $cvmfs_nfiles,
129+
'cvmfs_public_key' => $cvmfs_public_key,
130+
'cvmfs_keys_dir' => $cvmfs_keys_dir,
131+
'cvmfs_max_ttl' => $cvmfs_max_ttl,
132+
'cvmfs_env_variables' => $cvmfs_env_variables,
133+
'cvmfs_use_geoapi' => $cvmfs_use_geoapi,
134+
'cvmfs_mount_rw' => $cvmfs_mount_rw,
135+
'cvmfs_memcache_size' => $cvmfs_memcache_size,
136+
'cvmfs_claim_ownership' => $cvmfs_claim_ownership,
137+
'cvmfs_id_map_file_prefix' => $_cvmfs_id_map_file_prefix,
138+
'cvmfs_uid_map' => $cvmfs_uid_map,
139+
'cvmfs_gid_map' => $cvmfs_gid_map,
140+
'cvmfs_follow_redirects' => $cvmfs_follow_redirects,
141+
'cvmfs_external_fallback_proxy' => $cvmfs_external_fallback_proxy,
142+
'cvmfs_external_timeout' => $cvmfs_external_timeout,
143+
'cvmfs_external_timeout_direct' => $cvmfs_external_timeout_direct,
144+
'cvmfs_external_url' => $cvmfs_external_url,
145+
'cvmfs_external_http_proxy' => $cvmfs_external_http_proxy,
146+
'cvmfs_repository_tag' => $cvmfs_repository_tag,
147147
}),
148148
owner => 'root',
149149
group => 'root',

0 commit comments

Comments
 (0)