devsnack/control-repo
1
0
Fork 0
Code Releases Activity

fixing a bunch of puppet lint warnings

Browse Source
This commit is contained in:
Nick Walker 2015-10-30 13:50:10 -07:00
parent 3149d9707f
commit e5be3e2ddd
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
site/profile/manifests/gitlab.pp
View File

@ -4,21 +4,21 @@ class profile::gitlab {
ensure => directory,
}
file { "/etc/gitlab/ssl/${fqdn}.key" :
file { "/etc/gitlab/ssl/${::fqdn}.key" :
ensure => file,
source => "${settings::privatekeydir}/${trusted['certname']}.pem",
source => "${::settings::privatekeydir}/${::trusted['certname']}.pem",
notify => Exec['gitlab_reconfigure'],
}
file { "/etc/gitlab/ssl/${fqdn}.crt" :
file { "/etc/gitlab/ssl/${::fqdn}.crt" :
ensure => file,
source => "${settings::certdir}/${trusted['certname']}.pem",
source => "${::settings::certdir}/${::trusted['certname']}.pem",
notify => Exec['gitlab_reconfigure'],
}
class { 'gitlab':
external_url => hiera( 'gms_server_url', "https://${::fqdn}") ,
require => File["/etc/gitlab/ssl/${fqdn}.key", "/etc/gitlab/ssl/${fqdn}.key"],
require => File["/etc/gitlab/ssl/${::fqdn}.key", "/etc/gitlab/ssl/${::fqdn}.key"],
}
}

4
site/profile/manifests/stash.pp
View File

@ -16,9 +16,9 @@ class profile::stash {
} ->
class { 'stash':
javahome => '/etc/alternatives/java_sdk',
javahome => '/etc/alternatives/java_sdk',
#dev.mode grants a 24-hour license for testing
java_opts => '-Datlassian.dev.mode=true',
java_opts => '-Datlassian.dev.mode=true',
}
file { '/opt/puppetlabs/bin/stash_mco.rb':