From 9d340c629e5814599723cb3cbb4585dd15c71ad8 Mon Sep 17 00:00:00 2001
From: GreenTesla <nlukin@gmail.com>
Date: Tue, 26 Sep 2017 13:00:26 -0400
Subject: [PATCH 001/233] Update site.pp

---
 manifests/site.pp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index e43f36b..eefb95a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -16,6 +16,7 @@
 # they run. The Puppet Enterprise console needs this to display file contents
 # and differences.
 
+
 # Disable filebucket by default for all File resources:
 File { backup => false }
 
@@ -38,6 +39,8 @@
 # will be included in every node's catalog, *in addition* to any classes
 # specified in the console for that node.
 
+# Puppet is very cool!
+
 node default {
   # This is where you can declare classes for all nodes.
   # Example:

From b600c3d2a89c4d5137ba8a74282590e4c4d136ff Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Tue, 26 Sep 2017 13:01:17 -0400
Subject: [PATCH 002/233] Update site.pp

---
 manifests/site.pp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index e43f36b..4e364f2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,5 +1,7 @@
 ## site.pp ##
 
+# Here is a new comment
+
 # This file (/etc/puppetlabs/puppet/manifests/site.pp) is the main entry point
 # used when an agent connects to a master and asks for an updated configuration.
 #

From 1b1f4da8f193e791c2f1534e82f04c0ab2ae5794 Mon Sep 17 00:00:00 2001
From: AlexinCT <32306146+AlexinCT@users.noreply.github.com>
Date: Tue, 26 Sep 2017 13:01:26 -0400
Subject: [PATCH 003/233] Update site.pp

---
 manifests/site.pp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index e43f36b..4081952 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,5 +1,7 @@
 ## site.pp ##
 
+# Another one bites the dust.
+
 # This file (/etc/puppetlabs/puppet/manifests/site.pp) is the main entry point
 # used when an agent connects to a master and asks for an updated configuration.
 #

From b20986b985f3fa4f255d54406df552ed1fae12f9 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Tue, 26 Sep 2017 13:07:21 -0400
Subject: [PATCH 004/233] Update site.pp

---
 manifests/site.pp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index e43f36b..293a3e2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,5 +1,7 @@
 ## site.pp ##
 
+# Eddie commit
+
 # This file (/etc/puppetlabs/puppet/manifests/site.pp) is the main entry point
 # used when an agent connects to a master and asks for an updated configuration.
 #

From 448b615ab3fd1c04497a7b3f0138cb88db001b29 Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Tue, 26 Sep 2017 13:10:02 -0400
Subject: [PATCH 005/233] Update site.pp

---
 manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 4081952..44cce6e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,6 +1,6 @@
 ## site.pp ##
 
-# Another one bites the dust.
+# Stop it!
 
 # This file (/etc/puppetlabs/puppet/manifests/site.pp) is the main entry point
 # used when an agent connects to a master and asks for an updated configuration.

From b42da1f9d1aaca5d1cb65e78b3c20b7292792dec Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Tue, 26 Sep 2017 14:28:02 -0400
Subject: [PATCH 006/233] Update site.pp

---
 manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 44cce6e..995d831 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,6 +1,6 @@
 ## site.pp ##
 
-# Stop it!
+# LGP!
 
 # This file (/etc/puppetlabs/puppet/manifests/site.pp) is the main entry point
 # used when an agent connects to a master and asks for an updated configuration.

From c4cee67c6173a2539e3b55148f7b874ced4cb5f9 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Tue, 26 Sep 2017 14:29:29 -0400
Subject: [PATCH 007/233] Update site.pp

---
 manifests/site.pp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index e43f36b..e7fc7b4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -28,6 +28,12 @@
   value   => 'title-hash',
 }
 
+file { '/etc/modt':
+  ensure => file,
+  owner => 'root',
+  content => "I hate eddie!!!\n",
+}
+
 # DEFAULT NODE
 # Node definitions in this file are merged with node data from the console. See
 # http://docs.puppetlabs.com/guides/language_guide.html#nodes for more on

From d0465fb99fbec7fe498ef87eb26f661474cfcfd4 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Tue, 26 Sep 2017 14:29:55 -0400
Subject: [PATCH 008/233] Update site.pp

---
 manifests/site.pp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index 293a3e2..27a8605 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -45,4 +45,13 @@
   # Example:
   #   class { 'my_class': }
   include role::classroom
+  notify { "Hello, my name name is ${{::hostname}": }
+  file { '/etc/motd':
+    ensure => file,
+    owner => 'root',
+    group => 'root',
+    mode => '0644',
+    content => "Today I learned means to be a puppet.\n",
+  }
+  
 }

From 79ace67aab583b72293d06700164e201ce2518b1 Mon Sep 17 00:00:00 2001
From: GreenTesla <nlukin@gmail.com>
Date: Tue, 26 Sep 2017 14:32:11 -0400
Subject: [PATCH 009/233] Update site.pp

---
 manifests/site.pp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index eefb95a..c8350aa 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -46,4 +46,11 @@
   # Example:
   #   class { 'my_class': }
   include role::classroom
+  
+  file {
+  '/etc/motd':  ensure  => file,  
+  owner   => 'root',  
+  group   => 'root',  
+  mode    => '0644',  
+  content => "Pushing this from source code repo\n",}
 }

From c189761d0b7b555198114c2c0ba34578efdeba36 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Tue, 26 Sep 2017 14:33:19 -0400
Subject: [PATCH 010/233] Update site.pp

---
 manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 27a8605..3c63879 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -45,7 +45,7 @@
   # Example:
   #   class { 'my_class': }
   include role::classroom
-  notify { "Hello, my name name is ${{::hostname}": }
+  notify { "Hello, my name name is fun": }
   file { '/etc/motd':
     ensure => file,
     owner => 'root',

From 10139e7f12020a68fbf2e15c51db040838565071 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Tue, 26 Sep 2017 14:34:43 -0400
Subject: [PATCH 011/233] Update site.pp

---
 manifests/site.pp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index e7fc7b4..d69ef10 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -28,11 +28,6 @@
   value   => 'title-hash',
 }
 
-file { '/etc/modt':
-  ensure => file,
-  owner => 'root',
-  content => "I hate eddie!!!\n",
-}
 
 # DEFAULT NODE
 # Node definitions in this file are merged with node data from the console. See
@@ -49,4 +44,10 @@
   # Example:
   #   class { 'my_class': }
   include role::classroom
+  
+  file { '/etc/modt':
+  ensure => file,
+  owner => 'root',
+  content => "I NEED A HERO!!!\n",
+}
 }

From 0f3c8052ddedad7bb2af3f3b32f9332941afee4b Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Tue, 26 Sep 2017 14:35:10 -0400
Subject: [PATCH 012/233] Update site.pp

---
 manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 3c63879..c30cd4a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -45,7 +45,7 @@
   # Example:
   #   class { 'my_class': }
   include role::classroom
-  notify { "Hello, my name name is fun": }
+  notify { "Hello, my name name is ${::hostname}": }
   file { '/etc/motd':
     ensure => file,
     owner => 'root',

From 984bc26c0e838d05f6171637dc1314dfdcec8ae5 Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Tue, 26 Sep 2017 14:38:32 -0400
Subject: [PATCH 013/233] Update site.pp

---
 manifests/site.pp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index 4e364f2..41fec12 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -45,4 +45,9 @@
   # Example:
   #   class { 'my_class': }
   include role::classroom
+  
+  file { '/etc/motd':
+    ensure => file,
+    content => 'I learned PUppet!',
+  }
 }

From df4e1855cc0f6b68f90ac429147e99f255f7ad56 Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Tue, 26 Sep 2017 14:39:20 -0400
Subject: [PATCH 014/233] Update site.pp

---
 manifests/site.pp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index 995d831..43364d9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -40,6 +40,13 @@
 # will be included in every node's catalog, *in addition* to any classes
 # specified in the console for that node.
 
+file { '/etc/motd':
+      owner => britter,
+      group => root,
+      mode => '0700',
+      content => 'This Crazy Course/n'
+  } 
+
 node default {
   # This is where you can declare classes for all nodes.
   # Example:

From e585e58f4cf49ac7a3061f64bd6c4b959064e46b Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Tue, 26 Sep 2017 14:41:14 -0400
Subject: [PATCH 015/233] Update site.pp

---
 manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 43364d9..0d4b956 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -44,7 +44,7 @@
       owner => britter,
       group => root,
       mode => '0700',
-      content => 'This Crazy Course/n'
+      content => 'This Crazy Course'
   } 
 
 node default {

From ff81e699b8bcb580cecc2ac8995ba41d23d8038c Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Tue, 26 Sep 2017 14:43:20 -0400
Subject: [PATCH 016/233] Update site.pp

---
 manifests/site.pp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index d69ef10..766c182 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -46,8 +46,8 @@
   include role::classroom
   
   file { '/etc/modt':
-  ensure => file,
-  owner => 'root',
-  content => "I NEED A HERO!!!\n",
-}
+    ensure => file,
+    owner => 'root',
+    content => "I NEED A HERO!!!\n",
+  }
 }

From efb7a4b487be0c23cc68deb9004209fb2c9ce6cf Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Tue, 26 Sep 2017 14:43:38 -0400
Subject: [PATCH 017/233] Update site.pp

---
 manifests/site.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 41fec12..31626f6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -46,8 +46,8 @@
   #   class { 'my_class': }
   include role::classroom
   
-  file { '/etc/motd':
+  file {            '/etc/motd':
     ensure => file,
-    content => 'I learned PUppet!',
+    content => 'I learned Puppet!  It's the best    ',
   }
 }

From 3c1e5f50d8f40eea52271f456af4d93a8e1ca2fb Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Tue, 26 Sep 2017 14:43:49 -0400
Subject: [PATCH 018/233] Update site.pp

---
 manifests/site.pp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 0d4b956..337d6ec 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -41,10 +41,8 @@
 # specified in the console for that node.
 
 file { '/etc/motd':
-      owner => britter,
-      group => root,
-      mode => '0700',
-      content => 'This Crazy Course'
+      ensure => file,
+      content => 'This Crazy Course!',
   } 
 
 node default {

From 2a0a98bf9bb828f81a36620920cd4208ff839f15 Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Tue, 26 Sep 2017 14:47:57 -0400
Subject: [PATCH 019/233] Update site.pp

---
 manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 337d6ec..2619d8b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -42,7 +42,7 @@
 
 file { '/etc/motd':
       ensure => file,
-      content => 'This Crazy Course!',
+      content => 'This Crazy Course/n',
   } 
 
 node default {

From 293980e856078d1a28632f351b1c9f0164d36d8c Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Tue, 26 Sep 2017 14:49:33 -0400
Subject: [PATCH 020/233] Update site.pp

---
 manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index c30cd4a..53e92ea 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -51,7 +51,7 @@
     owner => 'root',
     group => 'root',
     mode => '0644',
-    content => "Today I learned means to be a puppet.\n",
+    content => "Today I learned what it means to be a puppet.\n",
   }
   
 }

From 055b705bc6968ac935bf45c379bc1fc7b8bfc5d9 Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Tue, 26 Sep 2017 14:50:49 -0400
Subject: [PATCH 021/233] Update site.pp

---
 manifests/site.pp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 2619d8b..08eead6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -40,10 +40,6 @@
 # will be included in every node's catalog, *in addition* to any classes
 # specified in the console for that node.
 
-file { '/etc/motd':
-      ensure => file,
-      content => 'This Crazy Course/n',
-  } 
 
 node default {
   # This is where you can declare classes for all nodes.
@@ -51,3 +47,5 @@
   #   class { 'my_class': }
   include role::classroom
 }
+
+file { '/etc/motd':      ensure => file,      content => 'This Crazy Course'/n',  } 

From cd39129f5ee2c186095531a673e066c943ff09d5 Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Tue, 26 Sep 2017 14:52:28 -0400
Subject: [PATCH 022/233] Update site.pp

---
 manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 08eead6..aa8b453 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -48,4 +48,4 @@
   include role::classroom
 }
 
-file { '/etc/motd':      ensure => file,      content => 'This Crazy Course'/n',  } 
+file { '/etc/motd':      ensure => file,      content => 'This Crazy Course /n',  } 

From 993ade3bb544941934faacd8e472cbb74b6870db Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Tue, 26 Sep 2017 14:53:22 -0400
Subject: [PATCH 023/233] Update site.pp

---
 manifests/site.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 766c182..0563c6b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -44,8 +44,9 @@
   # Example:
   #   class { 'my_class': }
   include role::classroom
+  notify { "Hello, my name name is ${::hostname}": }
   
-  file { '/etc/modt':
+  file { '/etc/motd':
     ensure => file,
     owner => 'root',
     content => "I NEED A HERO!!!\n",

From a9e84aca12e7c1c80e1819c51303c30e84e03bef Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Tue, 26 Sep 2017 14:53:27 -0400
Subject: [PATCH 024/233] Update site.pp

---
 manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index aa8b453..15fa5e8 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -48,4 +48,4 @@
   include role::classroom
 }
 
-file { '/etc/motd':      ensure => file,      content => 'This Crazy Course /n',  } 
+file { '/etc/motd':      ensure => file,      content => "This Crazy Course /n",  } 

From 87c212a464ea0d3d7bda9c8c708a4cd8878a378d Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Tue, 26 Sep 2017 14:54:42 -0400
Subject: [PATCH 025/233] Update site.pp

---
 manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 15fa5e8..5c66b82 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -48,4 +48,4 @@
   include role::classroom
 }
 
-file { '/etc/motd':      ensure => file,      content => "This Crazy Course /n",  } 
+file { '/etc/motd':      ensure => file,      content => 'This Crazy Course \n' } 

From f23faa120f6e4831bac6b228a01dbefb487852fc Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Tue, 26 Sep 2017 14:55:52 -0400
Subject: [PATCH 026/233] Update site.pp

---
 manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 5c66b82..69110e2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -48,4 +48,4 @@
   include role::classroom
 }
 
-file { '/etc/motd':      ensure => file,      content => 'This Crazy Course \n' } 
+file { '/etc/motd':      ensure => file,      content => 'This Crazy Course' } 

From 4c79d54f77882bdc83c2b9dc27e9de1ebfdafa91 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Tue, 26 Sep 2017 15:06:12 -0400
Subject: [PATCH 027/233] Update site.pp

---
 manifests/site.pp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index 0563c6b..b19117a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -51,4 +51,9 @@
     owner => 'root',
     content => "I NEED A HERO!!!\n",
   }
+  
+  exec { 'cowsay \'Welcome to ${::fqdn}!\' > /etc/motd':
+    path => '/usr/local/bin',
+    creates => '/etc/motd',
+  }
 }

From 86f7afc77f25552f38c6924e5b409774e5abb8b2 Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Tue, 26 Sep 2017 15:06:14 -0400
Subject: [PATCH 028/233] Update site.pp

---
 manifests/site.pp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 31626f6..e764d1f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -46,8 +46,13 @@
   #   class { 'my_class': }
   include role::classroom
   
-  file {            '/etc/motd':
-    ensure => file,
-    content => 'I learned Puppet!  It's the best    ',
+  #file {            '/etc/motd':
+  #  ensure => file,
+  #  content => 'I learned Puppet!  Its the best    ',
+  #}
+  
+  exec { "cowsay 'Welcome to ${::fqdn}!' > /etc/motd":
+    creates => '/etc/motd',
+    path => '/usr/local/bin',
   }
 }

From f63b007121c13d41528c71527b7efddad820fbc2 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Tue, 26 Sep 2017 15:07:48 -0400
Subject: [PATCH 029/233] Update site.pp

---
 manifests/site.pp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index b19117a..f4428ba 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -46,11 +46,11 @@
   include role::classroom
   notify { "Hello, my name name is ${::hostname}": }
   
-  file { '/etc/motd':
-    ensure => file,
-    owner => 'root',
-    content => "I NEED A HERO!!!\n",
-  }
+  #file { '/etc/motd':
+  #  ensure => file,
+  #  owner => 'root',
+  #  content => "I NEED A HERO!!!\n",
+  #}
   
   exec { 'cowsay \'Welcome to ${::fqdn}!\' > /etc/motd':
     path => '/usr/local/bin',

From 2bb5c134b29acea2b2db179d71ea27a492fb5928 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Tue, 26 Sep 2017 15:11:16 -0400
Subject: [PATCH 030/233] Update site.pp

---
 manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index f4428ba..6a9c8d0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -52,7 +52,7 @@
   #  content => "I NEED A HERO!!!\n",
   #}
   
-  exec { 'cowsay \'Welcome to ${::fqdn}!\' > /etc/motd':
+  exec { 'cowsay \"Welcome to ${::fqdn}!\" > /etc/motd':
     path => '/usr/local/bin',
     creates => '/etc/motd',
   }

From 9265f137ce531801e604135618b164898c689e9f Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Tue, 26 Sep 2017 15:16:38 -0400
Subject: [PATCH 031/233] Update site.pp

---
 manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 6a9c8d0..cebff71 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -52,7 +52,7 @@
   #  content => "I NEED A HERO!!!\n",
   #}
   
-  exec { 'cowsay \"Welcome to ${::fqdn}!\" > /etc/motd':
+  exec { "cowsay 'Welcome to ${::fqdn}!' > /etc/motd":
     path => '/usr/local/bin',
     creates => '/etc/motd',
   }

From cfcd823d2201c308f0d8c2c41cb7a8ddf26eb707 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Tue, 26 Sep 2017 15:19:11 -0400
Subject: [PATCH 032/233] Update site.pp

---
 manifests/site.pp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index 53e92ea..9e224de 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -53,5 +53,11 @@
     mode => '0644',
     content => "Today I learned what it means to be a puppet.\n",
   }
+  exec { 'cowsay':
+    command => '"cowsay 'Welcome to ${::fqdn}!' > /etc/motb"',
+    path => '/usr/local/bin',
+    creates => '/etc/motd',
+  }
+    
   
 }

From 8707bd38e42c850877eefc31075269bcd123f885 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Tue, 26 Sep 2017 15:20:28 -0400
Subject: [PATCH 033/233] Update site.pp

---
 manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 9e224de..89b7b39 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -54,7 +54,7 @@
     content => "Today I learned what it means to be a puppet.\n",
   }
   exec { 'cowsay':
-    command => '"cowsay 'Welcome to ${::fqdn}!' > /etc/motb"',
+    command => 'cowsay 'Welcome to ${::fqdn}!' > /etc/motb',
     path => '/usr/local/bin',
     creates => '/etc/motd',
   }

From ac10f23efc7d734681b8164f0680fd4995fe093a Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Tue, 26 Sep 2017 15:20:57 -0400
Subject: [PATCH 034/233] Update site.pp

---
 manifests/site.pp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 69110e2..de90766 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -46,6 +46,11 @@
   # Example:
   #   class { 'my_class': }
   include role::classroom
-}
 
-file { '/etc/motd':      ensure => file,      content => 'This Crazy Course' } 
+
+#file { '/etc/motd':      ensure => file,      content => 'This Crazy Course' } 
+
+exec {"cowsay 'Welcome to ${::fqdn!' > /etc/motd":
+  create =? '/etc/motd'
+  path => '/usr/local/bin' }
+}

From 9a7c9b3ad42147ef42a52bf00a1b095856ed9486 Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Tue, 26 Sep 2017 15:21:48 -0400
Subject: [PATCH 035/233] Update site.pp

---
 manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index de90766..275c83f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -51,6 +51,6 @@
 #file { '/etc/motd':      ensure => file,      content => 'This Crazy Course' } 
 
 exec {"cowsay 'Welcome to ${::fqdn!' > /etc/motd":
-  create =? '/etc/motd'
+  create => '/etc/motd'
   path => '/usr/local/bin' }
 }

From 2c9dd11b5fe55e6e159944476db3515024584bcd Mon Sep 17 00:00:00 2001
From: GreenTesla <nlukin@gmail.com>
Date: Tue, 26 Sep 2017 15:22:11 -0400
Subject: [PATCH 036/233] Update site.pp

---
 manifests/site.pp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index c8350aa..4d8dc4e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -47,10 +47,8 @@
   #   class { 'my_class': }
   include role::classroom
   
-  file {
-  '/etc/motd':  ensure  => file,  
-  owner   => 'root',  
-  group   => 'root',  
-  mode    => '0644',  
-  content => "Pushing this from source code repo\n",}
-}
+    exec { "cowsay 'Welcome to ${::fqdn}!'> /etc/motd":
+      creates => '/etc/motd',
+      path => '/user/local/bin',
+    }
+  }

From f882316c561c94b9811eaf5f60ee64d8cb2674da Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Tue, 26 Sep 2017 15:23:26 -0400
Subject: [PATCH 037/233] Update site.pp

---
 manifests/site.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 275c83f..a34310c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -51,6 +51,6 @@
 #file { '/etc/motd':      ensure => file,      content => 'This Crazy Course' } 
 
 exec {"cowsay 'Welcome to ${::fqdn!' > /etc/motd":
-  create => '/etc/motd'
-  path => '/usr/local/bin' }
+  create => '/etc/motd',
+  path => '/usr/local/bin', }
 }

From 6c3f7b9a674e0c992a9a0e848c0a7d8c33459d4f Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Tue, 26 Sep 2017 15:23:53 -0400
Subject: [PATCH 038/233] Update site.pp

