Skip to content

Commit b5f6551

Browse files
committed
profile::root: use individial files, not directory
- fixes deprecation warning - sets permissions correctly
1 parent 5ac9a0e commit b5f6551

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

manifests/profile/root.pp

+8-11
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,14 @@
88
Boolean $manage = true,
99
) {
1010
if ($manage) {
11-
file { '/root/':
12-
ensure => directory,
13-
mode => '0700',
14-
source => 'puppet:///modules/nebula/root/',
15-
source_permissions => use,
16-
recurse => remote,
17-
purge => false,
18-
}
19-
20-
file { '/root/.bash_profile':
21-
ensure => absent
11+
file {
12+
default:
13+
ensure => file,
14+
mode => '0644',
15+
;
16+
'/root/.bashrc': source => 'puppet:///modules/nebula/root/.bashrc';
17+
'/root/.profile': source => 'puppet:///modules/nebula/root/.profile';
18+
'/root/.bash_profile': ensure => absent;
2219
}
2320
}
2421
}

spec/classes/profile/root_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
let(:facts) { os_facts }
99

1010
it {
11-
is_expected.to contain_file("/root/")
12-
.with(recurse: "remote", purge: false, source_permissions: "use")
11+
is_expected.to contain_file("/root/.bashrc")
12+
is_expected.to contain_file("/root/.profile")
1313
}
1414
it {
1515
is_expected.to contain_file("/root/.bash_profile")

0 commit comments

Comments
 (0)