Skip to content

Commit e5be3e2

Browse files
committed
fixing a bunch of puppet lint warnings
1 parent 3149d97 commit e5be3e2

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

site/profile/manifests/gitlab.pp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44
ensure => directory,
55
}
66

7-
file { "/etc/gitlab/ssl/${fqdn}.key" :
7+
file { "/etc/gitlab/ssl/${::fqdn}.key" :
88
ensure => file,
9-
source => "${settings::privatekeydir}/${trusted['certname']}.pem",
9+
source => "${::settings::privatekeydir}/${::trusted['certname']}.pem",
1010
notify => Exec['gitlab_reconfigure'],
1111
}
1212

13-
file { "/etc/gitlab/ssl/${fqdn}.crt" :
13+
file { "/etc/gitlab/ssl/${::fqdn}.crt" :
1414
ensure => file,
15-
source => "${settings::certdir}/${trusted['certname']}.pem",
15+
source => "${::settings::certdir}/${::trusted['certname']}.pem",
1616
notify => Exec['gitlab_reconfigure'],
1717
}
1818

1919
class { 'gitlab':
2020
external_url => hiera( 'gms_server_url', "https://${::fqdn}") ,
21-
require => File["/etc/gitlab/ssl/${fqdn}.key", "/etc/gitlab/ssl/${fqdn}.key"],
21+
require => File["/etc/gitlab/ssl/${::fqdn}.key", "/etc/gitlab/ssl/${::fqdn}.key"],
2222
}
2323

2424
}

site/profile/manifests/stash.pp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
class { 'java' :
44
version => present,
5-
} ->
6-
5+
} ->
6+
77
class { 'postgresql::globals':
88
manage_package_repo => true,
99
version => '9.4',
@@ -16,9 +16,9 @@
1616
} ->
1717

1818
class { 'stash':
19-
javahome => '/etc/alternatives/java_sdk',
19+
javahome => '/etc/alternatives/java_sdk',
2020
#dev.mode grants a 24-hour license for testing
21-
java_opts => '-Datlassian.dev.mode=true',
21+
java_opts => '-Datlassian.dev.mode=true',
2222
}
2323

2424
file { '/opt/puppetlabs/bin/stash_mco.rb':

site/role/manifests/database_server.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
#This role would be made of all the profiles that need to be included to make a database server work
44
#All roles should include the base profile
5-
include profile::base
5+
include profile::base
66

77
}

0 commit comments

Comments
 (0)