fixing a bunch of puppet lint warnings
This commit is contained in:
parent
3149d9707f
commit
e5be3e2ddd
@ -4,21 +4,21 @@ class profile::gitlab {
|
|||||||
ensure => directory,
|
ensure => directory,
|
||||||
}
|
}
|
||||||
|
|
||||||
file { "/etc/gitlab/ssl/${fqdn}.key" :
|
file { "/etc/gitlab/ssl/${::fqdn}.key" :
|
||||||
ensure => file,
|
ensure => file,
|
||||||
source => "${settings::privatekeydir}/${trusted['certname']}.pem",
|
source => "${::settings::privatekeydir}/${::trusted['certname']}.pem",
|
||||||
notify => Exec['gitlab_reconfigure'],
|
notify => Exec['gitlab_reconfigure'],
|
||||||
}
|
}
|
||||||
|
|
||||||
file { "/etc/gitlab/ssl/${fqdn}.crt" :
|
file { "/etc/gitlab/ssl/${::fqdn}.crt" :
|
||||||
ensure => file,
|
ensure => file,
|
||||||
source => "${settings::certdir}/${trusted['certname']}.pem",
|
source => "${::settings::certdir}/${::trusted['certname']}.pem",
|
||||||
notify => Exec['gitlab_reconfigure'],
|
notify => Exec['gitlab_reconfigure'],
|
||||||
}
|
}
|
||||||
|
|
||||||
class { 'gitlab':
|
class { 'gitlab':
|
||||||
external_url => hiera( 'gms_server_url', "https://${::fqdn}") ,
|
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"],
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -2,8 +2,8 @@ class profile::stash {
|
|||||||
|
|
||||||
class { 'java' :
|
class { 'java' :
|
||||||
version => present,
|
version => present,
|
||||||
} ->
|
} ->
|
||||||
|
|
||||||
class { 'postgresql::globals':
|
class { 'postgresql::globals':
|
||||||
manage_package_repo => true,
|
manage_package_repo => true,
|
||||||
version => '9.4',
|
version => '9.4',
|
||||||
@ -16,9 +16,9 @@ class profile::stash {
|
|||||||
} ->
|
} ->
|
||||||
|
|
||||||
class { 'stash':
|
class { 'stash':
|
||||||
javahome => '/etc/alternatives/java_sdk',
|
javahome => '/etc/alternatives/java_sdk',
|
||||||
#dev.mode grants a 24-hour license for testing
|
#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':
|
file { '/opt/puppetlabs/bin/stash_mco.rb':
|
||||||
|
@ -2,6 +2,6 @@ class role::database_server {
|
|||||||
|
|
||||||
#This role would be made of all the profiles that need to be included to make a database server work
|
#This role would be made of all the profiles that need to be included to make a database server work
|
||||||
#All roles should include the base profile
|
#All roles should include the base profile
|
||||||
include profile::base
|
include profile::base
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user