From 4e2a2b81cf17909647728a0c9febab7ab0370e65 Mon Sep 17 00:00:00 2001 From: Nick Walker Date: Tue, 13 Jan 2015 16:42:06 -0800 Subject: Initial Commit Stole Gary's puppet_repository and modified it for general general consumption. Upped the version of r10k to newest (1.4.1) Ripped out the hiera examples just left defaults.yaml Tweaked environment.conf --- Puppetfile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 Puppetfile (limited to 'Puppetfile') diff --git a/Puppetfile b/Puppetfile new file mode 100644 index 0000000..77f1ccb --- /dev/null +++ b/Puppetfile @@ -0,0 +1,16 @@ +forge "http://forge.puppetlabs.com" + +# Modules from the Puppet Forge +mod "puppetlabs/apache" +mod "puppetlabs/ntp" + +# Modules from Github using various references +# Further examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples +mod 'notifyme', + :git => 'git://github.com/glarizza/puppet-notifyme', + :ref => '50c01703b2e3e352520a9a2271ea4947fe17a51f' + +mod 'profiles', + :git => 'git://github.com/glarizza/puppet-profiles', + :ref => '3611ae4253ff01762f9bda1d93620edf8f9a3b22' + -- cgit v1.2.3 From f4393ecc07918f5b70454acd68ec2ce1683a27c7 Mon Sep 17 00:00:00 2001 From: Nick Walker Date: Wed, 14 Jan 2015 14:22:45 -0800 Subject: Add stdlib to Puppetfile Comment out Gary's examples --- Puppetfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Puppetfile') diff --git a/Puppetfile b/Puppetfile index 77f1ccb..8f34ca1 100644 --- a/Puppetfile +++ b/Puppetfile @@ -1,16 +1,16 @@ forge "http://forge.puppetlabs.com" # Modules from the Puppet Forge -mod "puppetlabs/apache" mod "puppetlabs/ntp" +mod "puppetlabs/stdlib" # Modules from Github using various references # Further examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples -mod 'notifyme', - :git => 'git://github.com/glarizza/puppet-notifyme', - :ref => '50c01703b2e3e352520a9a2271ea4947fe17a51f' +#mod 'notifyme', +# :git => 'git://github.com/glarizza/puppet-notifyme', +# :ref => '50c01703b2e3e352520a9a2271ea4947fe17a51f' -mod 'profiles', - :git => 'git://github.com/glarizza/puppet-profiles', - :ref => '3611ae4253ff01762f9bda1d93620edf8f9a3b22' +#mod 'profiles', +# :git => 'git://github.com/glarizza/puppet-profiles', +# :ref => '3611ae4253ff01762f9bda1d93620edf8f9a3b22' -- cgit v1.2.3 From 52629f31e02e2df40eee288ffdd2828e3bd53960 Mon Sep 17 00:00:00 2001 From: Nick Walker Date: Fri, 15 May 2015 11:48:52 -0700 Subject: Update Puppetfile --- Puppetfile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'Puppetfile') diff --git a/Puppetfile b/Puppetfile index 8f34ca1..893fe04 100644 --- a/Puppetfile +++ b/Puppetfile @@ -1,8 +1,13 @@ forge "http://forge.puppetlabs.com" # Modules from the Puppet Forge -mod "puppetlabs/ntp" -mod "puppetlabs/stdlib" +# Note the versions are all set to :latest but after you've +# installed you should change them to the exact version you want +mod "puppetlabs/inifile", :latest +mod "puppetlabs/stdlib", :latest +mod "puppetlabs/concat", :latest +mod "puppetlabs/ntp", :latest +mod "saz/ssh", :latest # Modules from Github using various references # Further examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples -- cgit v1.2.3 From e972bafa1a056d46840d3aaa38dcc2844cf04042 Mon Sep 17 00:00:00 2001 From: Nick Walker Date: Fri, 26 Jun 2015 08:49:49 -0700 Subject: Update Puppetfile --- Puppetfile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Puppetfile') diff --git a/Puppetfile b/Puppetfile index 893fe04..bba46dd 100644 --- a/Puppetfile +++ b/Puppetfile @@ -9,6 +9,10 @@ mod "puppetlabs/concat", :latest mod "puppetlabs/ntp", :latest mod "saz/ssh", :latest +#An example of using a specific forge module version instead of latest +#Notice the addition of single quotes +#mod "puppetlabs/inifile", '1.3.0' + # Modules from Github using various references # Further examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples #mod 'notifyme', -- cgit v1.2.3 From 437433ff44cd77915a4a7b1d61d7aa624c44b41a Mon Sep 17 00:00:00 2001 From: Nick Walker Date: Mon, 3 Aug 2015 14:44:35 -0700 Subject: Remove hiera.yaml and instead manage it with puppet code Added hunner/hiera to the Puppetfile and a manifest to use it instead of placing a hiera.yaml in the repo. --- Puppetfile | 5 +++++ hiera.yaml | 9 --------- site/profile/manifests/puppetmaster.pp | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 9 deletions(-) delete mode 100644 hiera.yaml create mode 100644 site/profile/manifests/puppetmaster.pp (limited to 'Puppetfile') diff --git a/Puppetfile b/Puppetfile index bba46dd..fde9831 100644 --- a/Puppetfile +++ b/Puppetfile @@ -15,6 +15,11 @@ mod "saz/ssh", :latest # Modules from Github using various references # Further examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples +# update the tag to the most current release when implementing +mod 'hiera', + :git => 'https://github.com/hunner/puppet-hiera', + :tag => '1.3.1' + #mod 'notifyme', # :git => 'git://github.com/glarizza/puppet-notifyme', # :ref => '50c01703b2e3e352520a9a2271ea4947fe17a51f' diff --git a/hiera.yaml b/hiera.yaml deleted file mode 100644 index bc98555..0000000 --- a/hiera.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -:backends: - - yaml -:hierarchy: - - "nodes/%{clientcert}" - - common - -:yaml: - :datadir: "/etc/puppetlabs/puppet/environments/%{environment}/hieradata" diff --git a/site/profile/manifests/puppetmaster.pp b/site/profile/manifests/puppetmaster.pp new file mode 100644 index 0000000..8242110 --- /dev/null +++ b/site/profile/manifests/puppetmaster.pp @@ -0,0 +1,14 @@ +class profile::puppetmaster { + + class { 'hiera': + hierarchy => [ + "nodes/%{::trusted.certname}", + :common", + ], + hiera_yaml => '/etc/puppetlabs/code/hiera.yaml', + datadir => "/etc/puppetlabs/code/environments/%{environment}/hieradata", + owner => 'root', + group => 'root', + } + +} -- cgit v1.2.3 From 96fc614ace9f6f8566f8d2ce923424db2e380bf7 Mon Sep 17 00:00:00 2001 From: Nick Walker Date: Fri, 14 Aug 2015 17:09:01 -0700 Subject: Add vhsn/gitlab and acidprime/r10k to Puppetfile --- Puppetfile | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Puppetfile') diff --git a/Puppetfile b/Puppetfile index fde9831..8e2131a 100644 --- a/Puppetfile +++ b/Puppetfile @@ -20,6 +20,13 @@ mod 'hiera', :git => 'https://github.com/hunner/puppet-hiera', :tag => '1.3.1' +mod 'gitlab', + :git => 'https://github.com/vshn/puppet-gitlab', + :ref => '00397b86dfb3487d9df768cbd3698d362132b5bf' + +mod 'r10k', + :git => 'https://github.com/acidprime/r10k', + :tag => 'v3.1.1' #mod 'notifyme', # :git => 'git://github.com/glarizza/puppet-notifyme', # :ref => '50c01703b2e3e352520a9a2271ea4947fe17a51f' -- cgit v1.2.3 From fc3ed995a73dd767152a10b7733d65cb8ece5bdb Mon Sep 17 00:00:00 2001 From: Nick Walker Date: Mon, 17 Aug 2015 10:54:41 -0700 Subject: Add abrader-gms module to Puppetfile --- Puppetfile | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Puppetfile') diff --git a/Puppetfile b/Puppetfile index 8e2131a..aabc7b8 100644 --- a/Puppetfile +++ b/Puppetfile @@ -27,6 +27,11 @@ mod 'gitlab', mod 'r10k', :git => 'https://github.com/acidprime/r10k', :tag => 'v3.1.1' + +mod 'gms', + :git => 'https://github.com/abrader/abrader-gms', + :tag => 'v0.0.9' + #mod 'notifyme', # :git => 'git://github.com/glarizza/puppet-notifyme', # :ref => '50c01703b2e3e352520a9a2271ea4947fe17a51f' -- cgit v1.2.3 From 308e73a80022739ff62822006f6828839f825fbf Mon Sep 17 00:00:00 2001 From: Nick Walker Date: Tue, 18 Aug 2015 14:22:23 -0700 Subject: Update version of abrader-gms --- Puppetfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Puppetfile') diff --git a/Puppetfile b/Puppetfile index aabc7b8..10c4b3e 100644 --- a/Puppetfile +++ b/Puppetfile @@ -30,7 +30,7 @@ mod 'r10k', mod 'gms', :git => 'https://github.com/abrader/abrader-gms', - :tag => 'v0.0.9' + :tag => '3d088c8ba8cef6d108236a8cee06ab7bedd6deeb' #mod 'notifyme', # :git => 'git://github.com/glarizza/puppet-notifyme', -- cgit v1.2.3 From 04f3239514f39333e91b88e27908eea916ecfa75 Mon Sep 17 00:00:00 2001 From: Nick Walker Date: Tue, 25 Aug 2015 16:51:42 -0700 Subject: add modules for stash and a profile --- Puppetfile | 14 ++++---------- site/profile/manifests/stash.pp | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 10 deletions(-) create mode 100644 site/profile/manifests/stash.pp (limited to 'Puppetfile') diff --git a/Puppetfile b/Puppetfile index 10c4b3e..a220865 100644 --- a/Puppetfile +++ b/Puppetfile @@ -8,6 +8,9 @@ mod "puppetlabs/stdlib", :latest mod "puppetlabs/concat", :latest mod "puppetlabs/ntp", :latest mod "saz/ssh", :latest +mod "puppetlabs/postgresql", '4.5.0' +mod "puppetlabs/stash", '1.3.0' +mod "puppetlabs/java", '1.4.1' #An example of using a specific forge module version instead of latest #Notice the addition of single quotes @@ -30,13 +33,4 @@ mod 'r10k', mod 'gms', :git => 'https://github.com/abrader/abrader-gms', - :tag => '3d088c8ba8cef6d108236a8cee06ab7bedd6deeb' - -#mod 'notifyme', -# :git => 'git://github.com/glarizza/puppet-notifyme', -# :ref => '50c01703b2e3e352520a9a2271ea4947fe17a51f' - -#mod 'profiles', -# :git => 'git://github.com/glarizza/puppet-profiles', -# :ref => '3611ae4253ff01762f9bda1d93620edf8f9a3b22' - + :tag => 'bb5bcaa4e0fbeb2dae08eedb09d7eec1681a6172' diff --git a/site/profile/manifests/stash.pp b/site/profile/manifests/stash.pp new file mode 100644 index 0000000..b3298e4 --- /dev/null +++ b/site/profile/manifests/stash.pp @@ -0,0 +1,28 @@ +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 From 06f2e5e5aae05b3d29c6ff95019448f37a6a16f5 Mon Sep 17 00:00:00 2001 From: Nick Walker Date: Tue, 22 Sep 2015 12:38:46 -0700 Subject: Correct module namespace for stash module --- Puppetfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Puppetfile') diff --git a/Puppetfile b/Puppetfile index a220865..df6bec9 100644 --- a/Puppetfile +++ b/Puppetfile @@ -9,7 +9,7 @@ mod "puppetlabs/concat", :latest mod "puppetlabs/ntp", :latest mod "saz/ssh", :latest mod "puppetlabs/postgresql", '4.5.0' -mod "puppetlabs/stash", '1.3.0' +mod "puppet/stash", '1.3.0' mod "puppetlabs/java", '1.4.1' #An example of using a specific forge module version instead of latest -- cgit v1.2.3 From 0b7acebc34beb3890eba34edd5b6ac8b7a1e9251 Mon Sep 17 00:00:00 2001 From: Nick Walker Date: Thu, 29 Oct 2015 11:42:19 -0700 Subject: switch to npwalker/abrader-gms --- Puppetfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Puppetfile') diff --git a/Puppetfile b/Puppetfile index df6bec9..ac90e14 100644 --- a/Puppetfile +++ b/Puppetfile @@ -32,5 +32,5 @@ mod 'r10k', :tag => 'v3.1.1' mod 'gms', - :git => 'https://github.com/abrader/abrader-gms', - :tag => 'bb5bcaa4e0fbeb2dae08eedb09d7eec1681a6172' + :git => 'https://github.com/npwalker/abrader-gms', + :branch => 'gitlab_disable_ssl_verify_support' -- cgit v1.2.3