From bd20670bb9af19e58a6cfe20b994fa448810935c Mon Sep 17 00:00:00 2001
From: Alexander Fisher <alex@linfratech.co.uk>
Date: Sat, 29 Aug 2020 13:59:11 +0100
Subject: [PATCH] Refactor to remove some `File` defaults

Resource defaults outside of site.pp are not recommended.
https://puppet.com/docs/puppet/6.18/lang_defaults.html

In these cases, there was only a single file resource in each manifest.
---
 manifests/resource/geo.pp        | 10 +++-------
 manifests/resource/map.pp        | 10 +++-------
 manifests/resource/streamhost.pp | 18 +++++-------------
 3 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/manifests/resource/geo.pp b/manifests/resource/geo.pp
index 9d99b4298..582b2b08c 100644
--- a/manifests/resource/geo.pp
+++ b/manifests/resource/geo.pp
@@ -73,16 +73,12 @@
     default  => 'file',
   }
 
-  File {
-    owner => 'root',
-    group => $root_group,
-    mode  => $nginx::global_mode,
-  }
-
   file { "${conf_dir}/${name}-geo.conf":
     ensure  => $ensure_real,
+    owner   => 'root',
+    group   => $root_group,
+    mode    => $nginx::global_mode,
     content => template('nginx/conf.d/geo.erb'),
     notify  => Class['nginx::service'],
-    require => File[$conf_dir],
   }
 }
diff --git a/manifests/resource/map.pp b/manifests/resource/map.pp
index 24e5a9ce9..a2fb0b291 100644
--- a/manifests/resource/map.pp
+++ b/manifests/resource/map.pp
@@ -95,16 +95,12 @@
     default  => 'file',
   }
 
-  File {
-    owner => 'root',
-    group => $root_group,
-    mode  => $nginx::global_mode,
-  }
-
   file { "${conf_dir}/${name}-map.conf":
     ensure  => $ensure_real,
+    owner   => 'root',
+    group   => $root_group,
+    mode    => $nginx::global_mode,
     content => template('nginx/conf.d/map.erb'),
     notify  => Class['nginx::service'],
-    require => File[$conf_dir],
   }
 }
diff --git a/manifests/resource/streamhost.pp b/manifests/resource/streamhost.pp
index dd6a30900..d63069b75 100644
--- a/manifests/resource/streamhost.pp
+++ b/manifests/resource/streamhost.pp
@@ -84,20 +84,9 @@
   $name_sanitized = regsubst($name, ' ', '_', 'G')
   $config_file = "${streamhost_dir}/${name_sanitized}.conf"
 
-  File {
-    ensure => $ensure ? {
-      'absent' => absent,
-      default  => 'file',
-    },
-    notify => Class['nginx::service'],
-    owner  => $owner,
-    group  => $group,
-    mode   => $mode,
-  }
-
   # Add IPv6 Logic Check - Nginx service will not start if ipv6 is enabled
   # and support does not exist for it in the kernel.
-  if ($ipv6_enable == true) and (!$facts['networking']['ip6']) {
+  if $ipv6_enable and !$facts['networking']['ip6'] {
     warning('nginx: IPv6 support is not enabled or configured properly')
   }
 
@@ -121,7 +110,10 @@
       ensure  => $streamhost_symlink_ensure,
       path    => "${streamhost_enable_dir}/${name_sanitized}.conf",
       target  => $config_file,
-      require => [Concat[$config_file], File[$streamhost_enable_dir]],
+      owner   => $owner,
+      group   => $group,
+      mode    => $mode,
+      require => Concat[$config_file],
       notify  => Class['nginx::service'],
     }
   }