From 4bc3dcedf6e3440832e912b08711f51ad59997e6 Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Tue, 3 Jan 2012 17:20:18 +0200
Subject: [PATCH] Added support for specifying source packages for abusehelper,
 vsroom and wiki

---
 abusehelper/Makefile          |  4 ++--
 abusehelper/manifests/init.pp | 18 ++++++++++++++++++
 vsroom/Makefile               |  2 +-
 vsroom/manifests/init.pp      |  9 +++++++++
 wiki/Makefile                 |  5 ++---
 wiki/manifests/init.pp        | 20 ++++++++++++++++++++
 6 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/abusehelper/Makefile b/abusehelper/Makefile
index 4810fd6..04d97a8 100644
--- a/abusehelper/Makefile
+++ b/abusehelper/Makefile
@@ -22,5 +22,5 @@ $(PACKAGES)/$(IKTARGET):
 
 $(MANIFESTS)/abusehelper.pp: $(PACKAGES)/$(AHTARGET) $(PACKAGES)/$(IKTARGET)
 	@umask 022; echo $@; \
-	echo '$$abusehelper_package = "$(AHTARGET)"' > $@ && \
-	echo '$$idiokit_package = "$(IKTARGET)"' >> $@
+	echo '$$abusehelper_package_latest = "$(AHTARGET)"' > $@ && \
+	echo '$$idiokit_package_latest = "$(IKTARGET)"' >> $@
diff --git a/abusehelper/manifests/init.pp b/abusehelper/manifests/init.pp
index e0f7d28..456cd48 100644
--- a/abusehelper/manifests/init.pp
+++ b/abusehelper/manifests/init.pp
@@ -24,6 +24,22 @@ class abusehelper {
         }
     }
 
+    if !$abusehelper_package {
+        if $abusehelper_package_latest {
+            $abusehelper_package = $abusehelper_package_latest
+        } else {
+            fail("Must define \$abusehelper_package or \$abusehelper_package_latest")
+        }
+    }
+
+    if !$idiokit_package {
+        if $idiokit_package_latest {
+            $idiokit_package = $idiokit_package_latest
+        } else {
+            fail("Must define \$idiokit_package or \$idiokit_package_latest")
+        }
+    }
+
     file { "/usr/local/src/abusehelper.tar.gz":
         ensure => present,
         mode   => 0644,
@@ -33,6 +49,7 @@ class abusehelper {
         links  => follow,
     }
     util::extract::tar { "/usr/local/src/abusehelper":
+        ensure  => latest,
         strip   => 1,
         source  => "/usr/local/src/abusehelper.tar.gz",
         require => File["/usr/local/src/abusehelper.tar.gz"],
@@ -47,6 +64,7 @@ class abusehelper {
         links  => follow,
     }
     util::extract::tar { "/usr/local/src/idiokit":
+        ensure  => latest,
         strip   => 1,
         source  => "/usr/local/src/idiokit.tar.gz",
         require => File["/usr/local/src/idiokit.tar.gz"],
diff --git a/vsroom/Makefile b/vsroom/Makefile
index f8f053f..c334876 100644
--- a/vsroom/Makefile
+++ b/vsroom/Makefile
@@ -14,4 +14,4 @@ $(PACKAGES)/$(TARGET):
 
 $(MANIFESTS)/vsroom.pp: $(PACKAGES)/$(TARGET)
 	@umask 022; echo $@; \
-	echo '$$vsroom_package = "$(TARGET)"' > $@
+	echo '$$vsroom_package_latest = "$(TARGET)"' > $@
diff --git a/vsroom/manifests/init.pp b/vsroom/manifests/init.pp
index 82568b5..c2583da 100644
--- a/vsroom/manifests/init.pp
+++ b/vsroom/manifests/init.pp
@@ -17,6 +17,14 @@ class vsroom {
         }
     }
 
+    if !$vsroom_package {
+        if $vsroom_package_latest {
+            $vsroom_package = $vsroom_package_latest
+        } else {
+            fail("Must define \$vsroom_package or \$vsroom_package_latest")
+        }
+    }
+
     file { "/usr/local/src/vsroom.tar.gz":
         ensure => present,
         mode   => 0644,
@@ -26,6 +34,7 @@ class vsroom {
         links  => follow,
     }
     util::extract::tar { "/usr/local/src/vsroom":
+        ensure  => latest,
         strip   => 1,
         source  => "/usr/local/src/vsroom.tar.gz",
         require => File["/usr/local/src/vsroom.tar.gz"],
diff --git a/wiki/Makefile b/wiki/Makefile
index c07a20f..6df1609 100644
--- a/wiki/Makefile
+++ b/wiki/Makefile
@@ -22,6 +22,5 @@ $(PACKAGES)/$(MOINTARGET):
 
 $(MANIFESTS)/wiki.pp: $(PACKAGES)/$(GWIKITARGET) $(PACKAGES)/$(MOINTARGET)
 	@umask 022; echo $@; \
-	echo '$$graphingwiki_package = "$(GWIKITARGET)"' > $@ && \
-	echo '$$moin_package = "$(MOINTARGET)"' >> $@ && \
-	echo '$$moin_patch = "moin-$(MOINVERSION).patch"' >> $@
+	echo '$$graphingwiki_package_latest = "$(GWIKITARGET)"' > $@ && \
+	echo '$$moin_package_latest = "$(MOINTARGET)"' >> $@
diff --git a/wiki/manifests/init.pp b/wiki/manifests/init.pp
index e6ba552..cb2d816 100644
--- a/wiki/manifests/init.pp
+++ b/wiki/manifests/init.pp
@@ -2,6 +2,16 @@
 #
 class wiki::moin {
 
+    if !$moin_package {
+        if $moin_package_latest {
+            $moin_package = $moin_package_latest
+        } else {
+            fail("Must define \$moin_package or \$moin_package_latest")
+        }
+    }
+
+    $moin_patch = regsubst($moin_package, '\.tar\.gz', '.patch')
+
     file { "/usr/local/src/moin.tar.gz":
         ensure => present,
         mode   => 0644,
@@ -19,6 +29,7 @@ class wiki::moin {
         links  => follow,
     }
     util::extract::tar { "/usr/local/src/moin":
+        ensure  => latest,
         strip   => 1,
         source  => "/usr/local/src/moin.tar.gz",
         require => File["/usr/local/src/moin.tar.gz"],
@@ -38,6 +49,14 @@ class wiki::moin {
 #
 class wiki::graphingwiki::common {
 
+    if !$graphingwiki_package {
+        if $graphingwiki_package_latest {
+            $graphingwiki_package = $graphingwiki_package_latest
+        } else {
+            fail("Must define \$graphingwiki_package or \$graphingwiki_package_latest")
+        }
+    }
+
     file { "/usr/local/src/graphingwiki.tar.gz":
         ensure => directory,
         mode   => 0644,
@@ -47,6 +66,7 @@ class wiki::graphingwiki::common {
         links  => follow,
     }
     util::extract::tar { "/usr/local/src/graphingwiki":
+        ensure  => latest,
         strip   => 1,
         source  => "/usr/local/src/graphingwiki.tar.gz",
         require => File["/usr/local/src/graphingwiki.tar.gz"],