diff options
author | mail_redacted_for_web | 2016-03-24 08:27:17 -0700 |
---|---|---|
committer | mail_redacted_for_web | 2016-03-24 08:27:17 -0700 |
commit | ff6f140529b646e09fb66952abfbe6fa7b4cc746 (patch) | |
tree | 587a64b263a7e6acc9710f3d9a39718fac21491d | |
parent | 9503f54349756fe7a93eecf2ecc6620c340f4679 (diff) | |
download | control-repo-template-ff6f140529b646e09fb66952abfbe6fa7b4cc746.tar.bz2 |
Move gitlab profile out to its own 'profile' module
Prior to this commit, there was a gitlab profile in the site dir
of this control-repo.
After this commit, the profile has been moved to it's own repo
where it can be used more generally and not tightly coupled to this
repository.
As a result, the gitlab role has been removed from this repository
as well.
-rw-r--r-- | Puppetfile | 4 | ||||
-rw-r--r-- | site/profile/manifests/gitlab.pp | 24 | ||||
-rw-r--r-- | site/role/manifests/gitlab.pp | 5 |
3 files changed, 4 insertions, 29 deletions
@@ -44,3 +44,7 @@ mod 'pltraining-rbac', mod 'rampup_profile_puppetmaster', :git => 'https://github.com/PuppetLabs-RampUpProgram/RampUp_profile_puppetmaster', :branch => 'master' + +mod 'rampup_profile_gitlab', + :git => 'https://github.com/PuppetLabs-RampUpProgram/RampUp_profile_gitlab', + :branch => 'master' diff --git a/site/profile/manifests/gitlab.pp b/site/profile/manifests/gitlab.pp deleted file mode 100644 index 72c57e5..0000000 --- a/site/profile/manifests/gitlab.pp +++ /dev/null @@ -1,24 +0,0 @@ -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", - 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"], - } - -} diff --git a/site/role/manifests/gitlab.pp b/site/role/manifests/gitlab.pp deleted file mode 100644 index 1f459d6..0000000 --- a/site/role/manifests/gitlab.pp +++ /dev/null @@ -1,5 +0,0 @@ -class role::gitlab { - - include profile::gitlab - -} |