Merge branch 'dev'

2 files changed, 8 insertions, 4 deletions

diff --git a/modules/profile/manifests/apache.pp b/modules/profile/manifests/apache.pp
index 382633b..7187350 100644
--- a/modules/profile/manifests/apache.pp
+++ b/modules/profile/manifests/apache.pp
@@ -4,6 +4,8 @@ class profile::apache {
     root_directory_options => ["All"],
     default_mods           => false,
     default_vhost          => false,
+    user                   => "http",
+    group                  => "http",
     log_formats            => {
       combined => '%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %p',
       common   => '%h %l %u %t \"%r\" %>s %b',
diff --git a/modules/profile/manifests/redis.pp b/modules/profile/manifests/redis.pp
index 79871b1..d912c59 100644
--- a/modules/profile/manifests/redis.pp
+++ b/modules/profile/manifests/redis.pp
@@ -17,9 +17,8 @@ class profile::redis {
     notify  => Service["redis"],
   }
 
-  package { "ruby-augeas":
-    ensure => installed,
-  } ->
+  ensure_packages(["ruby-augeas"])
+
   class { '::redis':
     unixsocket       => "/run/redis/redis.sock",
     unixsocketperm   => "777",
@@ -28,7 +27,10 @@ class profile::redis {
     config_file      => "/etc/redis.conf",
     config_file_orig => "/etc/redis.conf.puppet",
     port             => 0,
-    require          => File["/etc/systemd/system/redis.service.d/socket_shutdown.conf"],
+    require          => [
+      File["/etc/systemd/system/redis.service.d/socket_shutdown.conf"],
+      Package["ruby-augeas"]
+    ]
   }
 
 }