From 049c336a4a7f5058d16990691a4a6889e8ca570b Mon Sep 17 00:00:00 2001
From: "jhejda@wmpromus.com" <jhejda@wmpromus.com>
Date: Thu, 23 May 2019 14:07:35 +0200
Subject: [PATCH] eyaml

---
 data/nodes/node.yaml                      | 2 ++
 data/secrets/node.yaml                    | 2 ++
 hiera.yaml                                | 6 ++++++
 modules/iis_demo/manifests/app.pp         | 8 ++++----
 modules/iis_demo/manifests/iis_prereqs.pp | 6 +-----
 5 files changed, 15 insertions(+), 9 deletions(-)
 create mode 100644 data/nodes/node.yaml
 create mode 100644 data/secrets/node.yaml

diff --git a/data/nodes/node.yaml b/data/nodes/node.yaml
new file mode 100644
index 0000000..a2971b8
--- /dev/null
+++ b/data/nodes/node.yaml
@@ -0,0 +1,2 @@
+---
+iis_demo::app::service_account_username: user
diff --git a/data/secrets/node.yaml b/data/secrets/node.yaml
new file mode 100644
index 0000000..0be0d2f
--- /dev/null
+++ b/data/secrets/node.yaml
@@ -0,0 +1,2 @@
+---
+iis_demo::app::service_account_password: pass
diff --git a/hiera.yaml b/hiera.yaml
index 912ba45..b19b1e1 100644
--- a/hiera.yaml
+++ b/hiera.yaml
@@ -10,3 +10,9 @@ hierarchy:
     paths:
       - "nodes/%{trusted.certname}.yaml"
       - 'common.yaml'
+  - name: "eYaml backend"
+    lookup_key: eyaml_lookup_key
+    path: "secrets/%{trusted.certname}.eyaml"
+    options:
+      pkcs7_private_key: /etc/puppetlabs/puppet/keys/private_key.pkcs7.pem
+      pkcs7_public_key:  /etc/puppetlabs/puppet/keys/public_key.pkcs7.pem
diff --git a/modules/iis_demo/manifests/app.pp b/modules/iis_demo/manifests/app.pp
index acbc030..5624ebe 100644
--- a/modules/iis_demo/manifests/app.pp
+++ b/modules/iis_demo/manifests/app.pp
@@ -8,8 +8,8 @@
 
 class iis_demo::app (
   String $app_pool_name            = 'TestAppPool',
-  String $service_account_password = undef,
-  String $service_account_username = undef,
+  String $service_account_password = lookup('iis_demo::app::service_account_password'),
+  String $service_account_username = lookup('iis_demo::app::service_account_username'),
   String $iis_site_name            = 'TestIisSite',
   String $iis_webapp_name          = 'TestWebSite',
   String $path                     = 'C:\\inetpub\\wwwroot\\Test',
@@ -17,7 +17,7 @@ class iis_demo::app (
   String $message                  = '23/05/2019',
 ) {
 
-  include iis_demo::iis_prereqs
+  include iis_demo::iis
 
   ############################################################################
   # Create application pool and applicationpool                              #
@@ -63,7 +63,7 @@ class iis_demo::app (
     startup_time_limit                 => '00:01:30',
     state                              => 'started',
     user_name                          => $service_account_username,
-    #require                            => Class['iis_demo::iis'],
+    require                            => Class['iis_demo::iis'],
   }
   ############################################################################
   # Create IIS sites                                                         #
diff --git a/modules/iis_demo/manifests/iis_prereqs.pp b/modules/iis_demo/manifests/iis_prereqs.pp
index 859d090..5931301 100644
--- a/modules/iis_demo/manifests/iis_prereqs.pp
+++ b/modules/iis_demo/manifests/iis_prereqs.pp
@@ -10,7 +10,7 @@ class iis_demo::iis_prereqs (
 ) {
 
   include chocolatey
-  #include iis_demo::iis
+  include iis_demo::iis
 
   dsc_windowsfeature { '.NET Framework 4.5':
     dsc_ensure => 'present',
@@ -131,8 +131,4 @@ class iis_demo::iis_prereqs (
     notify     => Reboot['reboot_iis'],
   }
 
-  reboot { 'reboot_iis':
-    when    => refreshed,
-    timeout => 15,
-  }
 }