From ab679260c6d04f08d70cda5b452c2accfeceac35 Mon Sep 17 00:00:00 2001 From: Nick Walker Date: Fri, 14 Aug 2015 16:17:25 -0700 Subject: Add a gitlab profile / add ssh-keygen to puppetmaster profile --- site/profile/manifests/gitlab.pp | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 site/profile/manifests/gitlab.pp (limited to 'site/profile/manifests/gitlab.pp') diff --git a/site/profile/manifests/gitlab.pp b/site/profile/manifests/gitlab.pp new file mode 100644 index 0000000..720ee7f --- /dev/null +++ b/site/profile/manifests/gitlab.pp @@ -0,0 +1,7 @@ +class profile::gitlab { + + class { 'gitlab': + external_url => hiera( 'gms_server_url', "http://${::fqdn}") , + } + +} -- cgit v1.2.3 From 184cf7e80e1c1585e6365181e8b6528bcee32977 Mon Sep 17 00:00:00 2001 From: Nick Walker Date: Mon, 17 Aug 2015 15:45:22 -0700 Subject: Change default gitlab url to be https instead of http --- site/profile/manifests/gitlab.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'site/profile/manifests/gitlab.pp') diff --git a/site/profile/manifests/gitlab.pp b/site/profile/manifests/gitlab.pp index 720ee7f..e8cc2fd 100644 --- a/site/profile/manifests/gitlab.pp +++ b/site/profile/manifests/gitlab.pp @@ -1,7 +1,7 @@ class profile::gitlab { class { 'gitlab': - external_url => hiera( 'gms_server_url', "http://${::fqdn}") , + external_url => hiera( 'gms_server_url', "https://${::fqdn}") , } } -- cgit v1.2.3 From 246626e6394c444f661692ac8c0e7e590a5da226 Mon Sep 17 00:00:00 2001 From: Nick Walker Date: Tue, 18 Aug 2015 13:53:21 -0700 Subject: Copy agent certs into Gitlab directory for Gitlab SSL --- site/profile/manifests/gitlab.pp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'site/profile/manifests/gitlab.pp') diff --git a/site/profile/manifests/gitlab.pp b/site/profile/manifests/gitlab.pp index e8cc2fd..f4b5bfe 100644 --- a/site/profile/manifests/gitlab.pp +++ b/site/profile/manifests/gitlab.pp @@ -1,7 +1,20 @@ class profile::gitlab { + file { "/etc/gitlab/ssl/${fqdn}.key" : + ensure => file, + source => "${settings::privatekeydir}/${trusted['certname']}.pem", + notify => Exec['gitlab_reconfigure'], + } + + file { "/etc/gitlab/ssl/${fqdn}.crt" : + ensure => file, + 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"], } } -- cgit v1.2.3 From 0c486e2fccf762f0d1bb6aa8a800f1e67cb8e510 Mon Sep 17 00:00:00 2001 From: Nick Walker Date: Thu, 24 Sep 2015 14:59:39 -0700 Subject: Ensure /etc/gitlab/ssl exists before putting certs in it --- site/profile/manifests/gitlab.pp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'site/profile/manifests/gitlab.pp') diff --git a/site/profile/manifests/gitlab.pp b/site/profile/manifests/gitlab.pp index f4b5bfe..c3e5f82 100644 --- a/site/profile/manifests/gitlab.pp +++ b/site/profile/manifests/gitlab.pp @@ -1,5 +1,9 @@ class profile::gitlab { + file { ['/etc/gitlab', '/etc/gitlab/ssl'] : + ensure => directory, + } + file { "/etc/gitlab/ssl/${fqdn}.key" : ensure => file, source => "${settings::privatekeydir}/${trusted['certname']}.pem", -- cgit v1.2.3 From e5be3e2ddd2201a26a848fbc412b6705ff9154f9 Mon Sep 17 00:00:00 2001 From: Nick Walker Date: Fri, 30 Oct 2015 13:50:10 -0700 Subject: fixing a bunch of puppet lint warnings --- site/profile/manifests/gitlab.pp | 10 +++++----- site/profile/manifests/stash.pp | 8 ++++---- site/role/manifests/database_server.pp | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'site/profile/manifests/gitlab.pp') 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 } -- cgit v1.2.3