---
 manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 89b7b39..691c0f6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -54,7 +54,7 @@
     content => "Today I learned what it means to be a puppet.\n",
   }
   exec { 'cowsay':
-    command => 'cowsay 'Welcome to ${::fqdn}!' > /etc/motb',
+    command => "cowsay 'Welcome to ${::fqdn}!' > /etc/motb",
     path => '/usr/local/bin',
     creates => '/etc/motd',
   }

From c9febae3a26f9c3068f0f1f8086365a642d8fbe2 Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Tue, 26 Sep 2017 15:24:56 -0400
Subject: [PATCH 039/233] Update site.pp

---
 manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index a34310c..a1eea85 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -50,7 +50,7 @@
 
 #file { '/etc/motd':      ensure => file,      content => 'This Crazy Course' } 
 
-exec {"cowsay 'Welcome to ${::fqdn!' > /etc/motd":
+exec {"cowsay 'Welcome to ${::fqdn}!' > /etc/motd":
   create => '/etc/motd',
   path => '/usr/local/bin', }
 }

From ee3f5f5acbabdb93eae3a82d2f512c73a396cb7f Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Tue, 26 Sep 2017 15:26:42 -0400
Subject: [PATCH 040/233] Update site.pp

---
 manifests/site.pp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 691c0f6..84314f7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -46,13 +46,13 @@
   #   class { 'my_class': }
   include role::classroom
   notify { "Hello, my name name is ${::hostname}": }
-  file { '/etc/motd':
-    ensure => file,
-    owner => 'root',
-    group => 'root',
-    mode => '0644',
-    content => "Today I learned what it means to be a puppet.\n",
-  }
+  #file { '/etc/motd':
+  #  ensure => file,
+  #  owner => 'root',
+  #  group => 'root',
+  #  mode => '0644',
+  #  content => "Today I learned what it means to be a puppet.\n",
+  #}
   exec { 'cowsay':
     command => "cowsay 'Welcome to ${::fqdn}!' > /etc/motb",
     path => '/usr/local/bin',

From 121fa2d3424421255e49a1ac301e150ffa69766d Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Tue, 26 Sep 2017 15:29:54 -0400
Subject: [PATCH 041/233] Update site.pp

---
 manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index a1eea85..64bb393 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -51,6 +51,6 @@
 #file { '/etc/motd':      ensure => file,      content => 'This Crazy Course' } 
 
 exec {"cowsay 'Welcome to ${::fqdn}!' > /etc/motd":
-  create => '/etc/motd',
+  creates => '/etc/motd',
   path => '/usr/local/bin', }
 }

From 624d5c78405633e823e3259849378a350712ce06 Mon Sep 17 00:00:00 2001
From: GreenTesla <nlukin@gmail.com>
Date: Tue, 26 Sep 2017 15:31:40 -0400
Subject: [PATCH 042/233] Update site.pp

---
 manifests/site.pp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 4d8dc4e..a9bd79d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -47,7 +47,10 @@
   #   class { 'my_class': }
   include role::classroom
   
-    exec { "cowsay 'Welcome to ${::fqdn}!'> /etc/motd":
+  #file { '/etc/motd':
+  }
+  
+   exec { "cowsay 'Welcome to ${::fqdn}!'> /etc/motd":
       creates => '/etc/motd',
       path => '/user/local/bin',
     }

From 928609f3286f2004995da605254852149ae16f12 Mon Sep 17 00:00:00 2001
From: GreenTesla <nlukin@gmail.com>
Date: Tue, 26 Sep 2017 15:34:42 -0400
Subject: [PATCH 043/233] Update site.pp

---
 manifests/site.pp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index a9bd79d..32d4be0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -48,10 +48,9 @@
   include role::classroom
   
   #file { '/etc/motd':
+   ensure => file,
+   content => 'i learned puppet',
   }
   
-   exec { "cowsay 'Welcome to ${::fqdn}!'> /etc/motd":
-      creates => '/etc/motd',
-      path => '/user/local/bin',
-    }
+ 
   }

From 1a51ab9383a1ec34a2f1e4d0d55c795d36ef745c Mon Sep 17 00:00:00 2001
From: GreenTesla <nlukin@gmail.com>
Date: Tue, 26 Sep 2017 15:37:52 -0400
Subject: [PATCH 044/233] Update site.pp

---
 manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 32d4be0..a2716f7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -47,7 +47,7 @@
   #   class { 'my_class': }
   include role::classroom
   
-  #file { '/etc/motd':
+  file { '/etc/motd':
    ensure => file,
    content => 'i learned puppet',
   }

From bd45d1a60a645db773089a9e45da6ee064ebe7bb Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Tue, 26 Sep 2017 15:49:32 -0400
Subject: [PATCH 045/233] Update site.pp

---
 manifests/site.pp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index cebff71..1741f86 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -51,9 +51,5 @@
   #  owner => 'root',
   #  content => "I NEED A HERO!!!\n",
   #}
-  
-  exec { "cowsay 'Welcome to ${::fqdn}!' > /etc/motd":
-    path => '/usr/local/bin',
-    creates => '/etc/motd',
-  }
+
 }

From 3d889cc520d4253d30cce8b2aac9fbb1f03f6c1f Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Tue, 26 Sep 2017 15:49:51 -0400
Subject: [PATCH 046/233] Create init.pp

---
 site/users/manifests/init.pp | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 site/users/manifests/init.pp

diff --git a/site/users/manifests/init.pp b/site/users/manifests/init.pp
new file mode 100644
index 0000000..352d33b
--- /dev/null
+++ b/site/users/manifests/init.pp
@@ -0,0 +1,5 @@
+user { 'elmo':
+ensure => present, # Ensure the user exists
+groups => [ 'sysadmins', 'puppetusers' ], # Groups the user should belong to
+password => $super_secret_password, # Use the value of the variable
+}

From 2917240c0e0ba01ffbf8e1e3b797d94aef03fe44 Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Tue, 26 Sep 2017 15:50:41 -0400
Subject: [PATCH 047/233] Create init.pp

Add user fundamentals
---
 site/users/manifests/init.pp | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 site/users/manifests/init.pp

diff --git a/site/users/manifests/init.pp b/site/users/manifests/init.pp
new file mode 100644
index 0000000..ca2effa
--- /dev/null
+++ b/site/users/manifests/init.pp
@@ -0,0 +1,3 @@
+user { 'fundamentals':
+  ensure => present,
+}

From 5cbd9837012444e44ee32f649505b7019f064d60 Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Tue, 26 Sep 2017 15:51:59 -0400
Subject: [PATCH 048/233] Update init.pp

---
 site/users/manifests/init.pp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/site/users/manifests/init.pp b/site/users/manifests/init.pp
index ca2effa..9fd3b55 100644
--- a/site/users/manifests/init.pp
+++ b/site/users/manifests/init.pp
@@ -1,3 +1,5 @@
-user { 'fundamentals':
-  ensure => present,
+class users {
+  user { 'fundamentals':
+    ensure => present,
+  }
 }

From bc1dcd8d72236c6f2ab67ea390a8837b84efbe8d Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Tue, 26 Sep 2017 15:52:12 -0400
Subject: [PATCH 049/233] Update init.pp

---
 site/users/manifests/init.pp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/site/users/manifests/init.pp b/site/users/manifests/init.pp
index 352d33b..c5b4f30 100644
--- a/site/users/manifests/init.pp
+++ b/site/users/manifests/init.pp
@@ -1,5 +1,4 @@
-user { 'elmo':
-ensure => present, # Ensure the user exists
-groups => [ 'sysadmins', 'puppetusers' ], # Groups the user should belong to
-password => $super_secret_password, # Use the value of the variable
-}
+class users 
+  user { 'fundamentals':
+    ensure => present, # Ensure the user exists
+  }

From bd7a8613b57ec3fada13376a04f6875ecaf95333 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Tue, 26 Sep 2017 15:52:41 -0400
Subject: [PATCH 050/233] Update init.pp

---
 site/users/manifests/init.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/site/users/manifests/init.pp b/site/users/manifests/init.pp
index c5b4f30..3e6732d 100644
--- a/site/users/manifests/init.pp
+++ b/site/users/manifests/init.pp
@@ -1,4 +1,5 @@
-class users 
+class users {
   user { 'fundamentals':
     ensure => present, # Ensure the user exists
   }
+}

From bbf6a7f05807f51d3d088795327030409021d0ed Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Tue, 26 Sep 2017 15:52:50 -0400
Subject: [PATCH 051/233] Create init.pp

---
 site/users/manifests/init.pp | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 site/users/manifests/init.pp

diff --git a/site/users/manifests/init.pp b/site/users/manifests/init.pp
new file mode 100644
index 0000000..0b0582e
--- /dev/null
+++ b/site/users/manifests/init.pp
@@ -0,0 +1,2 @@
+user { 'fundamentals': ensure => present,
+}

From 253149949f7f78652683bd364ad87e904cbff253 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Tue, 26 Sep 2017 15:53:35 -0400
Subject: [PATCH 052/233] Update init.pp

---
 site/users/manifests/init.pp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/site/users/manifests/init.pp b/site/users/manifests/init.pp
index 0b0582e..0bcfcd8 100644
--- a/site/users/manifests/init.pp
+++ b/site/users/manifests/init.pp
@@ -1,2 +1,5 @@
-user { 'fundamentals': ensure => present,
+class users {
+  user { 'fundamentals': 
+    ensure => present,
+  }
 }

From 4514629f520ed46ba34c6bd9548896a73428e484 Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Tue, 26 Sep 2017 15:53:47 -0400
Subject: [PATCH 053/233] Create init.pp

---
 manifests/init.pp | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 manifests/init.pp

diff --git a/manifests/init.pp b/manifests/init.pp
new file mode 100644
index 0000000..3c39f88
--- /dev/null
+++ b/manifests/init.pp
@@ -0,0 +1,5 @@
+class users { 
+  user { 'fundamentals':
+    ensure => present,
+  }
+}

From ba7f01ecbe58664e72c735d4b0d1b39652e44061 Mon Sep 17 00:00:00 2001
From: GreenTesla <nlukin@gmail.com>
Date: Tue, 26 Sep 2017 15:54:38 -0400
Subject: [PATCH 054/233] Create users

---
 site/users | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 site/users

diff --git a/site/users b/site/users
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/site/users
@@ -0,0 +1 @@
+

From 4af0b5e02b7ec7605beeafa94dfbda4bbbb79fee Mon Sep 17 00:00:00 2001
From: GreenTesla <nlukin@gmail.com>
Date: Tue, 26 Sep 2017 15:54:52 -0400
Subject: [PATCH 055/233] Delete users

---
 site/users | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 site/users

diff --git a/site/users b/site/users
deleted file mode 100644
index 8b13789..0000000
--- a/site/users
+++ /dev/null
@@ -1 +0,0 @@
-

From f04c413da8b5af253476d1197b139d259ff0f29c Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Tue, 26 Sep 2017 15:57:19 -0400
Subject: [PATCH 056/233] Create init.pp

---
 site/users/manifests/init.pp | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 site/users/manifests/init.pp

diff --git a/site/users/manifests/init.pp b/site/users/manifests/init.pp
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/site/users/manifests/init.pp
@@ -0,0 +1 @@
+

From c76c4216ab4f23979b340290f828afe5ec264992 Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Tue, 26 Sep 2017 15:58:25 -0400
Subject: [PATCH 057/233] Update init.pp

---
 site/users/manifests/init.pp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/site/users/manifests/init.pp b/site/users/manifests/init.pp
index 8b13789..8dbc550 100644
--- a/site/users/manifests/init.pp
+++ b/site/users/manifests/init.pp
@@ -1 +1,5 @@
-
+class users {   
+    user { 'fundamentals':    
+        ensure => present,  
+     }
+}

From 32a7f020efeb4a045d2f2c6fdd77b1b5a0457c37 Mon Sep 17 00:00:00 2001
From: GreenTesla <nlukin@gmail.com>
Date: Tue, 26 Sep 2017 15:58:44 -0400
Subject: [PATCH 058/233] Create init.pp

---
 site/users/manifest/init.pp | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 site/users/manifest/init.pp

diff --git a/site/users/manifest/init.pp b/site/users/manifest/init.pp
new file mode 100644
index 0000000..9daeafb
--- /dev/null
+++ b/site/users/manifest/init.pp
@@ -0,0 +1 @@
+test

From ca84d7ab3810edebb1f30c3b4112112e7c6f8853 Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Tue, 26 Sep 2017 15:58:55 -0400
Subject: [PATCH 059/233] Delete init.pp

---
 manifests/init.pp | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 manifests/init.pp

diff --git a/manifests/init.pp b/manifests/init.pp
deleted file mode 100644
index 3c39f88..0000000
--- a/manifests/init.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class users { 
-  user { 'fundamentals':
-    ensure => present,
-  }
-}

From a301509f6b65e739148b95c998285e78d520531a Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Wed, 27 Sep 2017 09:17:57 -0400
Subject: [PATCH 060/233] Create init.pp

---
 site/users/examples/init.pp | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 site/users/examples/init.pp

diff --git a/site/users/examples/init.pp b/site/users/examples/init.pp
new file mode 100644
index 0000000..78408bb
--- /dev/null
+++ b/site/users/examples/init.pp
@@ -0,0 +1,2 @@
+# Instantiate users
+include ::users

From 92c0a4e71af3b830b7276287281aa0e368dcd534 Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Wed, 27 Sep 2017 09:18:49 -0400
Subject: [PATCH 061/233] Update site.pp

---
 manifests/site.pp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index e764d1f..c8a5daa 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -44,7 +44,9 @@
   # This is where you can declare classes for all nodes.
   # Example:
   #   class { 'my_class': }
-  include role::classroom
+  # include role::classroom
+  
+  include ::users
   
   #file {            '/etc/motd':
   #  ensure => file,

From 8859252a70e941c941429fe699cb86d356fe4b17 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 09:22:34 -0400
Subject: [PATCH 062/233] Create init.pp

---
 site/users/examples/init.pp | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 site/users/examples/init.pp

diff --git a/site/users/examples/init.pp b/site/users/examples/init.pp
new file mode 100644
index 0000000..6c2f11d
--- /dev/null
+++ b/site/users/examples/init.pp
@@ -0,0 +1,3 @@
+class site::users {
+  include example::users
+}

From d158532db3ff606892548fd179a5bfdda248cede Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 09:24:12 -0400
Subject: [PATCH 063/233] Update site.pp

---
 manifests/site.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 1741f86..473a9a8 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -44,7 +44,8 @@
   # Example:
   #   class { 'my_class': }
   include role::classroom
-  notify { "Hello, my name name is ${::hostname}": }
+  include users
+  #notify { "Hello, my name name is ${::hostname}": }
   
   #file { '/etc/motd':
   #  ensure => file,

From 2e94e6353046461a77f7d376494789bf8300f4e5 Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Wed, 27 Sep 2017 09:25:54 -0400
Subject: [PATCH 064/233] Create init.pp

---
 site/users/examples/init.pp | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 site/users/examples/init.pp

diff --git a/site/users/examples/init.pp b/site/users/examples/init.pp
new file mode 100644
index 0000000..72bcbd3
--- /dev/null
+++ b/site/users/examples/init.pp
@@ -0,0 +1 @@
+include ::users

From 39312487a671869d98af3b1c125f8d64a5b57d7d Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 09:26:41 -0400
Subject: [PATCH 065/233] Create init.pp

---
 site/users/manifests/examples/init.pp | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 site/users/manifests/examples/init.pp

diff --git a/site/users/manifests/examples/init.pp b/site/users/manifests/examples/init.pp
new file mode 100644
index 0000000..72bcbd3
--- /dev/null
+++ b/site/users/manifests/examples/init.pp
@@ -0,0 +1 @@
+include ::users

From 539597a3fce97f5c85fe5c5dbec5e3bdda7ad4e0 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 09:27:05 -0400
Subject: [PATCH 066/233] Update init.pp

---
 site/users/examples/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/users/examples/init.pp b/site/users/examples/init.pp
index 6c2f11d..90bea9c 100644
--- a/site/users/examples/init.pp
+++ b/site/users/examples/init.pp
@@ -1,3 +1,3 @@
 class site::users {
-  include example::users
+  include ::users
 }

From d58cfce9b10ef608af3217a8fadbd37ac768ab8f Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 09:28:33 -0400
Subject: [PATCH 067/233] Update site.pp

---
 manifests/site.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index 84314f7..6ab5827 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -44,6 +44,7 @@
   # This is where you can declare classes for all nodes.
   # Example:
   #   class { 'my_class': }
+  include ::users
   include role::classroom
   notify { "Hello, my name name is ${::hostname}": }
   #file { '/etc/motd':

From 2f7dcc466e2511f2f58dddba0db2342264802352 Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Wed, 27 Sep 2017 09:30:56 -0400
Subject: [PATCH 068/233] Update site.pp

---
 manifests/site.pp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 64bb393..1b5afda 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -46,11 +46,11 @@
   # Example:
   #   class { 'my_class': }
   include role::classroom
-
+  include ::users
 
 #file { '/etc/motd':      ensure => file,      content => 'This Crazy Course' } 
 
-exec {"cowsay 'Welcome to ${::fqdn}!' > /etc/motd":
-  creates => '/etc/motd',
-  path => '/usr/local/bin', }
+#exec {"cowsay 'Welcome to ${::fqdn}!' > /etc/motd":
+#  creates => '/etc/motd',
+#  path => '/usr/local/bin', }
 }

From 2a6ee4760db0e6c75f40342cd24053781461c623 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 09:41:05 -0400
Subject: [PATCH 069/233] Create init.pp

---
 site/skeleton/manifests/init.pp | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 site/skeleton/manifests/init.pp

diff --git a/site/skeleton/manifests/init.pp b/site/skeleton/manifests/init.pp
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/site/skeleton/manifests/init.pp
@@ -0,0 +1 @@
+

From cea5d2ac0e63151027662ed745f872fbd5f77ddb Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Wed, 27 Sep 2017 09:41:09 -0400
Subject: [PATCH 070/233] Create init.pp

---
 site/skeleton/manifests/init.pp | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 site/skeleton/manifests/init.pp

diff --git a/site/skeleton/manifests/init.pp b/site/skeleton/manifests/init.pp
new file mode 100644
index 0000000..4cf38fa
--- /dev/null
+++ b/site/skeleton/manifests/init.pp
@@ -0,0 +1,12 @@
+class skeleton {
+
+  file { '/etc/skel':
+    ensure => directory,
+  }
+  
+  file { '/etc/skel/.bashrc':
+    ensure => file.
+    source => 'puppet:///modules/skeleton/bashrc',
+  }
+}
+

From 735d1d0dabd1e10477119f3b8cdeff3e8a228044 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 09:43:13 -0400
Subject: [PATCH 071/233] Create .bashrc

---
 site/etc/skel/.bashrc | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 site/etc/skel/.bashrc

diff --git a/site/etc/skel/.bashrc b/site/etc/skel/.bashrc
new file mode 100644
index 0000000..fe7dd25
--- /dev/null
+++ b/site/etc/skel/.bashrc
@@ -0,0 +1,8 @@
+# .bashrc
+# Source global definitions
+if [ -f /etc/bashrc ]; then
+        . /etc/bashrc
+fi
+# Uncomment the following line if you don't like systemctl's auto-paging feature:
+# export SYSTEMD_PAGER=
+# User specific aliases and functions

From cff6b99b9bd08e328890adaba46f6a51c4f52d96 Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Wed, 27 Sep 2017 09:43:24 -0400
Subject: [PATCH 072/233] Create bashrc

---
 site/skeleton/files/bashrc | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 site/skeleton/files/bashrc

diff --git a/site/skeleton/files/bashrc b/site/skeleton/files/bashrc
new file mode 100644
index 0000000..093c0ad
--- /dev/null
+++ b/site/skeleton/files/bashrc
@@ -0,0 +1,15 @@
+# .bashrc
+
+# Source global definitions
+if [ -f /etc/bashrc ]; then
+	. /etc/bashrc
+fi
+
+# Uncomment the following line if you don't like systemctl's auto-paging feature:
+# export SYSTEMD_PAGER=
+
+# User specific aliases and functions
+
+export PATH=$PATH:/usr/local/bin
+
+cowsay 'Puppet is cool!'

From 1638651c08f15282898804aa68779228ca0f8bdb Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Wed, 27 Sep 2017 09:43:57 -0400
Subject: [PATCH 073/233] Create init.pp

---
 site/skeleton/examples/init.pp | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 site/skeleton/examples/init.pp

diff --git a/site/skeleton/examples/init.pp b/site/skeleton/examples/init.pp
new file mode 100644
index 0000000..96164de
--- /dev/null
+++ b/site/skeleton/examples/init.pp
@@ -0,0 +1 @@
+include ::skeleton

From e617c9dbfdc4aee38d0b9ed9732475dbffa0f3a8 Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Wed, 27 Sep 2017 09:48:23 -0400
Subject: [PATCH 074/233] Update init.pp

---
 site/skeleton/manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/skeleton/manifests/init.pp b/site/skeleton/manifests/init.pp
index 4cf38fa..5e9b93b 100644
--- a/site/skeleton/manifests/init.pp
+++ b/site/skeleton/manifests/init.pp
@@ -5,7 +5,7 @@
   }
   
   file { '/etc/skel/.bashrc':
-    ensure => file.
+    ensure => file,
     source => 'puppet:///modules/skeleton/bashrc',
   }
 }

From c3f909d8a4effe74d1964951a684231545fcb245 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 09:49:10 -0400
Subject: [PATCH 075/233] Delete .bashrc

---
 site/etc/skel/.bashrc | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 site/etc/skel/.bashrc

