From 9503f54349756fe7a93eecf2ecc6620c340f4679 Mon Sep 17 00:00:00 2001
From: Nick Walker <nick.walker@puppetlabs.com>
Date: Wed, 23 Mar 2016 15:53:41 -0700
Subject: Move puppetmaster profile to rampup_profile_puppetmaster module

Prior to this commit, the puppetmaster profile was embedded in this
control-repo.

After this commit, the puppetmaster profile is moved out into its
own module.
---
 Puppetfile | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'Puppetfile')

diff --git a/Puppetfile b/Puppetfile
index 5c64227..cc0ec75 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -40,3 +40,7 @@ mod 'gms',
 mod 'pltraining-rbac',
   :git    => 'https://github.com/puppetlabs/pltraining-rbac',
   :ref    => '2f60e1789a721ce83f8df061e13f8bf81cd4e4ce'
+
+mod 'rampup_profile_puppetmaster',
+  :git    => 'https://github.com/PuppetLabs-RampUpProgram/RampUp_profile_puppetmaster',
+  :branch => 'master'
-- 
cgit v1.2.3


From ff6f140529b646e09fb66952abfbe6fa7b4cc746 Mon Sep 17 00:00:00 2001
From: Nick Walker <nick.walker@puppetlabs.com>
Date: Thu, 24 Mar 2016 08:27:17 -0700
Subject: 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.
---
 Puppetfile                       |  4 ++++
 site/profile/manifests/gitlab.pp | 24 ------------------------
 site/role/manifests/gitlab.pp    |  5 -----
 3 files changed, 4 insertions(+), 29 deletions(-)
 delete mode 100644 site/profile/manifests/gitlab.pp
 delete mode 100644 site/role/manifests/gitlab.pp

(limited to 'Puppetfile')

diff --git a/Puppetfile b/Puppetfile
index cc0ec75..3eaee22 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -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
-
-}
-- 
cgit v1.2.3


From b3519dd48cebfcdbf1dea4b42e8857e21e6f05a2 Mon Sep 17 00:00:00 2001
From: Nick Walker <nick.walker@puppetlabs.com>
Date: Thu, 24 Mar 2016 14:07:16 -0700
Subject: Move stash profile out to its own 'profile' module

Prior to this commit, there was a stash 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.
---
 Puppetfile                      |  4 ++++
 site/profile/manifests/stash.pp | 28 ----------------------------
 2 files changed, 4 insertions(+), 28 deletions(-)
 delete mode 100644 site/profile/manifests/stash.pp

(limited to 'Puppetfile')

diff --git a/Puppetfile b/Puppetfile
index 3eaee22..02e2c31 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -48,3 +48,7 @@ mod 'rampup_profile_puppetmaster',
 mod 'rampup_profile_gitlab',
   :git    => 'https://github.com/PuppetLabs-RampUpProgram/RampUp_profile_gitlab',
   :branch => 'master'
+
+mod 'rampup_profile_stash',
+  :git    => 'https://github.com/PuppetLabs-RampUpProgram/RampUp_profile_stash',
+  :branch => 'master'
diff --git a/site/profile/manifests/stash.pp b/site/profile/manifests/stash.pp
deleted file mode 100644
index 18b0468..0000000
--- a/site/profile/manifests/stash.pp
+++ /dev/null
@@ -1,28 +0,0 @@
-class profile::stash {
-
-  class { 'java' :
-    version => present,
-  } ->
-
-  class { 'postgresql::globals':
-    manage_package_repo => true,
-    version             => '9.4',
-  }->
-  class { 'postgresql::server': } ->
-  
-  postgresql::server::db { 'stash':
-    user     => 'stash',
-    password => postgresql_password('stash', 'password'),
-  } ->
-
-  class { 'stash':
-    javahome  => '/etc/alternatives/java_sdk',
-    #dev.mode grants a 24-hour license for testing
-    java_opts => '-Datlassian.dev.mode=true',
-  }
-
-  file { '/opt/puppetlabs/bin/stash_mco.rb':
-    source => 'puppet:///modules/r10k/stash_mco.rb',
-  }
-
-}
-- 
cgit v1.2.3