Skip to content

Commit 6b6dd42

Browse files
committed
fixes homedir issues and lint
1 parent c4eae41 commit 6b6dd42

File tree

2 files changed

+18
-9
lines changed

2 files changed

+18
-9
lines changed

manifests/profile.pp

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
#
55
# === Options
66
#
7+
# [*user*]
8+
# The user for whom the profile will be installed
79
# [*aws_access_key_id*]
810
# The aws_access_key_id for this profile
911
#
@@ -24,27 +26,29 @@
2426
}
2527

2628
if $user != 'root' {
27-
$homedir = "/home/$user"
29+
$homedir = "/home/${user}"
2830
} else {
29-
$homedir = "/root"
31+
$homedir = '/root'
3032
}
3133

32-
if !defined(File["homedir/.aws"]) {
33-
file { "$homedir/.aws":
34+
if !defined(File["${homedir}/.aws"]) {
35+
file { "${homedir}/.aws":
3436
ensure => 'directory'
37+
owner => $user,
38+
group => $user
3539
}
3640
}
3741

38-
if !defined(Concat["$homedir/.aws/credentials"]) {
39-
concat { "$homedir/.aws/credentials":
42+
if !defined(Concat["${homedir}/.aws/credentials"]) {
43+
concat { "${homedir}/.aws/credentials":
4044
ensure => 'present'
4145
}
4246
}
4347

4448

45-
concat::fragment{ "$title":
46-
target => "$homedir/.aws/credentials",
47-
content => "[$title]\naws_access_key_id=$aws_access_key_id\naws_secret_access_key=$aws_secret_access_key\n\n",
49+
concat::fragment{ $title:
50+
target => "${homedir}/.aws/credentials",
51+
content => template('awscli/credentials_concat.erb')
4852
}
4953
}
5054

templates/credentials_concat.erb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[<%=@title%>]
2+
aws_access_key_id=<%=@aws_access_key_id%>
3+
aws_secret_access_key=<%=@aws_secret_access_key%>
4+
5+

0 commit comments

Comments
 (0)