diff --git a/site/etc/skel/.bashrc b/site/etc/skel/.bashrc
deleted file mode 100644
index fe7dd25..0000000
--- a/site/etc/skel/.bashrc
+++ /dev/null
@@ -1,8 +0,0 @@
-# .bashrc
-# Source global definitions
-if [ -f /etc/bashrc ]; then
-        . /etc/bashrc
-fi
-# Uncomment the following line if you don't like systemctl's auto-paging feature:
-# export SYSTEMD_PAGER=
-# User specific aliases and functions

From eb6e209f613b799af1f8ee3423d7c08570825e32 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 09:49:39 -0400
Subject: [PATCH 076/233] Create init.pp

---
 site/skeleton/manifests/init.pp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 site/skeleton/manifests/init.pp

diff --git a/site/skeleton/manifests/init.pp b/site/skeleton/manifests/init.pp
new file mode 100644
index 0000000..d40d294
--- /dev/null
+++ b/site/skeleton/manifests/init.pp
@@ -0,0 +1,15 @@
+class skeleton {
+  # create a directory
+  file { '/etc/skel':
+    ensure => 'directory',
+  }
+
+  # a fuller example, including permissions and ownership
+  file { '/etc/skel/bashrc':
+    ensure => 'file',
+    owner  => 'root',
+    group  => 'root',
+    mode   => '0664',
+    source => 'puppet:///modules/skeleton/bashrc
+  }
+}

From ee587128690658777346c94c20e1befef80153be Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 09:49:50 -0400
Subject: [PATCH 077/233] Create bashrc

---
 site/skeleton/files/bashrc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 site/skeleton/files/bashrc

diff --git a/site/skeleton/files/bashrc b/site/skeleton/files/bashrc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/site/skeleton/files/bashrc
@@ -0,0 +1 @@
+

From 477c5e32fcee5c41734e8079f094bd2a4e553d9b Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 09:50:20 -0400
Subject: [PATCH 078/233] Create init.pp

---
 site/skeleton/examples/init.pp | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 site/skeleton/examples/init.pp

diff --git a/site/skeleton/examples/init.pp b/site/skeleton/examples/init.pp
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/site/skeleton/examples/init.pp
@@ -0,0 +1 @@
+

From 8e5fb1b46d624af8c69d07e14aa165dadec55778 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 09:50:47 -0400
Subject: [PATCH 079/233] Update init.pp

---
 site/skeleton/examples/init.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site/skeleton/examples/init.pp b/site/skeleton/examples/init.pp
index 8b13789..d8a8005 100644
--- a/site/skeleton/examples/init.pp
+++ b/site/skeleton/examples/init.pp
@@ -1 +1,2 @@
 
+include skeleton

From 740b136c781de18b724e8d838616929e7aac7674 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 09:51:51 -0400
Subject: [PATCH 080/233] Update bashrc

---
 site/skeleton/files/bashrc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/site/skeleton/files/bashrc b/site/skeleton/files/bashrc
index 8b13789..08bb839 100644
--- a/site/skeleton/files/bashrc
+++ b/site/skeleton/files/bashrc
@@ -1 +1,7 @@
 
+# Source global definitions
+if [ -f /etc/bashrc ]; then . /etc/bashrc
+fi
+# Uncomment the following line if you don't like systemctl's auto-paging feature: # export SYSTEMD_PAGER=
+# User specific aliases and functions
+cowsay 'Hi there!'

From 0005e2eb3b0dac0476d2839048dc41e1d59fe50e Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 09:52:25 -0400
Subject: [PATCH 081/233] Create bashrc

---
 site/skeleton/files/bashrc | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 site/skeleton/files/bashrc

diff --git a/site/skeleton/files/bashrc b/site/skeleton/files/bashrc
new file mode 100644
index 0000000..f593a5e
--- /dev/null
+++ b/site/skeleton/files/bashrc
@@ -0,0 +1,10 @@
+# .bashrc
+# Source global definitions
+if [ -f /etc/bashrc ]; then
+  . /etc/bashrc
+fi
+# Uncomment the following line if you don't like systemctl's auto-paging feature:
+# export SYSTEMD_PAGER=
+# User specific aliases and functions
+export PATH=$PATH:/usr/local/bin # Add this line
+cowsay 'Hi there!'

From 675a931cdf74906ef733dfa87613e21c2351eb79 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 09:52:52 -0400
Subject: [PATCH 082/233] Create init.pp

---
 site/skeleton/examples/init.pp | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 site/skeleton/examples/init.pp

diff --git a/site/skeleton/examples/init.pp b/site/skeleton/examples/init.pp
new file mode 100644
index 0000000..cd9e4fd
--- /dev/null
+++ b/site/skeleton/examples/init.pp
@@ -0,0 +1 @@
+include skeleton

From 67433f718532153efcaf557f7c63841affe84cd0 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 09:56:38 -0400
Subject: [PATCH 083/233] Update init.pp

---
 site/skeleton/manifests/init.pp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/site/skeleton/manifests/init.pp b/site/skeleton/manifests/init.pp
index 8b13789..a3bed3e 100644
--- a/site/skeleton/manifests/init.pp
+++ b/site/skeleton/manifests/init.pp
@@ -1 +1,16 @@
+class skeleton {
+  file {'/etc/skel':
+    ensure => directory,
+    owner => 'root',
+    group => 'root',
+    mode => '0755',
+  }
+  file { '/etc/skel/.bashrc':
+    ensure => file,
+    owner => 'root',
+    group => 'root',
+    mode => '0755',
+    source => 'puppet:///modules/skeleton/basrc',
+  }  
+}
 

From 55318fdacbde82187c6843fa3ab2a1ee0e90e2bf Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 09:56:42 -0400
Subject: [PATCH 084/233] Update init.pp

---
 site/skeleton/manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/skeleton/manifests/init.pp b/site/skeleton/manifests/init.pp
index d40d294..e225385 100644
--- a/site/skeleton/manifests/init.pp
+++ b/site/skeleton/manifests/init.pp
@@ -5,7 +5,7 @@
   }
 
   # a fuller example, including permissions and ownership
-  file { '/etc/skel/bashrc':
+  file { '/etc/skel/.bashrc':
     ensure => 'file',
     owner  => 'root',
     group  => 'root',

From 825f6435ceb74cbafd8aa37c73990a7a7e2c7767 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 09:56:51 -0400
Subject: [PATCH 085/233] Update init.pp

---
 site/skeleton/manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/skeleton/manifests/init.pp b/site/skeleton/manifests/init.pp
index a3bed3e..f965297 100644
--- a/site/skeleton/manifests/init.pp
+++ b/site/skeleton/manifests/init.pp
@@ -10,7 +10,7 @@
     owner => 'root',
     group => 'root',
     mode => '0755',
-    source => 'puppet:///modules/skeleton/basrc',
+    source => 'puppet:///modules/skeleton/bashrc',
   }  
 }
 

From ff9aa76b02d136edac4ac5c99f4291a1ec56fbad Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 09:59:23 -0400
Subject: [PATCH 086/233] Update site.pp

---
 manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 473a9a8..2422006 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -44,7 +44,7 @@
   # Example:
   #   class { 'my_class': }
   include role::classroom
-  include users
+  include skeleton
   #notify { "Hello, my name name is ${::hostname}": }
   
   #file { '/etc/motd':

From d6788bc8e1432487775340b7ae3782d22009fb93 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 09:59:49 -0400
Subject: [PATCH 087/233] Update site.pp

---
 manifests/site.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index 6ab5827..0ed4d5d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -46,6 +46,7 @@
   #   class { 'my_class': }
   include ::users
   include role::classroom
+  include ::skeleton
   notify { "Hello, my name name is ${::hostname}": }
   #file { '/etc/motd':
   #  ensure => file,

From a0dd4f1327cbab1eb5bb8960eebf1701001dc29c Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 10:02:35 -0400
Subject: [PATCH 088/233] Update init.pp

---
 site/skeleton/manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/skeleton/manifests/init.pp b/site/skeleton/manifests/init.pp
index e225385..3603fa8 100644
--- a/site/skeleton/manifests/init.pp
+++ b/site/skeleton/manifests/init.pp
@@ -10,6 +10,6 @@
     owner  => 'root',
     group  => 'root',
     mode   => '0664',
-    source => 'puppet:///modules/skeleton/bashrc
+    source => 'puppet:///modules/skeleton/bashrc'
   }
 }

From c78ac21725972ed15c7bfd404568e0c9a9cdb988 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 10:02:46 -0400
Subject: [PATCH 089/233] Update init.pp

---
 site/skeleton/manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/skeleton/manifests/init.pp b/site/skeleton/manifests/init.pp
index 3603fa8..833ceee 100644
--- a/site/skeleton/manifests/init.pp
+++ b/site/skeleton/manifests/init.pp
@@ -10,6 +10,6 @@
     owner  => 'root',
     group  => 'root',
     mode   => '0664',
-    source => 'puppet:///modules/skeleton/bashrc'
+    source => 'puppet:///modules/skeleton/.bashrc'
   }
 }

From 86bb69832af8a031b0d107141fea9a4274d36c85 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 10:08:56 -0400
Subject: [PATCH 090/233] Rename bashrc to .bashrc

---
 site/skeleton/files/{bashrc => .bashrc} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename site/skeleton/files/{bashrc => .bashrc} (100%)

diff --git a/site/skeleton/files/bashrc b/site/skeleton/files/.bashrc
similarity index 100%
rename from site/skeleton/files/bashrc
rename to site/skeleton/files/.bashrc

From dd7aa23701e7efb40093dc5bff3d538c74f99600 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 10:17:59 -0400
Subject: [PATCH 091/233] Update index.html

---
 site/nginx/files/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/nginx/files/index.html b/site/nginx/files/index.html
index 960c47e..cdaca9a 100644
--- a/site/nginx/files/index.html
+++ b/site/nginx/files/index.html
@@ -1,8 +1,8 @@
 <html>
   <head>
-    <title>Hello from Puppet!</title>
+    <title>Master of Puppets!</title>
   </head>
   <body>
-    <h1>Hello World, Puppet is Fun!</h1>
+    <h1>Hello World, Master of Puppets is pulling the STRINGS!</h1>
   </body>
 </html>

From 4831094159c625062f21e0c5ca43b25197de23e4 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 10:18:40 -0400
Subject: [PATCH 092/233] Create init.pp

---
 site/nginx/manifests/init.pp | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 site/nginx/manifests/init.pp

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
new file mode 100644
index 0000000..907b308
--- /dev/null
+++ b/site/nginx/manifests/init.pp
@@ -0,0 +1 @@
+blah

From dc490ee28629edd7a95d2122581f7e1f63493f5e Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 10:20:36 -0400
Subject: [PATCH 093/233] Update init.pp

---
 site/nginx/manifests/init.pp | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index 907b308..2896236 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -1 +1,15 @@
-blah
+class nginx {
+  # create a directory
+  file { '/etc/skel':
+    ensure => 'directory',
+  }
+
+  # a fuller example, including permissions and ownership
+  file { '/etc/skel/.bashrc':
+    ensure => 'file',
+    owner  => 'root',
+    group  => 'root',
+    mode   => '0664',
+    source => 'puppet:///modules/skeleton/.bashrc'
+  }
+}

From 687212e8dbcc6096ecf09cb1d00e24c74060868b Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 10:23:24 -0400
Subject: [PATCH 094/233] Create init.pp

---
 site/ngix/examples/init.pp | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 site/ngix/examples/init.pp

diff --git a/site/ngix/examples/init.pp b/site/ngix/examples/init.pp
new file mode 100644
index 0000000..da7546a
--- /dev/null
+++ b/site/ngix/examples/init.pp
@@ -0,0 +1 @@
+include nginx

From 0221128f2f05e7651c9c287bbdb5bfde80899b24 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 10:27:57 -0400
Subject: [PATCH 095/233] Create init.pp

---
 site/nginx/manifests/init.pp | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 site/nginx/manifests/init.pp

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/site/nginx/manifests/init.pp
@@ -0,0 +1 @@
+

From d92cf0bc9fdee3f3bb98959b0ff5130e044699c9 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 10:28:50 -0400
Subject: [PATCH 096/233] Delete init.pp

---
 site/ngix/examples/init.pp | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 site/ngix/examples/init.pp

diff --git a/site/ngix/examples/init.pp b/site/ngix/examples/init.pp
deleted file mode 100644
index da7546a..0000000
--- a/site/ngix/examples/init.pp
+++ /dev/null
@@ -1 +0,0 @@
-include nginx

From d142e7e9e9977286bd631005b5d6403331371a6c Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 10:31:48 -0400
Subject: [PATCH 097/233] Update init.pp

---
 site/nginx/manifests/init.pp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index 8b13789..f3ec1c4 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -1 +1,16 @@
 
+class nginx {
+  file {'/var/www':
+    ensure => directory,
+    owner => 'root',
+    group => 'root',
+    mode => '0755',
+  }
+  file { '/var/www/index.html':
+    ensure => file,
+    owner => 'root',
+    group => 'root',
+    mode => '0755',
+    source => 'puppet:///modules/nginx/index.html',
+  }  
+}

From 3a8cf760ec8e2b95ae17311a5493d6c8f48d6310 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 10:32:36 -0400
Subject: [PATCH 098/233] Update init.pp

---
 site/nginx/manifests/init.pp | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index 2896236..df7e474 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -1,15 +1,37 @@
 class nginx {
+  #ensure package is present
+  package { 'nginx':
+    ensure => present,
+  }
   # create a directory
-  file { '/etc/skel':
+  file { '/var/www':
     ensure => 'directory',
   }
 
   # a fuller example, including permissions and ownership
-  file { '/etc/skel/.bashrc':
+  file { '/etc/nginx/nginx.conf':
+    ensure => 'file',
+    source => 'puppet:///modules/nginx/nginx.conf'
+  }
+  
+  # a fuller example, including permissions and ownership
+  file { '/etc/nginx/conf.d/default.conf':
     ensure => 'file',
-    owner  => 'root',
-    group  => 'root',
-    mode   => '0664',
-    source => 'puppet:///modules/skeleton/.bashrc'
+    source => 'puppet:///modules/nginx/nginx.conf'
+  }
+    # a fuller example, including permissions and ownership
+  file { '/etc/nginx/conf.d/default.conf':
+    ensure => 'file',
+    source => 'puppet:///modules/nginx/index.html'
+  }
+  file { '/etc/nginx/conf.d':
+    ensure => directory,
+    owner => 'root',
+    group => 'root',
+    mode => '0775',
+  }
+  service { 'nginx':
+    ensure => running,
+    enable => true,
   }
 }

From acf93791fdc4a1c32498c61e2a7e3e76d1a93de1 Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Wed, 27 Sep 2017 10:33:34 -0400
Subject: [PATCH 099/233] Update index.html

---
 site/nginx/files/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/nginx/files/index.html b/site/nginx/files/index.html
index 960c47e..6ff4a56 100644
--- a/site/nginx/files/index.html
+++ b/site/nginx/files/index.html
@@ -3,6 +3,6 @@
     <title>Hello from Puppet!</title>
   </head>
   <body>
-    <h1>Hello World, Puppet is Fun!</h1>
+    <h1>Hello World, Puppet is for Puppets!</h1>
   </body>
 </html>

From 02b3e6db0e65379c8cdd5d685ba09f1dc633a438 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 10:34:26 -0400
Subject: [PATCH 100/233] Update init.pp

---
 site/nginx/manifests/init.pp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index f3ec1c4..ed90e1b 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -12,5 +12,18 @@
     group => 'root',
     mode => '0755',
     source => 'puppet:///modules/nginx/index.html',
+  }
+  file {' /etc/nginx':
+    ensure => directory,
+    owner => 'root',
+    group => 'root',
+    mode => '0755',
+  }
+  file { ' /etc/nginx/nginx.conf':
+    ensure => file,
+    owner => 'root',
+    group => 'root',
+    mode => '0755',
+    source => 'puppet:///modules/nginx/nginx.conf',
   }  
 }

From 06e3616205c9e1641727960fef97c16f83255c06 Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Wed, 27 Sep 2017 10:36:38 -0400
Subject: [PATCH 101/233] Create init.pp

---
 site/nginx/examples/init.pp | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 site/nginx/examples/init.pp

diff --git a/site/nginx/examples/init.pp b/site/nginx/examples/init.pp
new file mode 100644
index 0000000..da7546a
--- /dev/null
+++ b/site/nginx/examples/init.pp
@@ -0,0 +1 @@
+include nginx

From 08507f0131f83d747cfbef8431f65851430535f0 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 10:38:45 -0400
Subject: [PATCH 102/233] Update init.pp

---
 site/nginx/manifests/init.pp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index ed90e1b..5534dae 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -25,5 +25,18 @@
     group => 'root',
     mode => '0755',
     source => 'puppet:///modules/nginx/nginx.conf',
+  }
+  file { ' /etc/nginx/conf.d':
+    ensure => directory,
+    owner => 'root',
+    group => 'root',
+    mode => '0755',
+  }  
+  file { ' /etc/nginx/conf.d/default.conf':
+    ensure => file,
+    owner => 'root',
+    group => 'root',
+    mode => '0755',
+    source => 'puppet:///modules/nginx/default.conf',
   }  
 }

From 65fd2fc57ee672a3eb4bc57f55184de971a70d9e Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 10:39:17 -0400
Subject: [PATCH 103/233] Update init.pp

---
 site/nginx/manifests/init.pp | 38 ++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index df7e474..bf56090 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -6,30 +6,44 @@
   # create a directory
   file { '/var/www':
     ensure => 'directory',
+    owner => 'root',
+    group => 'root',
+    mode => '0775',
   }
-
-  # a fuller example, including permissions and ownership
-  file { '/etc/nginx/nginx.conf':
+  # ensure index.html exists
+  file { '/var/www/index.html':
     ensure => 'file',
-    source => 'puppet:///modules/nginx/nginx.conf'
+    owner => 'root',
+    group => 'root',
+    mode => '0664',
+    source => 'puppet:///modules/nginx/index.html'
   }
-  
   # a fuller example, including permissions and ownership
-  file { '/etc/nginx/conf.d/default.conf':
+  file { '/etc/nginx/nginx.conf':
     ensure => 'file',
+    owner => 'root',
+    group => 'root',
+    mode => '0664',
     source => 'puppet:///modules/nginx/nginx.conf'
+    require => Package['nginx'],
+    notify => Service['nginx'],
   }
-    # a fuller example, including permissions and ownership
-  file { '/etc/nginx/conf.d/default.conf':
-    ensure => 'file',
-    source => 'puppet:///modules/nginx/index.html'
-  }
-  file { '/etc/nginx/conf.d':
+    file { '/etc/nginx/conf.d':
     ensure => directory,
     owner => 'root',
     group => 'root',
     mode => '0775',
   }
+  # a fuller example, including permissions and ownership
+  file { '/etc/nginx/conf.d/default.conf':
+    owner => 'root',
+    group => 'root',
+    mode => '0664',
+    ensure => 'file',
+    source => 'puppet:///modules/nginx/nginx.conf'
+    require => Package['nginx'],
+    notify => Service['nginx'],
+  }
   service { 'nginx':
     ensure => running,
     enable => true,

From 5f4dd97453441ea78bcd135f8d4f6e73a5df4bf8 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 10:39:42 -0400
Subject: [PATCH 104/233] Create init.pp

---
 site/nginx/examples/init.pp | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 site/nginx/examples/init.pp

diff --git a/site/nginx/examples/init.pp b/site/nginx/examples/init.pp
new file mode 100644
index 0000000..da7546a
--- /dev/null
+++ b/site/nginx/examples/init.pp
@@ -0,0 +1 @@
+include nginx

From 78d92b9b434e64b3279a870e62749ac095b37389 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 10:40:15 -0400
Subject: [PATCH 105/233] Create init.pp

---
 site/nginx/examples/init.pp | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 site/nginx/examples/init.pp

diff --git a/site/nginx/examples/init.pp b/site/nginx/examples/init.pp
new file mode 100644
index 0000000..da7546a
--- /dev/null
+++ b/site/nginx/examples/init.pp
@@ -0,0 +1 @@
+include nginx

From 16def1847a12ac736f8eacdf8dea62685ea34d5a Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Wed, 27 Sep 2017 10:40:49 -0400
Subject: [PATCH 106/233] Create init.pp

---
 site/nginx/manifests/init.pp | 46 ++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 site/nginx/manifests/init.pp

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
new file mode 100644
index 0000000..23224a7
--- /dev/null
+++ b/site/nginx/manifests/init.pp
@@ -0,0 +1,46 @@
+class nginx {
+package { 'nginx':
+ensure => present,
+}
+file { '/var/www':
+ensure => directory,
+owner => 'root',
+group => 'root',
+mode => '0775',
+}
+file { '/var/www/index.html':
+ensure => file,
+owner => 'root',
+group => 'root',
+mode => '0664',
+source => 'puppet:///modules/nginx/index.html',
+}
+file { '/etc/nginx/nginx.conf':
+ensure => file,
+owner => 'root',
+group => 'root',
+mode => '0664',
+source => 'puppet:///modules/nginx/nginx.conf',
+require => Package['nginx'],
+notify => Service['nginx'],
+}
+file { '/etc/nginx/conf.d':
+ensure => directory,
+owner => 'root',
+group => 'root',
+mode => '0775',
+}
+file { '/etc/nginx/conf.d/default.conf':
+ensure => file,
+owner => 'root',
+group => 'root',
+mode => '0664',
+source => 'puppet:///modules/nginx/default.conf',
+require => Package['nginx'],
+notify => Service['nginx'],
+}
+service { 'nginx':
+ensure => running,
+enable => true,
+}
+}

From a0801cb9cf5800ca39425085c8d6006394da0609 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 10:42:13 -0400
Subject: [PATCH 107/233] Update init.pp

---
 site/nginx/manifests/init.pp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index 5534dae..cfeb6ac 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -38,5 +38,9 @@
     group => 'root',
     mode => '0755',
     source => 'puppet:///modules/nginx/default.conf',
-  }  
+  }
+  service { 'nginx':
+    ensure => running,
+    enable => true,
+  }
 }

From 14733aecdcfbd1e9b1922bd03aec06519268e99d Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 10:44:54 -0400
Subject: [PATCH 108/233] Update site.pp

---
 manifests/site.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index 2422006..a407bf8 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -45,6 +45,7 @@
   #   class { 'my_class': }
   include role::classroom
   include skeleton
+  include nginx
   #notify { "Hello, my name name is ${::hostname}": }
   
   #file { '/etc/motd':

From ee58d6c3ce11ae8f21a1662b3c94c32b07c30ac6 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 10:45:45 -0400
Subject: [PATCH 109/233] Update init.pp

---
 site/nginx/manifests/init.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index bf56090..9d862f8 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -16,7 +16,7 @@
     owner => 'root',
     group => 'root',
     mode => '0664',
-    source => 'puppet:///modules/nginx/index.html'
+    source => 'puppet:///modules/nginx/index.html',
   }
   # a fuller example, including permissions and ownership
   file { '/etc/nginx/nginx.conf':
@@ -24,7 +24,7 @@
     owner => 'root',
     group => 'root',
     mode => '0664',
-    source => 'puppet:///modules/nginx/nginx.conf'
+    source => 'puppet:///modules/nginx/nginx.conf',
     require => Package['nginx'],
     notify => Service['nginx'],
   }
