From 01573e99a94e22238b4ca55f07036467d701f1fb Mon Sep 17 00:00:00 2001 From: Dylan Ratcliffe Date: Tue, 14 Jun 2016 16:52:59 +1000 Subject: [PATCH 01/13] Added a test user --- Puppetfile | 3 ++- site/profile/manifests/base.pp | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Puppetfile b/Puppetfile index b282b85..b21037f 100644 --- a/Puppetfile +++ b/Puppetfile @@ -5,7 +5,8 @@ forge "http://forge.puppetlabs.com" #mod "puppetlabs/inifile", '1.5.0' #mod "puppetlabs/stdlib", '4.11.0' #mod "puppetlabs/concat", '2.1.0' - +mod 'puppetlabs/accounts', '1.0.0' +mod 'puppetlabs/stdlib', '4.12.0' # Modules from Git # Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples #mod 'apache', diff --git a/site/profile/manifests/base.pp b/site/profile/manifests/base.pp index ae85e65..0270aae 100644 --- a/site/profile/manifests/base.pp +++ b/site/profile/manifests/base.pp @@ -1,5 +1,4 @@ class profile::base { - #the base profile should include component modules that will be on all nodes - + accounts::user { 'test': } } From d57ecf3b0c5def62cf9b7dbfbb6c1a2c7ab5f921 Mon Sep 17 00:00:00 2001 From: Dylan Ratcliffe Date: Wed, 15 Jun 2016 09:45:03 +1000 Subject: [PATCH 02/13] Added role --- site/role/manifests/master.pp | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 site/role/manifests/master.pp diff --git a/site/role/manifests/master.pp b/site/role/manifests/master.pp new file mode 100644 index 0000000..4b277f5 --- /dev/null +++ b/site/role/manifests/master.pp @@ -0,0 +1,5 @@ +class role::master { + # Here we include all of the profiles taht make up a Puppet Master + # for now it's just the base (the SOE) but we will probably add more later + include profile::base +} From 03ccb294312731325efe112ecfd2040375b97af2 Mon Sep 17 00:00:00 2001 From: Dylan Ratcliffe Date: Wed, 15 Jun 2016 09:45:17 +1000 Subject: [PATCH 03/13] changed test to joe --- site/profile/manifests/base.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/profile/manifests/base.pp b/site/profile/manifests/base.pp index 0270aae..c6fb4b4 100644 --- a/site/profile/manifests/base.pp +++ b/site/profile/manifests/base.pp @@ -1,4 +1,4 @@ class profile::base { - accounts::user { 'test': } + accounts::user { 'joe': } } From ae6c530ff7b91338b9d59e51a2ac778aaaee2771 Mon Sep 17 00:00:00 2001 From: Dylan Ratcliffe Date: Wed, 15 Jun 2016 10:49:12 +1000 Subject: [PATCH 04/13] Added monitoring --- site/profile/manifests/base.pp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/site/profile/manifests/base.pp b/site/profile/manifests/base.pp index c6fb4b4..7332dcf 100644 --- a/site/profile/manifests/base.pp +++ b/site/profile/manifests/base.pp @@ -1,4 +1,13 @@ class profile::base { accounts::user { 'joe': } + + accounts::user { 'monitoring': + ensure => present, + uid => 450, + gid => 450, + managehome => false, + locked => true, + shell => '/bin/false' + } } From 5c8d747c203676895f4ddf9eaea0980bc93fde5b Mon Sep 17 00:00:00 2001 From: Dylan Ratcliffe Date: Wed, 15 Jun 2016 10:50:10 +1000 Subject: [PATCH 05/13] Changed to string --- site/profile/manifests/base.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site/profile/manifests/base.pp b/site/profile/manifests/base.pp index 7332dcf..9a096aa 100644 --- a/site/profile/manifests/base.pp +++ b/site/profile/manifests/base.pp @@ -1,11 +1,11 @@ class profile::base { accounts::user { 'joe': } - + accounts::user { 'monitoring': ensure => present, - uid => 450, - gid => 450, + uid => '450', + gid => '450', managehome => false, locked => true, shell => '/bin/false' From 6dd92adf0184a90e1643f686c6eaac9891eac1cc Mon Sep 17 00:00:00 2001 From: Dylan Ratcliffe Date: Wed, 15 Jun 2016 10:51:54 +1000 Subject: [PATCH 06/13] Removed shell --- site/profile/manifests/base.pp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/site/profile/manifests/base.pp b/site/profile/manifests/base.pp index 9a096aa..e262faa 100644 --- a/site/profile/manifests/base.pp +++ b/site/profile/manifests/base.pp @@ -7,7 +7,6 @@ class profile::base { uid => '450', gid => '450', managehome => false, - locked => true, - shell => '/bin/false' + locked => false, } } From 1127198f0ca85c162c4ac11a56be36c256aebe11 Mon Sep 17 00:00:00 2001 From: Dylan Ratcliffe Date: Wed, 15 Jun 2016 10:56:54 +1000 Subject: [PATCH 07/13] Locked the monitoring user --- site/profile/manifests/base.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/profile/manifests/base.pp b/site/profile/manifests/base.pp index e262faa..7fa72ab 100644 --- a/site/profile/manifests/base.pp +++ b/site/profile/manifests/base.pp @@ -7,6 +7,6 @@ class profile::base { uid => '450', gid => '450', managehome => false, - locked => false, + locked => true, } } From 19eb3da156fd32b8628cdd20c7e2f32db0bfa3d4 Mon Sep 17 00:00:00 2001 From: Dylan Ratcliffe Date: Wed, 15 Jun 2016 10:58:23 +1000 Subject: [PATCH 08/13] Changed group id to 10 --- site/profile/manifests/base.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/profile/manifests/base.pp b/site/profile/manifests/base.pp index 7fa72ab..9e4cd43 100644 --- a/site/profile/manifests/base.pp +++ b/site/profile/manifests/base.pp @@ -5,7 +5,7 @@ class profile::base { accounts::user { 'monitoring': ensure => present, uid => '450', - gid => '450', + gid => '10', managehome => false, locked => true, } From e8d13bfbc2719d6a7165fda31066cdcaa73b5f22 Mon Sep 17 00:00:00 2001 From: Dylan Ratcliffe Date: Wed, 15 Jun 2016 11:41:09 +1000 Subject: [PATCH 09/13] Remove monitoring user --- site/profile/manifests/base.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/profile/manifests/base.pp b/site/profile/manifests/base.pp index 9e4cd43..95a6661 100644 --- a/site/profile/manifests/base.pp +++ b/site/profile/manifests/base.pp @@ -3,9 +3,9 @@ class profile::base { accounts::user { 'joe': } accounts::user { 'monitoring': - ensure => present, + ensure => absent, uid => '450', - gid => '10', + gid => '450', managehome => false, locked => true, } From b38e678f74fd7076f8d372cf373beae51dbd9681 Mon Sep 17 00:00:00 2001 From: Dylan Ratcliffe Date: Wed, 15 Jun 2016 11:42:13 +1000 Subject: [PATCH 10/13] Added basic monitoring user --- site/profile/manifests/base.pp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/site/profile/manifests/base.pp b/site/profile/manifests/base.pp index 95a6661..4b7aa98 100644 --- a/site/profile/manifests/base.pp +++ b/site/profile/manifests/base.pp @@ -1,12 +1,12 @@ class profile::base { - accounts::user { 'joe': } + accounts::user { 'monitoring': } - accounts::user { 'monitoring': - ensure => absent, - uid => '450', - gid => '450', - managehome => false, - locked => true, - } + # accounts::user { 'monitoring': + # ensure => absent, + # uid => '450', + # gid => '450', + # managehome => false, + # locked => true, + # } } From 4c905688119d5721a30c312ff2316927c431fb30 Mon Sep 17 00:00:00 2001 From: Dylan Ratcliffe Date: Wed, 15 Jun 2016 11:55:58 +1000 Subject: [PATCH 11/13] Changed params --- site/profile/manifests/base.pp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/site/profile/manifests/base.pp b/site/profile/manifests/base.pp index 4b7aa98..9d0a4f7 100644 --- a/site/profile/manifests/base.pp +++ b/site/profile/manifests/base.pp @@ -1,12 +1,12 @@ class profile::base { - accounts::user { 'monitoring': } + # accounts::user { 'monitoring': } - # accounts::user { 'monitoring': - # ensure => absent, - # uid => '450', - # gid => '450', - # managehome => false, - # locked => true, - # } + accounts::user { 'monitoring': + ensure => absent, + uid => '450', + gid => '450', + managehome => false, + locked => true, + } } From 139e40c29774aac7b4d99e1b44a3c280668dc090 Mon Sep 17 00:00:00 2001 From: Dylan Ratcliffe Date: Wed, 15 Jun 2016 11:57:02 +1000 Subject: [PATCH 12/13] Added only managehome --- site/profile/manifests/base.pp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/site/profile/manifests/base.pp b/site/profile/manifests/base.pp index 9d0a4f7..398c8e3 100644 --- a/site/profile/manifests/base.pp +++ b/site/profile/manifests/base.pp @@ -1,12 +1,11 @@ class profile::base { - # accounts::user { 'monitoring': } accounts::user { 'monitoring': - ensure => absent, - uid => '450', - gid => '450', + # ensure => absent, + # uid => '450', + # gid => '450', managehome => false, - locked => true, + # locked => true, } } From 9f2e32b0968079cf0b6c6696d6bc06609f3f5f0b Mon Sep 17 00:00:00 2001 From: Dylan Ratcliffe Date: Wed, 15 Jun 2016 11:58:03 +1000 Subject: [PATCH 13/13] Added more params --- site/profile/manifests/base.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/site/profile/manifests/base.pp b/site/profile/manifests/base.pp index 398c8e3..2ef57cc 100644 --- a/site/profile/manifests/base.pp +++ b/site/profile/manifests/base.pp @@ -2,10 +2,10 @@ class profile::base { accounts::user { 'monitoring': - # ensure => absent, - # uid => '450', - # gid => '450', + ensure => present, + uid => '450', + gid => '450', managehome => false, - # locked => true, + locked => true, } }