From 05585e883e1de8150cc30ac1d2e474c0b153c128 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 28 May 2018 10:09:17 +0200
Subject: [PATCH] rename varnish to varnish_pkgmirror module

---
 manifests/site.pp                                         | 2 +-
 modules/{varnish => varnish-pkgmirror}/files/default.vcl  | 0
 .../{varnish => varnish-pkgmirror}/files/varnish.default  | 0
 .../files/varnish.logrotate                               | 0
 modules/{varnish => varnish-pkgmirror}/manifests/init.pp  | 8 ++++----
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename modules/{varnish => varnish-pkgmirror}/files/default.vcl (100%)
 rename modules/{varnish => varnish-pkgmirror}/files/varnish.default (100%)
 rename modules/{varnish => varnish-pkgmirror}/files/varnish.logrotate (100%)
 rename modules/{varnish => varnish-pkgmirror}/manifests/init.pp (80%)

diff --git a/manifests/site.pp b/manifests/site.pp
index b0bd0f9d6..f4494e6b0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -105,6 +105,6 @@ node default {
 	}
 
 	if $::hostname == 'pkgmirror-csail' {
-		include varnish
+		include varnish_pkgmirror
 	}
 }
diff --git a/modules/varnish/files/default.vcl b/modules/varnish-pkgmirror/files/default.vcl
similarity index 100%
rename from modules/varnish/files/default.vcl
rename to modules/varnish-pkgmirror/files/default.vcl
diff --git a/modules/varnish/files/varnish.default b/modules/varnish-pkgmirror/files/varnish.default
similarity index 100%
rename from modules/varnish/files/varnish.default
rename to modules/varnish-pkgmirror/files/varnish.default
diff --git a/modules/varnish/files/varnish.logrotate b/modules/varnish-pkgmirror/files/varnish.logrotate
similarity index 100%
rename from modules/varnish/files/varnish.logrotate
rename to modules/varnish-pkgmirror/files/varnish.logrotate
diff --git a/modules/varnish/manifests/init.pp b/modules/varnish-pkgmirror/manifests/init.pp
similarity index 80%
rename from modules/varnish/manifests/init.pp
rename to modules/varnish-pkgmirror/manifests/init.pp
index 7561869e6..3b747c956 100644
--- a/modules/varnish/manifests/init.pp
+++ b/modules/varnish-pkgmirror/manifests/init.pp
@@ -1,4 +1,4 @@
-class varnish {
+class varnish_pkgmirror {
 
         package { 'varnish':
                 ensure => installed,
@@ -18,14 +18,14 @@ class varnish {
         }
 
         file { '/etc/default/varnish':
-		source  => 'puppet:///modules/varnish/varnish.default',
+		source  => 'puppet:///modules/varnish_pkgmirror/varnish.default',
 		require =>  Package['varnish'],
                 notify  =>  Service['varnish'],
 		mode    => '0444',
         }
 
         file { '/etc/varnish/default.vcl':
-		source => 'puppet:///modules/varnish/default.vcl',
+		source => 'puppet:///modules/varnish_pkgmirror/default.vcl',
 		require =>  Package['varnish'],
 		notify =>  Service['varnish'],
 		mode    => '0444',
@@ -38,7 +38,7 @@ class varnish {
 	}
 
         file { '/etc/logrotate.d/varnish':
-		source => 'puppet:///modules/varnish/varnish.logrotate',
+		source => 'puppet:///modules/varnish_pkgmirror/varnish.logrotate',
 		require =>  Package['varnish'],
 		mode    => '0444',
         }
-- 
2.20.1