@@ -40,7 +40,7 @@
     group => 'root',
     mode => '0664',
     ensure => 'file',
-    source => 'puppet:///modules/nginx/nginx.conf'
+    source => 'puppet:///modules/nginx/nginx.conf',
     require => Package['nginx'],
     notify => Service['nginx'],
   }

From 5fb29671c899ae6bf19362d358bc4695d0c8ea5d Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Wed, 27 Sep 2017 10:50:10 -0400
Subject: [PATCH 110/233] Create init.pp

---
 site/nginx/manifests/init.pp | 52 ++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 site/nginx/manifests/init.pp

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
new file mode 100644
index 0000000..94c569e
--- /dev/null
+++ b/site/nginx/manifests/init.pp
@@ -0,0 +1,52 @@
+class nginx {
+  package { 'nginx':
+    ensure => present,
+  }
+  
+  file { '/var/www':
+    ensure => directory,
+    owner => 'root',
+    group => 'root',
+    mode => '0775',
+  }
+  
+  file { '/var/www/index.html':
+    ensure => file,
+    owner => 'root',
+    group => 'root',
+    mode => '0664',
+    source => 'puppet:///modules/nginx/index.html',
+  }
+  
+  file { '/etc/nginx/nginx.conf':
+    ensure => file,
+    owner => 'root',
+    group => 'root',
+    mode => '0664',
+    source => 'puppet:///modules/nginx/nginx.conf',
+    require => Package['nginx'],
+    notify => Service['nginx'],
+  }
+  
+  file { '/etc/nginx/conf.d':
+    ensure => directory,
+    owner => 'root',
+    group => 'root',
+    mode => '0775',
+  }
+  
+  file { '/etc/nginx/conf.d/default.conf':
+    ensure => file,
+    owner => 'root',
+    group => 'root',
+    mode => '0664',
+    source => 'puppet:///modules/nginx/default.conf',
+    require => Package['nginx'],
+    notify => Service['nginx'],
+  }
+
+  service { 'nginx':
+    ensure => running,
+    enable => true,
+  }
+}

From 0ff5a6dfafd59d168e06fb41e1cb0b2ffd9f9125 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 10:51:33 -0400
Subject: [PATCH 111/233] Update init.pp

---
 site/nginx/manifests/init.pp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index cfeb6ac..2a4d000 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -13,26 +13,26 @@
     mode => '0755',
     source => 'puppet:///modules/nginx/index.html',
   }
-  file {' /etc/nginx':
+  file {'/etc/nginx':
     ensure => directory,
     owner => 'root',
     group => 'root',
     mode => '0755',
   }
-  file { ' /etc/nginx/nginx.conf':
+  file { '/etc/nginx/nginx.conf':
     ensure => file,
     owner => 'root',
     group => 'root',
     mode => '0755',
     source => 'puppet:///modules/nginx/nginx.conf',
   }
-  file { ' /etc/nginx/conf.d':
+  file { '/etc/nginx/conf.d':
     ensure => directory,
     owner => 'root',
     group => 'root',
     mode => '0755',
   }  
-  file { ' /etc/nginx/conf.d/default.conf':
+  file { '/etc/nginx/conf.d/default.conf':
     ensure => file,
     owner => 'root',
     group => 'root',

From e431684e5252b5c6eae349ff6b0dfd561fd14934 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 10:55:51 -0400
Subject: [PATCH 112/233] Update init.pp

---
 site/nginx/manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index 9d862f8..4e99e8e 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -40,7 +40,7 @@
     group => 'root',
     mode => '0664',
     ensure => 'file',
-    source => 'puppet:///modules/nginx/nginx.conf',
+    source => 'puppet:///modules/nginx/default.conf',
     require => Package['nginx'],
     notify => Service['nginx'],
   }

From 06a91b0fecfe9252b8fb3d18ef705d1d7adf66e6 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 10:59:41 -0400
Subject: [PATCH 113/233] Update init.pp

---
 site/nginx/manifests/init.pp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index 2a4d000..54bdfe1 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -31,6 +31,8 @@
     owner => 'root',
     group => 'root',
     mode => '0755',
+    require => Package['nginx'],
+    notify => Service['nginx'],
   }  
   file { '/etc/nginx/conf.d/default.conf':
     ensure => file,
@@ -42,5 +44,7 @@
   service { 'nginx':
     ensure => running,
     enable => true,
+    require => Package['nginx'],
+    notify => Service['nginx'],
   }
 }

From 288bfff4b7854120ca390b2e1d6a7143f204e36e Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 11:03:41 -0400
Subject: [PATCH 114/233] Update init.pp

---
 site/nginx/manifests/init.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index 54bdfe1..8b2d4a3 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -40,11 +40,11 @@
     group => 'root',
     mode => '0755',
     source => 'puppet:///modules/nginx/default.conf',
+    notify => Service['nginx'],
+    require => Package['nginx'],
   }
   service { 'nginx':
     ensure => running,
     enable => true,
-    require => Package['nginx'],
-    notify => Service['nginx'],
   }
 }

From 23d7b015f17ae4711beec0d31556a29ffa2623e1 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 11:05:49 -0400
Subject: [PATCH 115/233] Update init.pp

---
 site/nginx/manifests/init.pp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index 8b2d4a3..34d9287 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -1,5 +1,8 @@
 
 class nginx {
+  package { 'nginx': 
+    ensure => present,
+  }
   file {'/var/www':
     ensure => directory,
     owner => 'root',

From 2f24176f4603a5f0eaf1c18211a56a084eabb7b5 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 11:33:51 -0400
Subject: [PATCH 116/233] Update site.pp

---
 manifests/site.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index a407bf8..d316dd3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -44,8 +44,8 @@
   # Example:
   #   class { 'my_class': }
   include role::classroom
-  include skeleton
-  include nginx
+  #include skeleton
+  #include nginx
   #notify { "Hello, my name name is ${::hostname}": }
   
   #file { '/etc/motd':

From 6eea3d05f7905acd7b3e2e6eca85026f38fb19b3 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 11:33:53 -0400
Subject: [PATCH 117/233] Update site.pp

---
 manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 0ed4d5d..7abac7a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -44,7 +44,7 @@
   # This is where you can declare classes for all nodes.
   # Example:
   #   class { 'my_class': }
-  include ::users
+  #include ::users
   include role::classroom
   include ::skeleton
   notify { "Hello, my name name is ${::hostname}": }

From 7f8fa1082dc221b3a3ee87788b26cff51f3b1f5f Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Wed, 27 Sep 2017 11:34:19 -0400
Subject: [PATCH 118/233] Update site.pp

---
 manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 6e47ac2..9c0ad20 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -49,7 +49,7 @@
   #   class { 'my_class': }
   # include role::classroom
   
-  include ::users
+  # include ::users
   
   #file {            '/etc/motd':
   #  ensure => file,

From ad1f65ec71c4a969bf47a7d74d0eb825503afdc3 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 13:03:30 -0400
Subject: [PATCH 119/233] Create init.pp

---
 site/memcached/manifests/init.pp | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 site/memcached/manifests/init.pp

diff --git a/site/memcached/manifests/init.pp b/site/memcached/manifests/init.pp
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/site/memcached/manifests/init.pp
@@ -0,0 +1 @@
+

From 7a75c90265dd46dfc34059736f3476d4e78c2508 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 13:04:21 -0400
Subject: [PATCH 120/233] Create init.pp

---
 site/memcached/manifests/init.pp | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 site/memcached/manifests/init.pp

diff --git a/site/memcached/manifests/init.pp b/site/memcached/manifests/init.pp
new file mode 100644
index 0000000..e34cfdc
--- /dev/null
+++ b/site/memcached/manifests/init.pp
@@ -0,0 +1,4 @@
+class memcached{
+  package { 'memcached':
+    ensure => present,
+  }

From 5121777abb7bd9077fc7d64f9379c4229e76cfdc Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Wed, 27 Sep 2017 13:05:48 -0400
Subject: [PATCH 121/233] Create init.pp

---
 site/memcached/manifests/init.pp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 site/memcached/manifests/init.pp

diff --git a/site/memcached/manifests/init.pp b/site/memcached/manifests/init.pp
new file mode 100644
index 0000000..35a8b8a
--- /dev/null
+++ b/site/memcached/manifests/init.pp
@@ -0,0 +1,16 @@
+class memcached {
+  package { 'memcached:
+    ensure => present,
+  }
+  
+  file { '/etc/sysconfig/memcached':
+    ensure => file,
+    require => Package['memcached'],
+  }
+  
+  service { 'memcached':
+    ensure => running,
+    enabled => true,
+    subscribe => File['/etc/sysconfig/memcached'],
+  }
+}

From 175c5862fb56886717242e226850aeeea62f0351 Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Wed, 27 Sep 2017 13:06:28 -0400
Subject: [PATCH 122/233] Create memcached

---
 site/memcached/files/memcached | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 site/memcached/files/memcached

diff --git a/site/memcached/files/memcached b/site/memcached/files/memcached
new file mode 100644
index 0000000..8ade2f5
--- /dev/null
+++ b/site/memcached/files/memcached
@@ -0,0 +1,5 @@
+PORT="11211"
+USER="memcached"
+MAXCONN="96"
+CACHESIZE="32"
+OPTIONS=""

From 37761be2b562281c4f1149af5ac402c2af6ef97b Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Wed, 27 Sep 2017 13:07:06 -0400
Subject: [PATCH 123/233] Update init.pp

---
 site/memcached/manifests/init.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site/memcached/manifests/init.pp b/site/memcached/manifests/init.pp
index 35a8b8a..2616fc8 100644
--- a/site/memcached/manifests/init.pp
+++ b/site/memcached/manifests/init.pp
@@ -5,6 +5,7 @@
   
   file { '/etc/sysconfig/memcached':
     ensure => file,
+    source => 'puppet:///modules/memcached/memcached',
     require => Package['memcached'],
   }
   

From 871731ac5f28eb9f94c89e677f7990f5d76c7aac Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 13:07:24 -0400
Subject: [PATCH 124/233] Create memcached

---
 site/memcached/files/memcached | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 site/memcached/files/memcached

diff --git a/site/memcached/files/memcached b/site/memcached/files/memcached
new file mode 100644
index 0000000..8ade2f5
--- /dev/null
+++ b/site/memcached/files/memcached
@@ -0,0 +1,5 @@
+PORT="11211"
+USER="memcached"
+MAXCONN="96"
+CACHESIZE="32"
+OPTIONS=""

From 4c240006b34073a9d8b4928ae67328629fdf161b Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 13:08:29 -0400
Subject: [PATCH 125/233] Update init.pp

---
 site/memcached/manifests/init.pp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/site/memcached/manifests/init.pp b/site/memcached/manifests/init.pp
index e34cfdc..4687805 100644
--- a/site/memcached/manifests/init.pp
+++ b/site/memcached/manifests/init.pp
@@ -2,3 +2,17 @@
   package { 'memcached':
     ensure => present,
   }
+  file { '/etc/sysconfig/memcached':
+    ensure => file,
+    owner => 'root',
+    group => 'root',
+    mode => '0664',
+    source => 'puppet:///modules/memcached/memcached',
+    require => Package['memcached'],
+    notify => Service['memcached'],
+  }
+  service { 'memcached':
+    ensure => running,
+    enable => true,
+  }
+}

From a52b7946ff1770faf9c05348e39f5d4bedbc9aa6 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 13:09:16 -0400
Subject: [PATCH 126/233] Create memcached

---
 site/memcached/files/memcached | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 site/memcached/files/memcached

diff --git a/site/memcached/files/memcached b/site/memcached/files/memcached
new file mode 100644
index 0000000..8ade2f5
--- /dev/null
+++ b/site/memcached/files/memcached
@@ -0,0 +1,5 @@
+PORT="11211"
+USER="memcached"
+MAXCONN="96"
+CACHESIZE="32"
+OPTIONS=""

From 9a30f28d45091707b944b9a9f8a3fd882fc8f3f1 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 13:09:57 -0400
Subject: [PATCH 127/233] Create init.pp

---
 site/memcached/examples/init.pp | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 site/memcached/examples/init.pp

diff --git a/site/memcached/examples/init.pp b/site/memcached/examples/init.pp
new file mode 100644
index 0000000..22eecc3
--- /dev/null
+++ b/site/memcached/examples/init.pp
@@ -0,0 +1 @@
+include memcached

From 4ee20f3c81c6caf692c5703b6b29e87d7e1b7235 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 13:10:32 -0400
Subject: [PATCH 128/233] Update init.pp

---
 site/memcached/manifests/init.pp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/site/memcached/manifests/init.pp b/site/memcached/manifests/init.pp
index 8b13789..287bd1b 100644
--- a/site/memcached/manifests/init.pp
+++ b/site/memcached/manifests/init.pp
@@ -1 +1,11 @@
-
+class memcached {
+  package { 'memcached': 
+    ensure => present,
+  }
+  file {'/etc/sysconfig/memcached':
+    ensure => file,
+    owner => 'root',
+    group => 'root',
+    mode => '0755',
+  }
+}

From 6cd71e04174f8296c52831f5b0151c2fe3f7fbda Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 13:13:50 -0400
Subject: [PATCH 129/233] Update init.pp

---
 site/memcached/manifests/init.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site/memcached/manifests/init.pp b/site/memcached/manifests/init.pp
index 4687805..55d108f 100644
--- a/site/memcached/manifests/init.pp
+++ b/site/memcached/manifests/init.pp
@@ -14,5 +14,6 @@
   service { 'memcached':
     ensure => running,
     enable => true,
+    subscribe => File['/etc/sysconfig/memcached'],
   }
 }

From 225d32d699c879d6bd0e7bfc3283bb9d882bb52a Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Wed, 27 Sep 2017 13:14:35 -0400
Subject: [PATCH 130/233] Update init.pp

---
 site/memcached/manifests/init.pp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/site/memcached/manifests/init.pp b/site/memcached/manifests/init.pp
index 2616fc8..b1e99b0 100644
--- a/site/memcached/manifests/init.pp
+++ b/site/memcached/manifests/init.pp
@@ -11,7 +11,6 @@
   
   service { 'memcached':
     ensure => running,
-    enabled => true,
     subscribe => File['/etc/sysconfig/memcached'],
   }
 }

From 678db6149842f95c00968aa5ff651ac786f57e8c Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 13:15:09 -0400
Subject: [PATCH 131/233] Update init.pp

---
 site/memcached/manifests/init.pp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/site/memcached/manifests/init.pp b/site/memcached/manifests/init.pp
index 287bd1b..b9cf0e0 100644
--- a/site/memcached/manifests/init.pp
+++ b/site/memcached/manifests/init.pp
@@ -7,5 +7,13 @@
     owner => 'root',
     group => 'root',
     mode => '0755',
+    source => 'puppet:///modules/memcached/memcached',
+    notify => Service['memcached'],
+  }
+  service { 'memcached':
+    ensure => running,
+    enable => true,
+    require => Package['memcached'],
+    subscribe => File['/etc/sysconfig/memcached']
   }
 }

From c853882c0e570521dfb576c4426282d2ff27bd5e Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Wed, 27 Sep 2017 13:16:28 -0400
Subject: [PATCH 132/233] Update init.pp

---
 site/memcached/manifests/init.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/site/memcached/manifests/init.pp b/site/memcached/manifests/init.pp
index b1e99b0..7853171 100644
--- a/site/memcached/manifests/init.pp
+++ b/site/memcached/manifests/init.pp
@@ -1,5 +1,5 @@
 class memcached {
-  package { 'memcached:
+  package { 'memcached':
     ensure => present,
   }
   
@@ -11,6 +11,7 @@
   
   service { 'memcached':
     ensure => running,
+    enabler => true,
     subscribe => File['/etc/sysconfig/memcached'],
   }
 }

From 7c317f49f908d4c7ca00c4b4cb481f82ee772fbf Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Wed, 27 Sep 2017 13:18:54 -0400
Subject: [PATCH 133/233] Update init.pp

---
 site/memcached/manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/memcached/manifests/init.pp b/site/memcached/manifests/init.pp
index 7853171..175349a 100644
--- a/site/memcached/manifests/init.pp
+++ b/site/memcached/manifests/init.pp
@@ -11,7 +11,7 @@
   
   service { 'memcached':
     ensure => running,
-    enabler => true,
+    enabled => true,
     subscribe => File['/etc/sysconfig/memcached'],
   }
 }

From caaa0daaedaddef362d9d79c2116f4650a06d134 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 14:10:33 -0400
Subject: [PATCH 134/233] Update init.pp

