diff options
| -rw-r--r-- | site/profile/manifests/gitlab.pp | 10 | ||||
| -rw-r--r-- | site/profile/manifests/stash.pp | 8 | ||||
| -rw-r--r-- | site/role/manifests/database_server.pp | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/site/profile/manifests/gitlab.pp b/site/profile/manifests/gitlab.pp index c3e5f82..72c57e5 100644 --- a/site/profile/manifests/gitlab.pp +++ b/site/profile/manifests/gitlab.pp @@ -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"], } } diff --git a/site/profile/manifests/stash.pp b/site/profile/manifests/stash.pp index b3298e4..18b0468 100644 --- a/site/profile/manifests/stash.pp +++ b/site/profile/manifests/stash.pp @@ -2,8 +2,8 @@ class profile::stash { class { 'java' : version => present, - } -> - + } -> + class { 'postgresql::globals': manage_package_repo => true, version => '9.4', @@ -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': diff --git a/site/role/manifests/database_server.pp b/site/role/manifests/database_server.pp index 8c37438..aacc912 100644 --- a/site/role/manifests/database_server.pp +++ b/site/role/manifests/database_server.pp @@ -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 #All roles should include the base profile - include profile::base + include profile::base } |