---
 site/nginx/manifests/init.pp | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index 4e99e8e..ff1ac59 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -1,49 +1,42 @@
 class nginx {
+  File {
+    owner => 'root',
+    group => 'root',
+    mode => '0775',
+  }
+  
   #ensure package is present
   package { 'nginx':
     ensure => present,
   }
+  
   # create a directory
-  file { '/var/www':
+  file { [ '/var/www', '/etc/nginx/conf.d' ]:
     ensure => 'directory',
-    owner => 'root',
-    group => 'root',
-    mode => '0775',
   }
+  
   # ensure index.html exists
   file { '/var/www/index.html':
     ensure => 'file',
-    owner => 'root',
-    group => 'root',
-    mode => '0664',
     source => 'puppet:///modules/nginx/index.html',
   }
+  
   # a fuller example, including permissions and ownership
   file { '/etc/nginx/nginx.conf':
     ensure => 'file',
-    owner => 'root',
-    group => 'root',
-    mode => '0664',
     source => 'puppet:///modules/nginx/nginx.conf',
     require => Package['nginx'],
     notify => Service['nginx'],
   }
-    file { '/etc/nginx/conf.d':
-    ensure => directory,
-    owner => 'root',
-    group => 'root',
-    mode => '0775',
-  }
+
   # a fuller example, including permissions and ownership
   file { '/etc/nginx/conf.d/default.conf':
-    owner => 'root',
-    group => 'root',
-    mode => '0664',
     ensure => 'file',
     source => 'puppet:///modules/nginx/default.conf',
     require => Package['nginx'],
     notify => Service['nginx'],
   }
+  
   service { 'nginx':
     ensure => running,
     enable => true,

From 4b9985e75643006f99d7bf8d527195a08d10d007 Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Wed, 27 Sep 2017 14:11:15 -0400
Subject: [PATCH 135/233] Update init.pp

---
 site/nginx/manifests/init.pp | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index 94c569e..e32ddeb 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -1,28 +1,25 @@
 class nginx {
+  File {
+    owner => 'root',
+    group => 'root',
+    mode  => '0664',
+  }
+
   package { 'nginx':
     ensure => present,
   }
   
   file { '/var/www':
     ensure => directory,
-    owner => 'root',
-    group => 'root',
-    mode => '0775',
   }
   
   file { '/var/www/index.html':
     ensure => file,
-    owner => 'root',
-    group => 'root',
-    mode => '0664',
     source => 'puppet:///modules/nginx/index.html',
   }
   
   file { '/etc/nginx/nginx.conf':
     ensure => file,
-    owner => 'root',
-    group => 'root',
-    mode => '0664',
     source => 'puppet:///modules/nginx/nginx.conf',
     require => Package['nginx'],
     notify => Service['nginx'],
@@ -30,16 +27,10 @@
   
   file { '/etc/nginx/conf.d':
     ensure => directory,
-    owner => 'root',
-    group => 'root',
-    mode => '0775',
   }
   
   file { '/etc/nginx/conf.d/default.conf':
     ensure => file,
-    owner => 'root',
-    group => 'root',
-    mode => '0664',
     source => 'puppet:///modules/nginx/default.conf',
     require => Package['nginx'],
     notify => Service['nginx'],

From a2e869927e6b87e377f6ba6428371b2e5078a87d Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Wed, 27 Sep 2017 14:12:22 -0400
Subject: [PATCH 136/233] Update init.pp

---
 site/memcached/manifests/init.pp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/site/memcached/manifests/init.pp b/site/memcached/manifests/init.pp
index 175349a..811529a 100644
--- a/site/memcached/manifests/init.pp
+++ b/site/memcached/manifests/init.pp
@@ -11,7 +11,6 @@
   
   service { 'memcached':
     ensure => running,
-    enabled => true,
     subscribe => File['/etc/sysconfig/memcached'],
   }
 }

From e924180b001c6d290f61ccb182f00c495c34f80a Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 14:12:23 -0400
Subject: [PATCH 137/233] Update init.pp

---
 site/nginx/manifests/init.pp | 31 +++++++------------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index 34d9287..0710cb1 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -3,45 +3,28 @@
   package { 'nginx': 
     ensure => present,
   }
-  file {'/var/www':
-    ensure => directory,
+  File {
     owner => 'root',
     group => 'root',
     mode => '0755',
   }
-  file { '/var/www/index.html':
+  file {['/var/www','/etc/nginx','/etc/nginx/conf.d']:
+    ensure => directory,
+  }
+  file { ['/var/www/index.html','/etc/nginx/nginx.conf','/etc/nginx/conf.d/default.conf']:
     ensure => file,
-    owner => 'root',
-    group => 'root',
-    mode => '0755',
-    source => 'puppet:///modules/nginx/index.html',
   }
-  file {'/etc/nginx':
-    ensure => directory,
-    owner => 'root',
-    group => 'root',
-    mode => '0755',
+  file {'/var/www/index.html',
+    source => 'puppet:///modules/nginx/index.html',
   }
   file { '/etc/nginx/nginx.conf':
-    ensure => file,
-    owner => 'root',
-    group => 'root',
-    mode => '0755',
     source => 'puppet:///modules/nginx/nginx.conf',
   }
   file { '/etc/nginx/conf.d':
-    ensure => directory,
-    owner => 'root',
-    group => 'root',
-    mode => '0755',
     require => Package['nginx'],
     notify => Service['nginx'],
   }  
   file { '/etc/nginx/conf.d/default.conf':
-    ensure => file,
-    owner => 'root',
-    group => 'root',
-    mode => '0755',
     source => 'puppet:///modules/nginx/default.conf',
     notify => Service['nginx'],
     require => Package['nginx'],

From 6710fd64822cf10eb37255f6a6298a217dd22f13 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 14:15:50 -0400
Subject: [PATCH 138/233] Update init.pp

---
 site/nginx/manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index 0710cb1..8e3ca2b 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -14,7 +14,7 @@
   file { ['/var/www/index.html','/etc/nginx/nginx.conf','/etc/nginx/conf.d/default.conf']:
     ensure => file,
   }
-  file {'/var/www/index.html',
+  file {'/var/www/index.html':
     source => 'puppet:///modules/nginx/index.html',
   }
   file { '/etc/nginx/nginx.conf':

From 07fdeb89e58471a8635e03f3741cd68a85c508a9 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 14:20:05 -0400
Subject: [PATCH 139/233] Update init.pp

---
 site/nginx/manifests/init.pp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index 8e3ca2b..a5209ea 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -6,25 +6,26 @@
   File {
     owner => 'root',
     group => 'root',
-    mode => '0755',
+    mode => '0644',
   }
   file {['/var/www','/etc/nginx','/etc/nginx/conf.d']:
     ensure => directory,
   }
-  file { ['/var/www/index.html','/etc/nginx/nginx.conf','/etc/nginx/conf.d/default.conf']:
-    ensure => file,
-  }
   file {'/var/www/index.html':
+    ensure => file,
     source => 'puppet:///modules/nginx/index.html',
   }
   file { '/etc/nginx/nginx.conf':
+    ensure => file,
     source => 'puppet:///modules/nginx/nginx.conf',
   }
   file { '/etc/nginx/conf.d':
+    ensure => file,
     require => Package['nginx'],
     notify => Service['nginx'],
   }  
   file { '/etc/nginx/conf.d/default.conf':
+    ensure => file,
     source => 'puppet:///modules/nginx/default.conf',
     notify => Service['nginx'],
     require => Package['nginx'],

From 2cd51f45b1718aabd1fde4aaf1466ebfe7036537 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 14:22:02 -0400
Subject: [PATCH 140/233] Update init.pp

---
 site/nginx/manifests/init.pp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index a5209ea..5f0d0e8 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -19,11 +19,6 @@
     ensure => file,
     source => 'puppet:///modules/nginx/nginx.conf',
   }
-  file { '/etc/nginx/conf.d':
-    ensure => file,
-    require => Package['nginx'],
-    notify => Service['nginx'],
-  }  
   file { '/etc/nginx/conf.d/default.conf':
     ensure => file,
     source => 'puppet:///modules/nginx/default.conf',

From db9fb97fa933e84dd46a5b029d26d329b4bf8144 Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Wed, 27 Sep 2017 14:41:08 -0400
Subject: [PATCH 141/233] Update site.pp

---
 manifests/site.pp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index 9c0ad20..cbad335 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -60,4 +60,9 @@
     creates => '/etc/motd',
     path => '/usr/local/bin',
   }
+  
+  if $facts['virtual'] != 'physical' {
+    notice('This is a virtual machine!')
+  }
+}
 }

From 8cfde87568e98b6ec9cf489e0034195249538536 Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Wed, 27 Sep 2017 14:42:19 -0400
Subject: [PATCH 142/233] Update site.pp

---
 manifests/site.pp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index cbad335..d5b604c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -65,4 +65,3 @@
     notice('This is a virtual machine!')
   }
 }
-}

From 13710752963026ee63f3a2cd8c781b3da055f654 Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Wed, 27 Sep 2017 14:43:34 -0400
Subject: [PATCH 143/233] Update site.pp

---
 manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index d5b604c..bc06f4e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -62,6 +62,6 @@
   }
   
   if $facts['virtual'] != 'physical' {
-    notice('This is a virtual machine!')
+    notify {'This is a virtual machine!': }
   }
 }

From a6a283094e24fe0f10ecfb91cebe0ec8f69107f6 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 14:53:47 -0400
Subject: [PATCH 144/233] Update site.pp

---
 manifests/site.pp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 7abac7a..420933e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -60,6 +60,8 @@
     path => '/usr/local/bin',
     creates => '/etc/motd',
   }
-    
-  
+  if $facts['is_virtual'] == 'true' {
+    $vmname = capitalize($::virtual)
+    notify { "This is a ${vmname} virtual machine.": }
+  }
 }

From 41bee0b7bd6b50f8a187049a2e36f7e575971038 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 14:53:52 -0400
Subject: [PATCH 145/233] Update site.pp

---
 manifests/site.pp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index d316dd3..2201b20 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -48,6 +48,10 @@
   #include nginx
   #notify { "Hello, my name name is ${::hostname}": }
   
+  if $facts['is_virtual'] {
+    notify { "Hello, my name name is ${::hostname}": }
+  }
+  
   #file { '/etc/motd':
   #  ensure => file,
   #  owner => 'root',

From b21792c4d12aa3d7d1afb49432dcee53861ca74d Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 14:56:02 -0400
Subject: [PATCH 146/233] Update site.pp

---
 manifests/site.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 2201b20..3954e00 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -46,10 +46,10 @@
   include role::classroom
   #include skeleton
   #include nginx
-  #notify { "Hello, my name name is ${::hostname}": }
+
   
   if $facts['is_virtual'] {
-    notify { "Hello, my name name is ${::hostname}": }
+    notify { "This is a virtual machine!"}
   }
   
   #file { '/etc/motd':

From 5573d92d646aef10fe51acc592fa4639655ae31d Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 15:02:37 -0400
Subject: [PATCH 147/233] Update site.pp

---
 manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 3954e00..587c7fa 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -49,7 +49,7 @@
 
   
   if $facts['is_virtual'] {
-    notify { "This is a virtual machine!"}
+    notify { "This is a virtual machine!": }
   }
   
   #file { '/etc/motd':

From 5df5a652f123dfc329fca18a0c68192512ca875e Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Wed, 27 Sep 2017 15:20:23 -0400
Subject: [PATCH 148/233] Update aliases.epp

---
 site/aliases/templates/aliases.epp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/site/aliases/templates/aliases.epp b/site/aliases/templates/aliases.epp
index 1069e99..2dfec88 100644
--- a/site/aliases/templates/aliases.epp
+++ b/site/aliases/templates/aliases.epp
@@ -93,4 +93,8 @@ support:	postmaster
 decode:		root
 
 # Person who should get root's mail
+<% if $admin and $admin != root { -%>
+root: <%= $admin %>
+<% } else { -%>
 #root:		marc
+<% } -%>

From 35411b4fb9c1da8ed75c4c1889a2d3df46b3738c Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 15:21:42 -0400
Subject: [PATCH 149/233] Update aliases.epp

---
 site/aliases/templates/aliases.epp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/site/aliases/templates/aliases.epp b/site/aliases/templates/aliases.epp
index 1069e99..c182a16 100644
--- a/site/aliases/templates/aliases.epp
+++ b/site/aliases/templates/aliases.epp
@@ -93,4 +93,7 @@ support:	postmaster
 decode:		root
 
 # Person who should get root's mail
-#root:		marc
+<% if $admin and $admin != 'root' { -%> root: <%= $admin %>
+<% } else { -%>
+#root: marc
+<% } -%>

From 0c1dc901fc805854e0e27d78a89201603244902f Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 15:23:16 -0400
Subject: [PATCH 150/233] Update aliases.epp

---
 site/aliases/templates/aliases.epp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/site/aliases/templates/aliases.epp b/site/aliases/templates/aliases.epp
index 1069e99..4ca416a 100644
--- a/site/aliases/templates/aliases.epp
+++ b/site/aliases/templates/aliases.epp
@@ -93,4 +93,8 @@ support:	postmaster
 decode:		root
 
 # Person who should get root's mail
+<% if $admin and $admin != 'root' { -%>
+root:     <%= $admin %>
+<% } else { -%>
 #root:		marc
+<% } -%>

From 8b385e76af4bd06e780da361d4b2465b64cd57a3 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 15:30:27 -0400
Subject: [PATCH 151/233] Update init.pp

---
 site/aliases/manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/aliases/manifests/init.pp b/site/aliases/manifests/init.pp
index 4332d76..c3bc0ba 100644
--- a/site/aliases/manifests/init.pp
+++ b/site/aliases/manifests/init.pp
@@ -1,5 +1,5 @@
 class aliases (
-    $admin = 'root',
+    $admin = 'touch my pp',
 ) {
     # uses $admin to build the aliases file
     file { '/etc/aliases':

From 414d1663c958375ab17c2767de729379c3e46259 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 15:33:51 -0400
Subject: [PATCH 152/233] Update init.pp

---
 site/aliases/manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/aliases/manifests/init.pp b/site/aliases/manifests/init.pp
index c3bc0ba..c5ac4b3 100644
--- a/site/aliases/manifests/init.pp
+++ b/site/aliases/manifests/init.pp
@@ -1,5 +1,5 @@
 class aliases (
-    $admin = 'touch my pp',
+    $admin = 'admin',
 ) {
     # uses $admin to build the aliases file
     file { '/etc/aliases':

From ea1aab63341c37acc5b096b2b1f208d7b3c2910e Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 15:40:34 -0400
Subject: [PATCH 153/233] Create nginx.conf

---
 site/nginx/templates/nginx.conf | 42 +++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 site/nginx/templates/nginx.conf

diff --git a/site/nginx/templates/nginx.conf b/site/nginx/templates/nginx.conf
new file mode 100644
index 0000000..cbede51
--- /dev/null
+++ b/site/nginx/templates/nginx.conf
@@ -0,0 +1,42 @@
+# For more information on configuration, see:
+#   * Official English Documentation: http://nginx.org/en/docs/
+#   * Official Russian Documentation: http://nginx.org/ru/docs/
+
+user              nginx;
+worker_processes  1;
+
+error_log  /var/log/nginx/error.log;
+#error_log  /var/log/nginx/error.log  notice;
+#error_log  /var/log/nginx/error.log  info;
+
+pid        /var/run/nginx.pid;
+
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    #keepalive_timeout  0;
+    keepalive_timeout  65;
+
+    #gzip  on;
+
+    # Load config files from the /etc/nginx/conf.d directory
+    # The default server is in conf.d/default.conf
+    include /etc/nginx/conf.d/*.conf;
+
+}

From d61a29e00ec59ab40a67307b70309cb2f6a3334d Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 15:41:12 -0400
Subject: [PATCH 154/233] Create default.conf

---
 site/nginx/templates/default.conf | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 site/nginx/templates/default.conf

diff --git a/site/nginx/templates/default.conf b/site/nginx/templates/default.conf
new file mode 100644
index 0000000..0fa41c8
--- /dev/null
+++ b/site/nginx/templates/default.conf
@@ -0,0 +1,8 @@
+ server {
+    listen 80;
+
+    root /var/www;
+    index index.html index.htm;
+
+    server_name _;
+}

From 7b51197efce6f6042e8528984c578525708e9edd Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 15:41:45 -0400
Subject: [PATCH 155/233] Create nginx.conf.epp

---
 site/nginx/templates/nginx.conf.epp | 42 +++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 site/nginx/templates/nginx.conf.epp

diff --git a/site/nginx/templates/nginx.conf.epp b/site/nginx/templates/nginx.conf.epp
new file mode 100644
index 0000000..cbede51
--- /dev/null
+++ b/site/nginx/templates/nginx.conf.epp
@@ -0,0 +1,42 @@
+# For more information on configuration, see:
+#   * Official English Documentation: http://nginx.org/en/docs/
+#   * Official Russian Documentation: http://nginx.org/ru/docs/
+
+user              nginx;
+worker_processes  1;
+
+error_log  /var/log/nginx/error.log;
+#error_log  /var/log/nginx/error.log  notice;
+#error_log  /var/log/nginx/error.log  info;
+
+pid        /var/run/nginx.pid;
+
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    #keepalive_timeout  0;
+    keepalive_timeout  65;
+
+    #gzip  on;
+
+    # Load config files from the /etc/nginx/conf.d directory
+    # The default server is in conf.d/default.conf
+    include /etc/nginx/conf.d/*.conf;
+
+}

From a3f53816cf1458b022e8bc6bf50f8bbcc50c204f Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 15:42:17 -0400
Subject: [PATCH 156/233] Create default.conf.epp

---
 site/nginx/templates/default.conf.epp | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 site/nginx/templates/default.conf.epp

diff --git a/site/nginx/templates/default.conf.epp b/site/nginx/templates/default.conf.epp
new file mode 100644
index 0000000..0fa41c8
--- /dev/null
+++ b/site/nginx/templates/default.conf.epp
@@ -0,0 +1,8 @@
+ server {
+    listen 80;
+
+    root /var/www;
+    index index.html index.htm;
+
+    server_name _;
+}

From 0fff9e54975cb936ed9df6714c68c6fe50e2b16b Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 15:42:21 -0400
Subject: [PATCH 157/233] Rename default.conf to default.conf.epp

---
 site/nginx/templates/{default.conf => default.conf.epp} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename site/nginx/templates/{default.conf => default.conf.epp} (100%)

diff --git a/site/nginx/templates/default.conf b/site/nginx/templates/default.conf.epp
similarity index 100%
rename from site/nginx/templates/default.conf
rename to site/nginx/templates/default.conf.epp

From 3de89cd9a0d17d4de3bae8756274b4193e4bc0ea Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 15:43:28 -0400
Subject: [PATCH 158/233] Rename nginx.conf to nginx.conf.epp

---
 site/nginx/templates/{nginx.conf => nginx.conf.epp} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename site/nginx/templates/{nginx.conf => nginx.conf.epp} (100%)

diff --git a/site/nginx/templates/nginx.conf b/site/nginx/templates/nginx.conf.epp
similarity index 100%
rename from site/nginx/templates/nginx.conf
rename to site/nginx/templates/nginx.conf.epp

From a1a2c194cc902c177b46831fe47250d00a09be6d Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 15:48:08 -0400
Subject: [PATCH 159/233] Update nginx.conf.epp

---
 site/nginx/templates/nginx.conf.epp | 50 ++++++++++++-----------------
 1 file changed, 20 insertions(+), 30 deletions(-)

diff --git a/site/nginx/templates/nginx.conf.epp b/site/nginx/templates/nginx.conf.epp
index cbede51..de5105f 100644
--- a/site/nginx/templates/nginx.conf.epp
+++ b/site/nginx/templates/nginx.conf.epp
@@ -1,42 +1,32 @@
 # For more information on configuration, see:
-#   * Official English Documentation: http://nginx.org/en/docs/
-#   * Official Russian Documentation: http://nginx.org/ru/docs/
-
-user              nginx;
-worker_processes  1;
-
-error_log  /var/log/nginx/error.log;
-#error_log  /var/log/nginx/error.log  notice;
-#error_log  /var/log/nginx/error.log  info;
-
-pid        /var/run/nginx.pid;
+# * Official English Documentation: http://nginx.org/en/docs/
+# * Official Russian Documentation: http://nginx.org/ru/docs/
+user <%= $user %>; 
+worker_processes 1;
 
+error_log <%= $logdir %>/error.log;
 
 events {
-    worker_connections  1024;
+    worker_connections 1024;
 }
 
-
 http {
-    include       /etc/nginx/mime.types;
-    default_type  application/octet-stream;
-
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
-
-    access_log  /var/log/nginx/access.log  main;
-
-    sendfile        on;
-    #tcp_nopush     on;
+    include <%= $confdir %>/mime.types; 
+    default_type application/octet-stream;
+    log_format main '$remote_addr - $remote_user [$time_local] "$request" ' 
+                    '$status $body_bytes_sent "$http_referer" '
+                    '"$http_user_agent" "$http_x_forwarded_for"'; 
 
-    #keepalive_timeout  0;
-    keepalive_timeout  65;
+    access_log <%= $logdir %>/access.log main;
 
-    #gzip  on;
+    sendfile on;
+    #tcp_nopush on; 
+    #keepalive_timeout 0;
+    keepalive_timeout 65; 
 
-    # Load config files from the /etc/nginx/conf.d directory
-    # The default server is in conf.d/default.conf
-    include /etc/nginx/conf.d/*.conf;
+    #gzip on;
 
+    # Load config files from the conf.d directory 
+    # The default server is in conf.d/default.conf 
+    include <%= $confdir %>/conf.d/*.conf;
 }

From e61303b6ce8f051e329a94ada551a679f9a90155 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 15:49:07 -0400
Subject: [PATCH 160/233] Update default.conf.epp

---
 site/nginx/templates/default.conf.epp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/nginx/templates/default.conf.epp b/site/nginx/templates/default.conf.epp
index 0fa41c8..e1962db 100644
--- a/site/nginx/templates/default.conf.epp
+++ b/site/nginx/templates/default.conf.epp
@@ -1,7 +1,7 @@
  server {
     listen 80;
 
-    root /var/www;
+    root <%= $docroot %>;
     index index.html index.htm;
 
     server_name _;

From 26726e04c323c7bcf7453db1834f4fdf7a6a94a3 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 15:49:13 -0400
Subject: [PATCH 161/233] Update default.conf.epp

---
 site/nginx/templates/default.conf.epp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/nginx/templates/default.conf.epp b/site/nginx/templates/default.conf.epp
index 0fa41c8..e1962db 100644
--- a/site/nginx/templates/default.conf.epp
+++ b/site/nginx/templates/default.conf.epp
@@ -1,7 +1,7 @@
  server {
     listen 80;
 
-    root /var/www;
+    root <%= $docroot %>;
     index index.html index.htm;
 
     server_name _;

From 36bd472c406ba05f5d88660d4f9a9124b9bff428 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 15:50:08 -0400
Subject: [PATCH 162/233] Update init.pp

---
 site/nginx/examples/init.pp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/site/nginx/examples/init.pp b/site/nginx/examples/init.pp
index da7546a..3b2d4f1 100644
--- a/site/nginx/examples/init.pp
+++ b/site/nginx/examples/init.pp
@@ -1 +1,6 @@
+if $facts['os']['family'] == 'Windows' { 
+  Package {
+    provider => chocolatey, 
+  }
+}
 include nginx

From 58a25dd1825a2b813f95b3e1ebd45df0a2bd9337 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 16:00:36 -0400
Subject: [PATCH 163/233] Update init.pp

---
 site/nginx/manifests/init.pp | 57 +++++++++++++++++++++++++++---------
 1 file changed, 43 insertions(+), 14 deletions(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index 5f0d0e8..8e001fe 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -1,32 +1,61 @@
 
 class nginx {
-  package { 'nginx': 
+  case $facts['os']['family'] {
+    'redhat','debian' : { $package = 'nginx'
+     $owner = 'root'
+     $group = 'root'
+     $docroot = '/var/www' $confdir = '/etc/nginx' $logdir = '/var/log/nginx'
+  }
+  'windows' : {
+     $package = 'nginx-service'
+     $owner = 'Administrator'
+     $group = 'Administrators'
+     $docroot = 'C:/ProgramData/nginx/html' $confdir = 'C:/ProgramData/nginx' $logdir = 'C:/ProgramData/nginx/logs'
+  }
+  default : {
+      fail("Module ${module_name} is not supported on ${facts['os']['family']}") 
+   }
+  }
+  # user the service will run as. Used in the nginx.conf.epp template
+  $user = $facts['os']['family'] ? { 
+    'redhat' => 'nginx',
+    'debian' => 'www-data', 
+    'windows' => 'nobody',
+  }
+
+  package { $package: 
     ensure => present,
   }
   File {
-    owner => 'root',
-    group => 'root',
+    owner => $owner,
+    group => $group,
     mode => '0644',
   }
-  file {['/var/www','/etc/nginx','/etc/nginx/conf.d']:
+  file { [ $docroot, "${confdir}/conf.d" ]: 
     ensure => directory,
   }
-  file {'/var/www/index.html':
+  file { "${docroot}/index.html":
     ensure => file,
     source => 'puppet:///modules/nginx/index.html',
   }
-  file { '/etc/nginx/nginx.conf':
+  file { "${confdir}/nginx.conf":
     ensure => file,
-    source => 'puppet:///modules/nginx/nginx.conf',
+    content => epp('nginx/nginx.conf.epp',
+     {
+       user => $user, confdir => $confdir, logdir => $logdir, 
+      }),
+    notify => Service['nginx'], 
   }
-  file { '/etc/nginx/conf.d/default.conf':
+  file { "${confdir}/conf.d/default.conf": 
     ensure => file,
-    source => 'puppet:///modules/nginx/default.conf',
-    notify => Service['nginx'],
-    require => Package['nginx'],
+    content => epp('nginx/default.conf.epp',
+                   {
+                     docroot => $docroot, 
+                    }),
+    notify => Service['nginx'], 
   }
-  service { 'nginx':
-    ensure => running,
+  service { 'nginx': 
+    ensure => running, 
     enable => true,
-  }
+  } 
 }

From 0c25870fb173b0dd62f6f98733f9ad9c4e926c74 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Wed, 27 Sep 2017 16:01:23 -0400
Subject: [PATCH 164/233] Update init.pp

---
 site/nginx/manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index 8e001fe..535dc76 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -15,7 +15,7 @@
   default : {
       fail("Module ${module_name} is not supported on ${facts['os']['family']}") 
    }
-  }
+ }
   # user the service will run as. Used in the nginx.conf.epp template
   $user = $facts['os']['family'] ? { 
     'redhat' => 'nginx',

From b6d84673b2b92a51f1434b16bb9481fe5c958614 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 16:07:52 -0400
Subject: [PATCH 165/233] Update init.pp

---
 site/nginx/manifests/init.pp | 60 ++++++++++++++++++++++++++++--------
 1 file changed, 47 insertions(+), 13 deletions(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index ff1ac59..086e823 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -1,17 +1,46 @@
 class nginx {
+  case $facts['os']['family']{
+    'redhat','debian' :{
+      $package = 'nginx'
+      $owner = 'root'
+      $group = 'root'
+      $docroot = '/var/www'
+      $confdir = '/etc/nginx'
+      $logdir = '/var/log/nginx'
+    }
+    'windows' : {
+      $package = 'nginx-service'
+      $owner = 'Administrator'
+      $group = 'Administrators'
+      $docroot = 'C:/ProgramData/nginx/html'
+      $confdir = 'C:/ProgramData/nginx'
+      $logdir = 'C:/ProgramData/nginx/logs'
+    }
+    default : {
+      fail("Module ${module_name} is not supported on ${facts['os']['family']}")
+    }
+  }
+  
+  # user the service will run as. Used in the nginx.conf.epp template
+  $user = $facts['os']['family'] ? {
+    'redhat' => 'nginx',
+    'debian' => 'www-data',
+    'windows' => 'nobody',
+  }
+  
   File {
-    owner => 'root',
-    group => 'root',
+    owner => $owner,
+    group => $group,
     mode => '0775',
   }
   
   #ensure package is present
-  package { 'nginx':
+  package { $package:
     ensure => present,
   }
   
   # create a directory
-  file { [ '/var/www', '/etc/nginx/conf.d' ]:
+  file { [ $docroot, "${confdir}/conf.d' ]:
     ensure => 'directory',
   }
   
@@ -22,20 +51,25 @@
   }
   
   # a fuller example, including permissions and ownership
-  file { '/etc/nginx/nginx.conf':
+  file { "${confdir}/nginx.conf"':
     ensure => 'file',
-    source => 'puppet:///modules/nginx/nginx.conf',
-    require => Package['nginx'],
+    content => epp('nginx/nginx.conf.epp',
+                    {
+                      user => $user,
+                      confdir => $confdir,
+                      logdir => $logdir,
+                    }),
     notify => Service['nginx'],
   }
 
-  # a fuller example, including permissions and ownership
-  file { '/etc/nginx/conf.d/default.conf':
-    ensure => 'file',
-    source => 'puppet:///modules/nginx/default.conf',
-    require => Package['nginx'],
+  file { "${confdir}/conf.d/default.conf":
+    ensure => file,
+    content => epp('nginx/default.conf.epp',
+                    {
+                      docroot => $docroot,
+                    }),
     notify => Service['nginx'],
-  }
+}
   
   service { 'nginx':
     ensure => running,

From dca8bea0944b769774f5b807c4a7c8157152659c Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 16:08:41 -0400
Subject: [PATCH 166/233] Update init.pp

---
 site/nginx/examples/init.pp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/site/nginx/examples/init.pp b/site/nginx/examples/init.pp
index da7546a..37ea411 100644
--- a/site/nginx/examples/init.pp
+++ b/site/nginx/examples/init.pp
@@ -1 +1,7 @@
+if $facts['os']['family'] == 'Windows' {
+  Package {
+    provider => chocolatey,
+  }
+}
+
 include nginx

From 2a150597cf783f0c489ccda5f9bed2181a121cbd Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 16:11:52 -0400
Subject: [PATCH 167/233] Update nginx.conf.epp

---
 site/nginx/templates/nginx.conf.epp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/site/nginx/templates/nginx.conf.epp b/site/nginx/templates/nginx.conf.epp
index cbede51..dab820f 100644
--- a/site/nginx/templates/nginx.conf.epp
+++ b/site/nginx/templates/nginx.conf.epp
@@ -2,10 +2,10 @@
 #   * Official English Documentation: http://nginx.org/en/docs/
 #   * Official Russian Documentation: http://nginx.org/ru/docs/
 
-user              nginx;
+user              <%= $user %>;
 worker_processes  1;
 
-error_log  /var/log/nginx/error.log;
+error_log  <%= $logdir %>/error.log;
 #error_log  /var/log/nginx/error.log  notice;
 #error_log  /var/log/nginx/error.log  info;
 
@@ -18,14 +18,14 @@ events {
 
 
 http {
-    include       /etc/nginx/mime.types;
+    include       <%= $confdir %>/mime.types;
     default_type  application/octet-stream;
 
     log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
                       '$status $body_bytes_sent "$http_referer" '
                       '"$http_user_agent" "$http_x_forwarded_for"';
 
-    access_log  /var/log/nginx/access.log  main;
+    access_log  <%= $logdir %>/access.log  main;
 
     sendfile        on;
     #tcp_nopush     on;
@@ -37,6 +37,6 @@ http {
 
     # Load config files from the /etc/nginx/conf.d directory
     # The default server is in conf.d/default.conf
-    include /etc/nginx/conf.d/*.conf;
+    include <%= $confdir %>/conf.d/*.conf;
 
 }

From 0ef4684ad5f8821d9ba5265b1ea958f942353f9a Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 16:14:26 -0400
Subject: [PATCH 168/233] Update init.pp

---
 site/nginx/manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index 086e823..270880d 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -51,7 +51,7 @@
   }
   
   # a fuller example, including permissions and ownership
-  file { "${confdir}/nginx.conf"':
+  file { "${confdir}/nginx.conf":
     ensure => 'file',
     content => epp('nginx/nginx.conf.epp',
                     {

From 0b0d340d319c1b1c7af197dabde831b92ecbef20 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Wed, 27 Sep 2017 16:16:50 -0400
Subject: [PATCH 169/233] Update init.pp

---
 site/nginx/manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index 270880d..643b199 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -40,7 +40,7 @@
   }
   
   # create a directory
-  file { [ $docroot, "${confdir}/conf.d' ]:
+  file { [ $docroot, "${confdir}/conf.d" ]:
     ensure => 'directory',
   }
   

From cfb43ea43371647f6424ea626cbb520edb756529 Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Thu, 28 Sep 2017 09:28:24 -0400
Subject: [PATCH 170/233] Create admins.pp

---
 site/users/examples/admins.pp | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 site/users/examples/admins.pp

diff --git a/site/users/examples/admins.pp b/site/users/examples/admins.pp
new file mode 100644
index 0000000..0124bf7
--- /dev/null
+++ b/site/users/examples/admins.pp
@@ -0,0 +1 @@
+include users::admins

From 8e8f44f1cc02a46f8dceec136d3535e796a373e7 Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Thu, 28 Sep 2017 09:28:50 -0400
Subject: [PATCH 171/233] Create managed_user.pp

---
 site/users/manifests/managed_user.pp | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 site/users/manifests/managed_user.pp

diff --git a/site/users/manifests/managed_user.pp b/site/users/manifests/managed_user.pp
new file mode 100644
index 0000000..0b991c3
--- /dev/null
+++ b/site/users/manifests/managed_user.pp
@@ -0,0 +1,11 @@
+define users::managed_user (
+$group = $title,
+) {
+user { $title:
+ensure => present,
+}
+file { "/home/${title}":
+ensure => directory,
+owner => $title,
+group => $group,
+}

From 0d19c23102ce7b42382d8d46df430c937fc42804 Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Thu, 28 Sep 2017 09:29:14 -0400
Subject: [PATCH 172/233] Create admins.pp

---
 site/users/manifests/admins.pp | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 site/users/manifests/admins.pp

diff --git a/site/users/manifests/admins.pp b/site/users/manifests/admins.pp
new file mode 100644
index 0000000..ca4dde5
--- /dev/null
+++ b/site/users/manifests/admins.pp
@@ -0,0 +1,10 @@
+class users::admins {
+users::managed_user { 'joe': }
+users::managed_user { 'alice':
+group => 'staff',
+}
+users::managed_user { 'aaron':
+group => 'staff',
+}
+group { 'staff':
+ensure => present,

From 336fb84c322018805ec2f3ee325eb76a189acabe Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Thu, 28 Sep 2017 09:29:29 -0400
Subject: [PATCH 173/233] Create managed_user.pp

---
 site/users/manifests/managed_user.pp | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 site/users/manifests/managed_user.pp

diff --git a/site/users/manifests/managed_user.pp b/site/users/manifests/managed_user.pp
new file mode 100644
index 0000000..e32dba6
--- /dev/null
+++ b/site/users/manifests/managed_user.pp
@@ -0,0 +1,13 @@
+define users::managed_user(
+  $group = $title,
+) {
+  user { $title:
+    ensure => present,
+  }
+  
+  file { "/home/${title}":
+    ensure => directory,
+    owner => $title,
+    group => $group,
+  }
+}

From 1fa27473dc22f976bc82bb74fb52d604ae808156 Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Thu, 28 Sep 2017 09:31:46 -0400
Subject: [PATCH 174/233] Create admins.pp

---
 site/users/manifests/admins.pp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 site/users/manifests/admins.pp

diff --git a/site/users/manifests/admins.pp b/site/users/manifests/admins.pp
new file mode 100644
index 0000000..d2fe685
--- /dev/null
+++ b/site/users/manifests/admins.pp
@@ -0,0 +1,14 @@
+class users::admins {
+  users::managed_user { 'joe': }
+  users::managed_user { 'alice':
+    group => 'staff',
+  }
+  
+  users::managed_user { 'aaron':
+    group => 'staff',
+  }
+  
+  group { 'staff':
+    ensure => present,
+  }
+}

From 80a3e8383fb329893194e43a1c265e5855b4f191 Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Thu, 28 Sep 2017 09:37:59 -0400
Subject: [PATCH 175/233] Update site.pp

---
 manifests/site.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index 1b5afda..131830e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -47,6 +47,7 @@
   #   class { 'my_class': }
   include role::classroom
   include ::users
+  include users::admins
 
 #file { '/etc/motd':      ensure => file,      content => 'This Crazy Course' } 
 

From c0dc97079104885f56d5a7a28d5f8eff0dc43ceb Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Thu, 28 Sep 2017 09:38:03 -0400
Subject: [PATCH 176/233] Create managed_users.pp

---
 site/users/manifests/managed_users.pp | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 site/users/manifests/managed_users.pp

diff --git a/site/users/manifests/managed_users.pp b/site/users/manifests/managed_users.pp
new file mode 100644
index 0000000..1084425
--- /dev/null
+++ b/site/users/manifests/managed_users.pp
@@ -0,0 +1,12 @@
+define users::managed_user ( $group = $title,
+){
+user { $title:
+  ensure => present, 
+}
+
+  file { "/home/${title}": 
+    ensure => directory, 
+    owner => $title, 
+    group => $group,
+  }
+}

From 2ce80f8836fa9fd9ba2ae4a31708da0eb17bde63 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Thu, 28 Sep 2017 09:38:18 -0400
Subject: [PATCH 177/233] Create managed_user.pp

---
 site/users/manifests/managed_user.pp | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 site/users/manifests/managed_user.pp

diff --git a/site/users/manifests/managed_user.pp b/site/users/manifests/managed_user.pp
new file mode 100644
index 0000000..921b26e
--- /dev/null
+++ b/site/users/manifests/managed_user.pp
@@ -0,0 +1,12 @@
+define users::managed_user (
+  $group = $title,
+) {
+  user { $title:
+    ensure => present,
+  }
+  file { "/home/${title}":
+    ensure => directory,
+    owner => $title,
+    group => $group,
+  }
+}

From 9fb5090305b2b6eb08329d959bf6be3582d05d7d Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Thu, 28 Sep 2017 09:39:32 -0400
Subject: [PATCH 178/233] Create admins.pp

---
 site/users/manifests/examples/admins.pp | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 site/users/manifests/examples/admins.pp

diff --git a/site/users/manifests/examples/admins.pp b/site/users/manifests/examples/admins.pp
new file mode 100644
index 0000000..0124bf7
--- /dev/null
+++ b/site/users/manifests/examples/admins.pp
@@ -0,0 +1 @@
+include users::admins

From f44af81ad9604bb98560c5223c9aea353bf997c5 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Thu, 28 Sep 2017 09:39:56 -0400
Subject: [PATCH 179/233] Create admins.pp

---
 site/users/manifests/admins.pp | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 site/users/manifests/admins.pp

diff --git a/site/users/manifests/admins.pp b/site/users/manifests/admins.pp
new file mode 100644
index 0000000..86df6bf
--- /dev/null
+++ b/site/users/manifests/admins.pp
@@ -0,0 +1,12 @@
+class users::admins { 
+  users::managed_user { 'joe': } 
+  users::managed_user { 'alice':
+    group => 'staff', 
+  }
+  users::managed_user { 'aaron': 
+    group => 'staff',
+  }
+  group { 'staff':
+    ensure => present, 
+  }
+}

From 73a21679414544dea4d4e120aeb6197d5962f8b7 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Thu, 28 Sep 2017 09:40:22 -0400
Subject: [PATCH 180/233] Create admins.pp

---
 site/users/manifests/admins.pp | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 site/users/manifests/admins.pp

diff --git a/site/users/manifests/admins.pp b/site/users/manifests/admins.pp
new file mode 100644
index 0000000..8176378
--- /dev/null
+++ b/site/users/manifests/admins.pp
@@ -0,0 +1,12 @@
+class users::admins {
+  users::managed_user { 'joe': }
+  users::managed_user { 'alice':
+    group => 'staff',
+  }
+  users::managed_user { 'aaron':
+    group => 'staff',
+  }
+  group { 'staff':
+    ensure => present,
+  }
+}

From 60ee382b59fd816ad57963c794c905f5aba9120d Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Thu, 28 Sep 2017 09:42:26 -0400
Subject: [PATCH 181/233] Update site.pp

---
 manifests/site.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index 420933e..702bb2b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -47,6 +47,7 @@
   #include ::users
   include role::classroom
   include ::skeleton
+  include users::admins
   notify { "Hello, my name name is ${::hostname}": }
   #file { '/etc/motd':
   #  ensure => file,

From e7a888a73ca8895e1995c5650c61192f4867f01e Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Thu, 28 Sep 2017 09:43:06 -0400
Subject: [PATCH 182/233] Update site.pp

---
 manifests/site.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 702bb2b..98c7c57 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -45,10 +45,10 @@
   # Example:
   #   class { 'my_class': }
   #include ::users
-  include role::classroom
-  include ::skeleton
+  #include role::classroom
+  #include ::skeleton
   include users::admins
-  notify { "Hello, my name name is ${::hostname}": }
+  #notify { "Hello, my name name is ${::hostname}": }
   #file { '/etc/motd':
   #  ensure => file,
   #  owner => 'root',

From ff7566c6e7b5f7d4fca77c51a149c7c77ec4e656 Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Thu, 28 Sep 2017 09:45:29 -0400
Subject: [PATCH 183/233] Update admins.pp

---
 site/users/manifests/admins.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site/users/manifests/admins.pp b/site/users/manifests/admins.pp
index d2fe685..ed0521f 100644
--- a/site/users/manifests/admins.pp
+++ b/site/users/manifests/admins.pp
@@ -1,5 +1,6 @@
 class users::admins {
   users::managed_user { 'joe': }
+  
   users::managed_user { 'alice':
     group => 'staff',
   }

From dcf350f8b10303e06ef8574cc9de14870fae679e Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Thu, 28 Sep 2017 09:46:41 -0400
Subject: [PATCH 184/233] Update admins.pp

---
 site/users/manifests/admins.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/site/users/manifests/admins.pp b/site/users/manifests/admins.pp
index ed0521f..85c41bb 100644
--- a/site/users/manifests/admins.pp
+++ b/site/users/manifests/admins.pp
@@ -1,5 +1,6 @@
 class users::admins {
-  users::managed_user { 'joe': }
+  users::managed_user { 'joe':
+  }
   
   users::managed_user { 'alice':
     group => 'staff',

From c17d26a76d33946445c576db12dff4bc650dde93 Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Thu, 28 Sep 2017 10:18:43 -0400
Subject: [PATCH 185/233] Update site.pp

---
 manifests/site.pp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 131830e..1e1070e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -45,13 +45,11 @@
   # This is where you can declare classes for all nodes.
   # Example:
   #   class { 'my_class': }
-  include role::classroom
-  include ::users
-  include users::admins
-
-#file { '/etc/motd':      ensure => file,      content => 'This Crazy Course' } 
-
-#exec {"cowsay 'Welcome to ${::fqdn}!' > /etc/motd":
-#  creates => '/etc/motd',
-#  path => '/usr/local/bin', }
+  class profile::base {
+        # This is where you can declare classes for all nodes.
+        # Example:
+            # class { 'my_class': }
+        $message = lookup('message')
+        notify { $message: }
+}
 }

From 35097405c450bc076852ef7889cd7788c7ee6814 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Thu, 28 Sep 2017 10:18:49 -0400
Subject: [PATCH 186/233] Update base.pp

---
 site/profile/manifests/base.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/site/profile/manifests/base.pp b/site/profile/manifests/base.pp
index 8b471e5..0c62242 100644
--- a/site/profile/manifests/base.pp
+++ b/site/profile/manifests/base.pp
@@ -1,3 +1,4 @@
 class profile::base {
-  notify { "Hello, my name is ${::hostname}": }
+  $message = lookup('message')
+  notify { $message: }
 }

From 1bd3450231f63272738267816e341775b71a324c Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Thu, 28 Sep 2017 10:19:52 -0400
Subject: [PATCH 187/233] Create britter.puppetlabs.vm.yaml

---
 hieradata/britter.puppetlabs.vm.yaml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 hieradata/britter.puppetlabs.vm.yaml

diff --git a/hieradata/britter.puppetlabs.vm.yaml b/hieradata/britter.puppetlabs.vm.yaml
new file mode 100644
index 0000000..19e9813
--- /dev/null
+++ b/hieradata/britter.puppetlabs.vm.yaml
@@ -0,0 +1 @@
+message: Is it Friday yet?

From 2e6680b3da14076734c56b7da10182949d5496e1 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Thu, 28 Sep 2017 10:21:01 -0400
Subject: [PATCH 188/233] Create eddie.puppetlabs.vm.yaml

---
 hieradata/eddie.puppetlabs.vm.yaml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 hieradata/eddie.puppetlabs.vm.yaml

diff --git a/hieradata/eddie.puppetlabs.vm.yaml b/hieradata/eddie.puppetlabs.vm.yaml
new file mode 100644
index 0000000..06d8cea
--- /dev/null
+++ b/hieradata/eddie.puppetlabs.vm.yaml
@@ -0,0 +1 @@
+message: You can be my hero baby

From f859840b627d18a4745fe261c7d57db758931a57 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Thu, 28 Sep 2017 10:21:31 -0400
Subject: [PATCH 189/233] Update base.pp

---
 site/profile/manifests/base.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/site/profile/manifests/base.pp b/site/profile/manifests/base.pp
index 8b471e5..6abd8b1 100644
--- a/site/profile/manifests/base.pp
+++ b/site/profile/manifests/base.pp
@@ -1,3 +1,4 @@
 class profile::base {
-  notify { "Hello, my name is ${::hostname}": }
+  #notify { "Hello, my name is ${::hostname}": }
+  notify { lookup($message): }
 }

From a782caec5a7931196333db456d3afc46fbcc5e86 Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Thu, 28 Sep 2017 10:21:48 -0400
Subject: [PATCH 190/233] Update base.pp

---
 site/profile/manifests/base.pp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/site/profile/manifests/base.pp b/site/profile/manifests/base.pp
index 8b471e5..b1f3083 100644
--- a/site/profile/manifests/base.pp
+++ b/site/profile/manifests/base.pp
@@ -1,3 +1,2 @@
 class profile::base {
   notify { "Hello, my name is ${::hostname}": }
-}

From f9392b0b4a0b3da49de8d7359794eeb26111b158 Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Thu, 28 Sep 2017 10:22:27 -0400
Subject: [PATCH 191/233] Update base.pp

---
 site/profile/manifests/base.pp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/site/profile/manifests/base.pp b/site/profile/manifests/base.pp
index b1f3083..8db8104 100644
--- a/site/profile/manifests/base.pp
+++ b/site/profile/manifests/base.pp
@@ -1,2 +1,7 @@
 class profile::base {
-  notify { "Hello, my name is ${::hostname}": }
+# This is where you can declare classes for all nodes.
+# Example:
+# class { 'my_class': }
+$message = lookup('message')
+notify { $message: }
+}

From a9db4b299c34d76f5d26208f0529fb1344d7e45f Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Thu, 28 Sep 2017 10:23:32 -0400
Subject: [PATCH 192/233] Update site.pp

---
 manifests/site.pp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 1e1070e..a25db76 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -43,13 +43,5 @@
 
 node default {
   # This is where you can declare classes for all nodes.
-  # Example:
-  #   class { 'my_class': }
-  class profile::base {
-        # This is where you can declare classes for all nodes.
-        # Example:
-            # class { 'my_class': }
-        $message = lookup('message')
-        notify { $message: }
-}
+  # Example
 }

From a2c6433e7cd0bc5e915dec28e99dba24aa3969f1 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Thu, 28 Sep 2017 10:25:06 -0400
Subject: [PATCH 193/233] Create dave .puppetlabs.vm.yaml

---
 hieradata/dave .puppetlabs.vm.yaml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 hieradata/dave .puppetlabs.vm.yaml

diff --git a/hieradata/dave .puppetlabs.vm.yaml b/hieradata/dave .puppetlabs.vm.yaml
new file mode 100644
index 0000000..e39c8fe
--- /dev/null
+++ b/hieradata/dave .puppetlabs.vm.yaml	
@@ -0,0 +1 @@
+message: 'this is a test messsage'

From c04cab6b183e94aad39564938c90e1261c724826 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Thu, 28 Sep 2017 10:25:34 -0400
Subject: [PATCH 194/233] Update dave .puppetlabs.vm.yaml

---
 hieradata/dave .puppetlabs.vm.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hieradata/dave .puppetlabs.vm.yaml b/hieradata/dave .puppetlabs.vm.yaml
index e39c8fe..85cddc6 100644
--- a/hieradata/dave .puppetlabs.vm.yaml	
+++ b/hieradata/dave .puppetlabs.vm.yaml	
@@ -1 +1,2 @@
-message: 'this is a test messsage'
+---
+message: this is a test messsage.

From b456e4b9c77e199d19beb0c076c289b9691b7e15 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Thu, 28 Sep 2017 10:28:47 -0400
Subject: [PATCH 195/233] Update base.pp

---
 site/profile/manifests/base.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/site/profile/manifests/base.pp b/site/profile/manifests/base.pp
index 6abd8b1..056a039 100644
--- a/site/profile/manifests/base.pp
+++ b/site/profile/manifests/base.pp
@@ -1,4 +1,5 @@
 class profile::base {
   #notify { "Hello, my name is ${::hostname}": }
-  notify { lookup($message): }
+  $message = lookup('message')
+  notify { $message: }
 }

From 540d414fc45af04b9f9b1279c962b2f2520f3153 Mon Sep 17 00:00:00 2001
From: Benjamin Ritter <britter@travelers.com>
Date: Thu, 28 Sep 2017 10:29:07 -0400
Subject: [PATCH 196/233] Update site.pp

---
 manifests/site.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index a25db76..fc9f202 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -44,4 +44,5 @@
 node default {
   # This is where you can declare classes for all nodes.
   # Example
+  include profile::base
 }

From 6e49a4440826e71f302032728724bb85d965ef19 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Thu, 28 Sep 2017 10:34:37 -0400
Subject: [PATCH 197/233] Rename dave .puppetlabs.vm.yaml to
 dave.puppetlabs.vm.yaml

---
 hieradata/{dave .puppetlabs.vm.yaml => dave.puppetlabs.vm.yaml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename hieradata/{dave .puppetlabs.vm.yaml => dave.puppetlabs.vm.yaml} (100%)

diff --git a/hieradata/dave .puppetlabs.vm.yaml b/hieradata/dave.puppetlabs.vm.yaml
similarity index 100%
rename from hieradata/dave .puppetlabs.vm.yaml
rename to hieradata/dave.puppetlabs.vm.yaml

From 8ddc8dfcb2229809f7b59f15ebe5c07d6b108457 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Thu, 28 Sep 2017 11:03:03 -0400
Subject: [PATCH 198/233] Update init.pp

---
 site/nginx/manifests/init.pp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index 535dc76..cadb514 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -1,5 +1,8 @@
 
-class nginx {
+class nginx (
+  Optional[String] $root = undef, 
+  Boolean $highperf = true,
+){
   case $facts['os']['family'] {
     'redhat','debian' : { $package = 'nginx'
      $owner = 'root'

From 68fab551f94fa1c287a0e1d0adbed1c4be20bbb1 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Thu, 28 Sep 2017 11:05:17 -0400
Subject: [PATCH 199/233] Update init.pp

---
 site/nginx/manifests/init.pp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index cadb514..7b76791 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -7,13 +7,19 @@
     'redhat','debian' : { $package = 'nginx'
      $owner = 'root'
      $group = 'root'
-     $docroot = '/var/www' $confdir = '/etc/nginx' $logdir = '/var/log/nginx'
+     #$docroot = '/var/www' 
+     $confdir = '/etc/nginx' 
+     $logdir = '/var/log/nginx'
+     $default_docroot = '/var/www'
   }
   'windows' : {
      $package = 'nginx-service'
      $owner = 'Administrator'
      $group = 'Administrators'
-     $docroot = 'C:/ProgramData/nginx/html' $confdir = 'C:/ProgramData/nginx' $logdir = 'C:/ProgramData/nginx/logs'
+     #$docroot = 'C:/ProgramData/nginx/html' 
+     $confdir = 'C:/ProgramData/nginx' 
+     $logdir = 'C:/ProgramData/nginx/logs'
+     $default_docroot = 'C:/ProgramData/nginx/html'
   }
   default : {
       fail("Module ${module_name} is not supported on ${facts['os']['family']}") 

From 066523962a0fd5268d34146a9a2c410a379944fb Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Thu, 28 Sep 2017 11:06:32 -0400
Subject: [PATCH 200/233] Update init.pp

---
 site/nginx/manifests/init.pp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index 7b76791..476510f 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -21,6 +21,11 @@
      $logdir = 'C:/ProgramData/nginx/logs'
      $default_docroot = 'C:/ProgramData/nginx/html'
   }
+  #if $root isn't set, then fall back to the platform default
+  $docroot = $root ? {
+    undef => $default_docroot, 
+    default => $root,
+  }
   default : {
       fail("Module ${module_name} is not supported on ${facts['os']['family']}") 
    }

From 5b8c449c8c8deaefbba0c1d5d432dc2c76fa0334 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Thu, 28 Sep 2017 11:08:58 -0400
Subject: [PATCH 201/233] Update init.pp

---
 site/nginx/manifests/init.pp | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index 643b199..afada3e 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -1,20 +1,29 @@
-class nginx {
+class nginx (
+Optional[String] $root = undef,
+Boolean $highperf = true,
+) {
   case $facts['os']['family']{
     'redhat','debian' :{
       $package = 'nginx'
       $owner = 'root'
       $group = 'root'
-      $docroot = '/var/www'
+      #$docroot = '/var/www'
       $confdir = '/etc/nginx'
       $logdir = '/var/log/nginx'
+      
+      # this will be used if we don't pass in a value
+      $default_docroot = '/var/www'
     }
     'windows' : {
       $package = 'nginx-service'
       $owner = 'Administrator'
       $group = 'Administrators'
-      $docroot = 'C:/ProgramData/nginx/html'
+      #$docroot = 'C:/ProgramData/nginx/html'
       $confdir = 'C:/ProgramData/nginx'
       $logdir = 'C:/ProgramData/nginx/logs'
+
+      # this will be used if we don't pass in a value
+      $default_docroot = 'C:/ProgramData/nginx/html'
     }
     default : {
       fail("Module ${module_name} is not supported on ${facts['os']['family']}")
@@ -27,6 +36,12 @@
     'debian' => 'www-data',
     'windows' => 'nobody',
   }
+
+  # if $root isn't set, then fall back to the platform default
+  $docroot = $root ? {
+    undef => $default_docroot,
+    default => $root,
+  }
   
   File {
     owner => $owner,
@@ -39,6 +54,12 @@
     ensure => present,
   }
   
+  # docroot is either passed in or a default value
+  nginx::vhost { 'default':
+    docroot => $docroot,
+    servername => $facts['fqdn'],
+  }
+  
   # create a directory
   file { [ $docroot, "${confdir}/conf.d" ]:
     ensure => 'directory',

From 894f586671702d741e0d164666bda99ad0c5c76c Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Thu, 28 Sep 2017 11:10:01 -0400
Subject: [PATCH 202/233] Update site.pp

---
 manifests/site.pp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index 98c7c57..906a072 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -41,6 +41,9 @@
 # specified in the console for that node.
 
 node default {
+  class { 'nginx':
+    root => '/var/www/html',
+  }
   # This is where you can declare classes for all nodes.
   # Example:
   #   class { 'my_class': }

From ffa26d0ebb33705ab815f1f807e7eb4ffe189749 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Thu, 28 Sep 2017 11:11:04 -0400
Subject: [PATCH 203/233] Update site.pp

---
 manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 587c7fa..5b8f4c9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -45,7 +45,7 @@
   #   class { 'my_class': }
   include role::classroom
   #include skeleton
-  #include nginx
+  include nginx
 
   
   if $facts['is_virtual'] {

From 18117fd2fefbeaa81eecfd6e7dd4c579ac0adc38 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Thu, 28 Sep 2017 11:12:56 -0400
Subject: [PATCH 204/233] Update init.pp

---
 site/nginx/manifests/init.pp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index afada3e..471ca2f 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -53,13 +53,7 @@
   package { $package:
     ensure => present,
   }
-  
-  # docroot is either passed in or a default value
-  nginx::vhost { 'default':
-    docroot => $docroot,
-    servername => $facts['fqdn'],
-  }
-  
+    
   # create a directory
   file { [ $docroot, "${confdir}/conf.d" ]:
     ensure => 'directory',

From 3eb6926d11294f9723222dd81e02779f12ec1dbc Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Thu, 28 Sep 2017 11:20:31 -0400
Subject: [PATCH 205/233] Update init.pp

---
 site/nginx/manifests/init.pp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index 476510f..0356b42 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -4,7 +4,8 @@
   Boolean $highperf = true,
 ){
   case $facts['os']['family'] {
-    'redhat','debian' : { $package = 'nginx'
+    'redhat','debian' : { 
+     $package = 'nginx'
      $owner = 'root'
      $group = 'root'
      #$docroot = '/var/www' 
@@ -21,15 +22,15 @@
      $logdir = 'C:/ProgramData/nginx/logs'
      $default_docroot = 'C:/ProgramData/nginx/html'
   }
+  default : {
+      fail("Module ${module_name} is not supported on ${facts['os']['family']}") 
+   }
+ }
   #if $root isn't set, then fall back to the platform default
   $docroot = $root ? {
     undef => $default_docroot, 
     default => $root,
   }
-  default : {
-      fail("Module ${module_name} is not supported on ${facts['os']['family']}") 
-   }
- }
   # user the service will run as. Used in the nginx.conf.epp template
   $user = $facts['os']['family'] ? { 
     'redhat' => 'nginx',

From 80bf62ebe923f9bae9273d84d42651a20bb1f2b0 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Thu, 28 Sep 2017 11:21:24 -0400
Subject: [PATCH 206/233] Update site.pp

---
 manifests/site.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 906a072..b41be67 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -41,9 +41,9 @@
 # specified in the console for that node.
 
 node default {
-  class { 'nginx':
-    root => '/var/www/html',
-  }
+  #class { 'nginx':
+  #  root => '/var/www/html',
+  #}
   # This is where you can declare classes for all nodes.
   # Example:
   #   class { 'my_class': }

From b6046821e7bd40920871cce6cc8f676aa02086f5 Mon Sep 17 00:00:00 2001
From: dosweene <dosweene@gmail.com>
Date: Thu, 28 Sep 2017 11:30:05 -0400
Subject: [PATCH 207/233] Update site.pp

---
 manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 5b8f4c9..587c7fa 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -45,7 +45,7 @@
   #   class { 'my_class': }
   include role::classroom
   #include skeleton
-  include nginx
+  #include nginx
 
   
   if $facts['is_virtual'] {

From 75f2a93f4d69f354e5d08c633e6013220234ddd0 Mon Sep 17 00:00:00 2001
From: ewestdal <32306206+ewestdal@users.noreply.github.com>
Date: Thu, 28 Sep 2017 11:38:06 -0400
Subject: [PATCH 208/233] Update init.pp

---
 site/nginx/manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index 471ca2f..f800fa4 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -60,7 +60,7 @@
   }
   
   # ensure index.html exists
-  file { '/var/www/index.html':
+  file { "${docroot}/index.html":
     ensure => 'file',
     source => 'puppet:///modules/nginx/index.html',
   }

From ecbedaee74215e7097e5db4a4030d0f229a24f5b Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Thu, 28 Sep 2017 11:44:30 -0400
Subject: [PATCH 209/233] Update init.pp

---
 site/nginx/manifests/init.pp | 97 +++++++++++++++++++++++++-----------
 1 file changed, 69 insertions(+), 28 deletions(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index e32ddeb..ca2e61f 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -1,43 +1,84 @@
-class nginx {
+class nginx(
+  Optional[String] $root = undef,
+) {
+  case $facts['os']['family'] {
+    'redhat','debian' : {
+      $package = 'nginx'
+      $owner = 'root'
+      $group = 'root'
+      $docroot = '/var/www',
+      $confdir = '/etc/nginx',
+      $logdir = '/var/log/nginx'
+
+      # this will be used if we don't pass in a value
+      $default_docroot = '/var/www'
+    }
+    'windows' : {
+      $package = 'nginx-service'
+      $owner = 'Administrator'
+      $group = 'Administrators'
+      $docroot = 'C:/ProgramData/nginx/html',
+      $confdir = 'C:/ProgramData/nginx',
+      $logdir = 'C:/ProgramData/nginx/logs'
+
+      # this will be used if we don't pass in a value
+      $default_docroot = 'C:/ProgramData/nginx/html'
+    }
+    default : {
+      fail("Module ${module_name} is not supported on ${facts['os']['family']}") }
+    }
+  }
+
+  # if $root isn't set, then fall back to the platform default
+  $docroot = $root ? {
+    undef   => $default_docroot,
+    default => $root,
+  }
+
+  # user the service will run as. Used in the nginx.conf.epp template
+  $user = $facts['os']['family'] ? {
+    'redhat'  => 'nginx',
+    'debian'  => 'www-data',
+    'windows' => 'nobody',
+  }
+
   File {
-    owner => 'root',
-    group => 'root',
+    owner => $owner,
+    group => $group,
     mode  => '0664',
   }
 
-  package { 'nginx':
+  package { $package:
     ensure => present,
   }
-  
-  file { '/var/www':
+
+  file { [ $docroot, "${confdir}/conf.d" ]:
     ensure => directory,
   }
-  
-  file { '/var/www/index.html':
+
+  file { "${docroot}/index.html":
     ensure => file,
     source => 'puppet:///modules/nginx/index.html',
   }
-  
-  file { '/etc/nginx/nginx.conf':
-    ensure => file,
-    source => 'puppet:///modules/nginx/nginx.conf',
-    require => Package['nginx'],
-    notify => Service['nginx'],
-  }
-  
-  file { '/etc/nginx/conf.d':
-    ensure => directory,
-  }
-  
-  file { '/etc/nginx/conf.d/default.conf':
-    ensure => file,
-    source => 'puppet:///modules/nginx/default.conf',
-    require => Package['nginx'],
-    notify => Service['nginx'],
+
+  file { "${confdir}/nginx.conf":
+    ensure  => file,
+    content => epp('nginx/nginx.conf.epp',
+      {
+        user    => $user,
+        confdir => $confdir,
+        logdir  => $logdir,
+      }
+    ),
+    notify  => Service['nginx'],
   }
 
-  service { 'nginx':
-    ensure => running,
-    enable => true,
+  file { "${confdir}/conf.d/default.conf":
+    ensure  => file,
+    content => epp('nginx/default.conf.epp',
+    {
+      docroot => $docroot, }),
+      notify  => Service['nginx'],
+    }
   }
 }

From e6f7891c846d25421eef562d7f292a633e82eafd Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Thu, 28 Sep 2017 11:45:21 -0400
Subject: [PATCH 210/233] Create default.conf.epp

---
 site/nginx/templates/default.conf.epp | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 site/nginx/templates/default.conf.epp

diff --git a/site/nginx/templates/default.conf.epp b/site/nginx/templates/default.conf.epp
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/site/nginx/templates/default.conf.epp
@@ -0,0 +1 @@
+

From 250f78f081e8175a5d1dc227256b3adde8d96e4a Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Thu, 28 Sep 2017 11:45:36 -0400
Subject: [PATCH 211/233] Create nginx.conf.epp

---
 site/nginx/templates/templates/nginx.conf.epp | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 site/nginx/templates/templates/nginx.conf.epp

diff --git a/site/nginx/templates/templates/nginx.conf.epp b/site/nginx/templates/templates/nginx.conf.epp
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/site/nginx/templates/templates/nginx.conf.epp
@@ -0,0 +1 @@
+

From 0be7073d0a1df9f0138cec0a6de9a970b8da4500 Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Thu, 28 Sep 2017 11:48:37 -0400
Subject: [PATCH 212/233] Update site.pp

---
 manifests/site.pp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index bc06f4e..f004161 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -64,4 +64,8 @@
   if $facts['virtual'] != 'physical' {
     notify {'This is a virtual machine!': }
   }
+  
+  class { 'nginx':
+    root => '/var/www/html', }
+  }
 }

From 538cc14ba64dce15c0c159e24de0c7b60e856068 Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Thu, 28 Sep 2017 11:54:10 -0400
Subject: [PATCH 213/233] Update site.pp

---
 manifests/site.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index f004161..eefdda6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -66,6 +66,6 @@
   }
   
   class { 'nginx':
-    root => '/var/www/html', }
+    root => '/var/www/html',
   }
 }

From d4692c4180983b0d8c28f593952e24e12cbbefdc Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Thu, 28 Sep 2017 12:04:08 -0400
Subject: [PATCH 214/233] Update default.conf.epp

---
 site/nginx/templates/default.conf.epp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/site/nginx/templates/default.conf.epp b/site/nginx/templates/default.conf.epp
index 8b13789..0fa41c8 100644
--- a/site/nginx/templates/default.conf.epp
+++ b/site/nginx/templates/default.conf.epp
@@ -1 +1,8 @@
+ server {
+    listen 80;
 
+    root /var/www;
+    index index.html index.htm;
+
+    server_name _;
+}

From 7a92a1ed6236d3f897640c89f01270faacb8fc0d Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Thu, 28 Sep 2017 12:05:12 -0400
Subject: [PATCH 215/233] Create nginx.conf.epp

---
 site/nginx/templates/nginx.conf.epp | 42 +++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 site/nginx/templates/nginx.conf.epp

diff --git a/site/nginx/templates/nginx.conf.epp b/site/nginx/templates/nginx.conf.epp
new file mode 100644
index 0000000..cbede51
--- /dev/null
+++ b/site/nginx/templates/nginx.conf.epp
@@ -0,0 +1,42 @@
+# For more information on configuration, see:
+#   * Official English Documentation: http://nginx.org/en/docs/
+#   * Official Russian Documentation: http://nginx.org/ru/docs/
+
+user              nginx;
+worker_processes  1;
+
+error_log  /var/log/nginx/error.log;
+#error_log  /var/log/nginx/error.log  notice;
+#error_log  /var/log/nginx/error.log  info;
+
+pid        /var/run/nginx.pid;
+
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    #keepalive_timeout  0;
+    keepalive_timeout  65;
+
+    #gzip  on;
+
+    # Load config files from the /etc/nginx/conf.d directory
+    # The default server is in conf.d/default.conf
+    include /etc/nginx/conf.d/*.conf;
+
+}

From 6e14427d128d0e55028a366984e0b5a1499261eb Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Thu, 28 Sep 2017 12:08:05 -0400
Subject: [PATCH 216/233] Update init.pp

---
 site/nginx/manifests/init.pp | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index ca2e61f..c577374 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -3,21 +3,21 @@
 ) {
   case $facts['os']['family'] {
     'redhat','debian' : {
-      $package = 'nginx'
-      $owner = 'root'
-      $group = 'root'
-      $docroot = '/var/www',
+      $package = 'nginx',
+      $owner = 'root',
+      $group = 'root',
+      # $docroot = '/var/www',
       $confdir = '/etc/nginx',
-      $logdir = '/var/log/nginx'
+      $logdir = '/var/log/nginx',
 
       # this will be used if we don't pass in a value
       $default_docroot = '/var/www'
     }
     'windows' : {
-      $package = 'nginx-service'
-      $owner = 'Administrator'
-      $group = 'Administrators'
-      $docroot = 'C:/ProgramData/nginx/html',
+      $package = 'nginx-service',
+      $owner = 'Administrator',
+      $group = 'Administrators',
+      # $docroot = 'C:/ProgramData/nginx/html',
       $confdir = 'C:/ProgramData/nginx',
       $logdir = 'C:/ProgramData/nginx/logs'
 
@@ -76,9 +76,10 @@
   file { "${confdir}/conf.d/default.conf":
     ensure  => file,
     content => epp('nginx/default.conf.epp',
-    {
-      docroot => $docroot, }),
-      notify  => Service['nginx'],
-    }
+      {
+        docroot => $docroot,
+      }
+    ),
+    notify  => Service['nginx'],
   }
 }

From d6a6560b97a2d78cdc3b78e3668ff04245db937a Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Thu, 28 Sep 2017 12:09:42 -0400
Subject: [PATCH 217/233] Update init.pp

---
 site/nginx/manifests/init.pp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index c577374..62f1884 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -3,22 +3,22 @@
 ) {
   case $facts['os']['family'] {
     'redhat','debian' : {
-      $package = 'nginx',
-      $owner = 'root',
-      $group = 'root',
-      # $docroot = '/var/www',
-      $confdir = '/etc/nginx',
-      $logdir = '/var/log/nginx',
+      $package = 'nginx'
+      $owner = 'root'
+      $group = 'root'
+      # $docroot = '/var/www'
+      $confdir = '/etc/nginx'
+      $logdir = '/var/log/nginx'
 
       # this will be used if we don't pass in a value
       $default_docroot = '/var/www'
     }
     'windows' : {
-      $package = 'nginx-service',
-      $owner = 'Administrator',
-      $group = 'Administrators',
-      # $docroot = 'C:/ProgramData/nginx/html',
-      $confdir = 'C:/ProgramData/nginx',
+      $package = 'nginx-service'
+      $owner = 'Administrator'
+      $group = 'Administrators'
+      # $docroot = 'C:/ProgramData/nginx/html'
+      $confdir = 'C:/ProgramData/nginx'
       $logdir = 'C:/ProgramData/nginx/logs'
 
       # this will be used if we don't pass in a value

From 07676d298862fe9bc1d5cf935f3c59d6fef7c8a8 Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Thu, 28 Sep 2017 12:14:52 -0400
Subject: [PATCH 218/233] Update init.pp

---
 site/nginx/manifests/init.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index 62f1884..64ee37d 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -1,4 +1,5 @@
-class nginx(
+#Docu
+class harden_docker::nginx(
   Optional[String] $root = undef,
 ) {
   case $facts['os']['family'] {

From 64217f9eda3d4f94aec5d7479f07a5840bab2d1c Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Thu, 28 Sep 2017 12:17:59 -0400
Subject: [PATCH 219/233] Update init.pp

---
 site/nginx/manifests/init.pp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index 64ee37d..ca3f825 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -26,7 +26,7 @@
       $default_docroot = 'C:/ProgramData/nginx/html'
     }
     default : {
-      fail("Module ${module_name} is not supported on ${facts['os']['family']}") }
+      fail("Module ${module_name} is not supported on ${facts['os']['family']}")
     }
   }
 
@@ -35,33 +35,27 @@
     undef   => $default_docroot,
     default => $root,
   }
-
   # user the service will run as. Used in the nginx.conf.epp template
   $user = $facts['os']['family'] ? {
     'redhat'  => 'nginx',
     'debian'  => 'www-data',
     'windows' => 'nobody',
   }
-
   File {
     owner => $owner,
     group => $group,
     mode  => '0664',
   }
-
   package { $package:
     ensure => present,
   }
-
   file { [ $docroot, "${confdir}/conf.d" ]:
     ensure => directory,
   }
-
   file { "${docroot}/index.html":
     ensure => file,
     source => 'puppet:///modules/nginx/index.html',
   }
-
   file { "${confdir}/nginx.conf":
     ensure  => file,
     content => epp('nginx/nginx.conf.epp',
@@ -73,7 +67,6 @@
     ),
     notify  => Service['nginx'],
   }
-
   file { "${confdir}/conf.d/default.conf":
     ensure  => file,
     content => epp('nginx/default.conf.epp',

From 39db5df56871f6795cf7dc9a1e9dd960a29eebfc Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Thu, 28 Sep 2017 12:18:58 -0400
Subject: [PATCH 220/233] Update init.pp

---
 site/nginx/manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index ca3f825..0d36ba3 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -1,5 +1,5 @@
 #Docu
-class harden_docker::nginx(
+class nginx(
   Optional[String] $root = undef,
 ) {
   case $facts['os']['family'] {

From b148658555ffd0ded03bed4672c4c51ba7063017 Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Thu, 28 Sep 2017 12:20:13 -0400
Subject: [PATCH 221/233] Update init.pp

---
 site/nginx/manifests/init.pp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index 0d36ba3..9ed2e8a 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -76,4 +76,9 @@
     ),
     notify  => Service['nginx'],
   }
+  
+  service { 'nginx':
+    ensure => running,
+    enable => true,
+  }
 }

From 05ce5024a662d7cb6e50e3a0c0487ca118d272f8 Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Thu, 28 Sep 2017 12:21:26 -0400
Subject: [PATCH 222/233] Update index.html

---
 site/nginx/files/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/nginx/files/index.html b/site/nginx/files/index.html
index 960c47e..7f31a40 100644
--- a/site/nginx/files/index.html
+++ b/site/nginx/files/index.html
@@ -3,6 +3,6 @@
     <title>Hello from Puppet!</title>
   </head>
   <body>
-    <h1>Hello World, Puppet is Fun!</h1>
+    <h1>Hello World, Puppet is Fun!!!!!!!!!!</h1>
   </body>
 </html>

From 2aeb1a29ecbed91dcddf526f0a1e68ee03ba21b0 Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Thu, 28 Sep 2017 12:23:38 -0400
Subject: [PATCH 223/233] Update default.conf.epp

---
 site/nginx/templates/default.conf.epp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/nginx/templates/default.conf.epp b/site/nginx/templates/default.conf.epp
index 0fa41c8..ff8839c 100644
--- a/site/nginx/templates/default.conf.epp
+++ b/site/nginx/templates/default.conf.epp
@@ -1,7 +1,7 @@
  server {
     listen 80;
 
-    root /var/www;
+    root /var/www/html;
     index index.html index.htm;
 
     server_name _;

From 8c6a4d354e94c3a2937ca2c87d8c9edaac93a1af Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Thu, 28 Sep 2017 12:25:16 -0400
Subject: [PATCH 224/233] Update default.conf.epp

---
 site/nginx/templates/default.conf.epp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/site/nginx/templates/default.conf.epp b/site/nginx/templates/default.conf.epp
index ff8839c..8d774ec 100644
--- a/site/nginx/templates/default.conf.epp
+++ b/site/nginx/templates/default.conf.epp
@@ -1,8 +1,8 @@
- server {
-    listen 80;
-
-    root /var/www/html;
-    index index.html index.htm;
-
-    server_name _;
+server {
+  listen 80;
+  
+  root <%= $docroot %>;
+  index index.html index.htm;
+ 
+  server_name _;
 }

From eadf718263c1b2973b84c93d23eb279ffc5a63d2 Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Thu, 28 Sep 2017 12:27:37 -0400
Subject: [PATCH 225/233] Update nginx.conf.epp

---
 site/nginx/templates/nginx.conf.epp | 58 ++++++++++++-----------------
 1 file changed, 24 insertions(+), 34 deletions(-)

diff --git a/site/nginx/templates/nginx.conf.epp b/site/nginx/templates/nginx.conf.epp
index cbede51..9812082 100644
--- a/site/nginx/templates/nginx.conf.epp
+++ b/site/nginx/templates/nginx.conf.epp
@@ -1,42 +1,32 @@
 # For more information on configuration, see:
-#   * Official English Documentation: http://nginx.org/en/docs/
-#   * Official Russian Documentation: http://nginx.org/ru/docs/
-
-user              nginx;
-worker_processes  1;
-
-error_log  /var/log/nginx/error.log;
-#error_log  /var/log/nginx/error.log  notice;
-#error_log  /var/log/nginx/error.log  info;
-
-pid        /var/run/nginx.pid;
+# * Official English Documentation: http://nginx.org/en/docs/
+# * Official Russian Documentation: http://nginx.org/ru/docs/
+user <%= $user %>;
+worker_processes 1;
 
+error_log <%= $logdir %>/error.log;
 
 events {
-    worker_connections  1024;
+  worker_connections 1024;
 }
 
-
 http {
-    include       /etc/nginx/mime.types;
-    default_type  application/octet-stream;
-
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
-
-    access_log  /var/log/nginx/access.log  main;
-
-    sendfile        on;
-    #tcp_nopush     on;
-
-    #keepalive_timeout  0;
-    keepalive_timeout  65;
-
-    #gzip  on;
-
-    # Load config files from the /etc/nginx/conf.d directory
-    # The default server is in conf.d/default.conf
-    include /etc/nginx/conf.d/*.conf;
-
+  include <%= $confdir %>/mime.types;
+  default_type application/octet-stream;
+  
+  log_format main '$remote_addr - $remote_user [$time_local] "$request" '
+                  '$status $body_bytes_sent "$http_referer" '
+                  '"$http_user_agent" "$http_x_forwarded_for"';
+                  
+  access_log <%= $logdir %>/access.log main;
+  
+  sendfile on;
+  #tcp_nopush on;
+  #keepalive_timeout 0;
+  keepalive_timeout 65;
+  
+  #gzip on;
+  # Load config files from the conf.d directory
+  # The default server is in conf.d/default.conf
+  include <%= $confdir %>/conf.d/*.conf;
 }

From 1560829bbc23632cfed43585235c6838f5b24fac Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Thu, 28 Sep 2017 13:25:56 -0400
Subject: [PATCH 226/233] Create params.pp

---
 site/nginx/manifests/params.pp | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 site/nginx/manifests/params.pp

diff --git a/site/nginx/manifests/params.pp b/site/nginx/manifests/params.pp
new file mode 100644
index 0000000..3f59c3b
--- /dev/null
+++ b/site/nginx/manifests/params.pp
@@ -0,0 +1,25 @@
+class nginx::params {
+  case $facts['os']['family'] {
+    'redhat','debian' : {
+      $package = 'nginx'
+      $owner = 'root'
+      $group = 'root'
+      # $docroot = '/var/www'
+      $confdir = '/etc/nginx'
+      $logdir = '/var/log/nginx'
+
+      # this will be used if we don't pass in a value
+      $default_docroot = '/var/www'
+    }
+    'windows' : {
+      $package = 'nginx-service'
+      $owner = 'Administrator'
+      $group = 'Administrators'
+      # $docroot = 'C:/ProgramData/nginx/html'
+      $confdir = 'C:/ProgramData/nginx'
+      $logdir = 'C:/ProgramData/nginx/logs'
+
+      # this will be used if we don't pass in a value
+      $default_docroot = 'C:/ProgramData/nginx/html'
+    }
+}

From e911d3263c6794039b70f2502d8fe2cb7be585c2 Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Thu, 28 Sep 2017 13:32:29 -0400
Subject: [PATCH 227/233] Update init.pp

---
 site/nginx/manifests/init.pp | 57 ++++++++++--------------------------
 1 file changed, 16 insertions(+), 41 deletions(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index 7fce5a7..7c3936a 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -1,60 +1,33 @@
 class nginx(
-  Optional[String] $root = undef,
+  String $package = $nginx::params::package,
+  String $owner = $nginx::params::owner,
+  String $group = $nginx::params::group,
+  String $docroot = $nginx::params::docroot
+  String $confdir = $nginx::params::confdir,
+  String $blockdir = $nginx::params::blockdir,
+  String $logdir = $nginx::params::logdir,
+  String $user = $nginx::params::user,
+  Boolean $highperf = $nginx::params::highperf,
 ) {
-  case $facts['os']['family'] {
-    'redhat','debian' : {
-      $package = 'nginx'
-      $owner = 'root'
-      $group = 'root'
-      # $docroot = '/var/www'
-      $confdir = '/etc/nginx'
-      $logdir = '/var/log/nginx'
-
-      # this will be used if we don't pass in a value
-      $default_docroot = '/var/www'
-    }
-    'windows' : {
-      $package = 'nginx-service'
-      $owner = 'Administrator'
-      $group = 'Administrators'
-      # $docroot = 'C:/ProgramData/nginx/html'
-      $confdir = 'C:/ProgramData/nginx'
-      $logdir = 'C:/ProgramData/nginx/logs'
-
-      # this will be used if we don't pass in a value
-      $default_docroot = 'C:/ProgramData/nginx/html'
-    }
-    default : {
-      fail("Module ${module_name} is not supported on ${facts['os']['family']}")
-    }
-  }
-
-  # if $root isn't set, then fall back to the platform default
-  $docroot = $root ? {
-    undef   => $default_docroot,
-    default => $root,
-  }
-  # user the service will run as. Used in the nginx.conf.epp template
-  $user = $facts['os']['family'] ? {
-    'redhat'  => 'nginx',
-    'debian'  => 'www-data',
-    'windows' => 'nobody',
-  }
   File {
     owner => $owner,
     group => $group,
     mode  => '0664',
   }
+  
   package { $package:
     ensure => present,
   }
+  
   file { [ $docroot, "${confdir}/conf.d" ]:
     ensure => directory,
   }
+  
   file { "${docroot}/index.html":
     ensure => file,
     source => 'puppet:///modules/nginx/index.html',
   }
+  
   file { "${confdir}/nginx.conf":
     ensure  => file,
     content => epp('nginx/nginx.conf.epp',
@@ -66,6 +39,7 @@
     ),
     notify  => Service['nginx'],
   }
+  
   file { "${confdir}/conf.d/default.conf":
     ensure  => file,
     content => epp('nginx/default.conf.epp',
@@ -74,7 +48,8 @@
       }
     ),
     notify  => Service['nginx'],
-  } 
+  }
+  
   service { 'nginx':
     ensure => running,
     enable => true,

From 5dc0e509f5e1d354c69c28cd70b8aada9b3d6367 Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Thu, 28 Sep 2017 13:36:20 -0400
Subject: [PATCH 228/233] Update params.pp

---
 site/nginx/manifests/params.pp | 45 ++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/site/nginx/manifests/params.pp b/site/nginx/manifests/params.pp
index 3f59c3b..3fc4c6c 100644
--- a/site/nginx/manifests/params.pp
+++ b/site/nginx/manifests/params.pp
@@ -1,25 +1,34 @@
 class nginx::params {
   case $facts['os']['family'] {
     'redhat','debian' : {
-      $package = 'nginx'
-      $owner = 'root'
-      $group = 'root'
-      # $docroot = '/var/www'
-      $confdir = '/etc/nginx'
-      $logdir = '/var/log/nginx'
-
-      # this will be used if we don't pass in a value
-      $default_docroot = '/var/www'
+      $package  = 'nginx'
+      $owner    = 'root'
+      $group    = 'root'
+      $docroot  = '/var/www'
+      $confdir  = '/etc/nginx'
+      $blockdir = '/etc/nginx/conf.d'
+      $logdir   = '/var/log/nginx'
     }
     'windows' : {
-      $package = 'nginx-service'
-      $owner = 'Administrator'
-      $group = 'Administrators'
-      # $docroot = 'C:/ProgramData/nginx/html'
-      $confdir = 'C:/ProgramData/nginx'
-      $logdir = 'C:/ProgramData/nginx/logs'
-
-      # this will be used if we don't pass in a value
-      $default_docroot = 'C:/ProgramData/nginx/html'
+      $package  = 'nginx-service'
+      $owner    = 'Administrator'
+      $group    = 'Administrators'
+      $docroot  = 'C:/ProgramData/nginx/html'
+      $confdir  = 'C:/ProgramData/nginx'
+      $blockdir = 'C:/ProgramData/nginx/conf.d'
+      $logdir   = 'C:/ProgramData/nginx/logs'
     }
+    default : {
+      fail("Module ${module_name} is not supported on ${facts['os']['family']}") }
+    }
+  }
+    
+  # Default to high-performance mode
+  $highperf = true
+  
+  $user = $facts['os']['family'] ? {
+    'redhat' => 'nginx',
+    'debian' => 'www-data',
+    'windows' => 'nobody',
+  }
 }

From 3bdb00ca8b779626ce11b873ab94bb109ce0ebf7 Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Thu, 28 Sep 2017 13:37:36 -0400
Subject: [PATCH 229/233] Update init.pp

---
 site/nginx/manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index 7c3936a..6175a67 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -2,7 +2,7 @@
   String $package = $nginx::params::package,
   String $owner = $nginx::params::owner,
   String $group = $nginx::params::group,
-  String $docroot = $nginx::params::docroot
+  String $docroot = $nginx::params::docroot,
   String $confdir = $nginx::params::confdir,
   String $blockdir = $nginx::params::blockdir,
   String $logdir = $nginx::params::logdir,

From 87914086b080c5b13bc33486d9d876122b04f63a Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Thu, 28 Sep 2017 13:41:48 -0400
Subject: [PATCH 230/233] Update site.pp

---
 manifests/site.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 1621a6a..8908b2d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -66,7 +66,7 @@
   }
   
   class { 'nginx':
-    root => '/var/www/html',
+    # root => '/var/www/html',
   }
   #include ::users
   #include role::classroom
@@ -84,4 +84,4 @@
     $vmname = capitalize($::virtual)
     notify { "This is a ${vmname} virtual machine.": }
   }
-}
\ No newline at end of file
+}

From 5b600181a281a856257463262ee9cce70313745a Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Thu, 28 Sep 2017 13:45:06 -0400
Subject: [PATCH 231/233] Update params.pp

---
 site/nginx/manifests/params.pp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/site/nginx/manifests/params.pp b/site/nginx/manifests/params.pp
index 3fc4c6c..07dfb50 100644
--- a/site/nginx/manifests/params.pp
+++ b/site/nginx/manifests/params.pp
@@ -1,4 +1,5 @@
-class nginx::params {
+#dd
+class harden_docker::nginx {
   case $facts['os']['family'] {
     'redhat','debian' : {
       $package  = 'nginx'
@@ -19,13 +20,13 @@
       $logdir   = 'C:/ProgramData/nginx/logs'
     }
     default : {
-      fail("Module ${module_name} is not supported on ${facts['os']['family']}") }
+      fail("Module ${module_name} is not supported on ${facts['os']['family']}")
     }
   }
-    
+
   # Default to high-performance mode
   $highperf = true
-  
+
   $user = $facts['os']['family'] ? {
     'redhat' => 'nginx',
     'debian' => 'www-data',

From 20f8c77bda7486ceacd1c8dbe07636eba6a9a356 Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Thu, 28 Sep 2017 13:47:02 -0400
Subject: [PATCH 232/233] Update params.pp

---
 site/nginx/manifests/params.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/nginx/manifests/params.pp b/site/nginx/manifests/params.pp
index 07dfb50..623ed3e 100644
--- a/site/nginx/manifests/params.pp
+++ b/site/nginx/manifests/params.pp
@@ -1,5 +1,5 @@
 #dd
-class harden_docker::nginx {
+class nginx::params {
   case $facts['os']['family'] {
     'redhat','debian' : {
       $package  = 'nginx'

From f51ea0210ce42ef2447d7dbd8a22712c2a1e1ad2 Mon Sep 17 00:00:00 2001
From: Autostructure <bbelanger@azcender.com>
Date: Thu, 28 Sep 2017 14:02:25 -0400
Subject: [PATCH 233/233] Update init.pp

---
 site/nginx/manifests/init.pp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/site/nginx/manifests/init.pp b/site/nginx/manifests/init.pp
index 6175a67..bce4d69 100644
--- a/site/nginx/manifests/init.pp
+++ b/site/nginx/manifests/init.pp
@@ -1,13 +1,13 @@
 class nginx(
-  String $package = $nginx::params::package,
-  String $owner = $nginx::params::owner,
-  String $group = $nginx::params::group,
-  String $docroot = $nginx::params::docroot,
-  String $confdir = $nginx::params::confdir,
-  String $blockdir = $nginx::params::blockdir,
-  String $logdir = $nginx::params::logdir,
-  String $user = $nginx::params::user,
-  Boolean $highperf = $nginx::params::highperf,
+  String $package = $::nginx::params::package,
+  String $owner = $::nginx::params::owner,
+  String $group = $::nginx::params::group,
+  String $docroot = $::nginx::params::docroot,
+  String $confdir = $::nginx::params::confdir,
+  String $blockdir = $::nginx::params::blockdir,
+  String $logdir = $::nginx::params::logdir,
+  String $user = $::nginx::params::user,
+  Boolean $highperf = $::nginx::params::highperf,
 ) {
   File {
     owner => $owner,