Deploy abusehelper and wiki sources via puppet instead of svn

abusehelper/Makefile

@@ -0,0 +1,24 @@
+AHELPERURL = http://abusehelper.googlecode.com/svn/trunk
+AHELPER = $(shell svn info $(AHELPERURL) | awk '/^Revision:/ { print $$2 }')
+AHELPERSRC = /usr/local/src/abusehelper-$(AHELPER)
+OUT = /srv/puppet/files/common/packages
+
+all: tarball
+
+tarball: $(OUT)/abusehelper.tar.gz
+
+$(AHELPERSRC):
+	( umask 022 ; mkdir -p $(AHELPERSRC) ; cd $(AHELPERSRC) && \
+	svn export -r $(AHELPER) $(AHELPERURL) abusehelper )
+
+$(OUT)/abusehelper-$(AHELPER).tar.gz: $(AHELPERSRC)
+	( umask 022 ; cd $(AHELPERSRC) && \
+	tar zcvf $(OUT)/abusehelper-$(AHELPER).tar.gz abusehelper )
+
+$(OUT)/abusehelper.tar.gz: $(OUT)/abusehelper-$(AHELPER).tar.gz
+	( umask 022 ; cd $(OUT) && \
+	ln -fs abusehelper-$(AHELPER).tar.gz abusehelper.tar.gz )
+
+clean: override AHELPER = *
+clean:
+	rm -fr $(AHELPERSRC)

abusehelper/manifests/init.pp

@@ -2,22 +2,25 @@
 #
 class abusehelper {
 
-    if !$abusehelper_revision {
-        fail("\$abusehelper_revision must be set.")
-    }
-
     package { [ "python-pyme", "python-tz" ]:
         ensure => installed,
     }
 
-    include svn::client
-    svn::export { "/usr/local/src/abusehelper":
-        source => "http://abusehelper.googlecode.com/svn/trunk",
-        ensure => $abusehelper_revision,
+    file { "/usr/local/src/abusehelper.tar.gz":
+        ensure => present,
+        mode   => 0644,
+        owner  => root,
+        group  => root,
+        source => "puppet:///files/packages/abusehelper.tar.gz",
+        links  => follow,
+    }
+    util::extract::tar { "/usr/local/src/abusehelper":
+        strip   => 1,
+        source  => "/usr/local/src/abusehelper.tar.gz",
+        require => File["/usr/local/src/abusehelper.tar.gz"],
     }
-
     python::setup::install { "/usr/local/src/abusehelper":
-        require => Svn::Export["/usr/local/src/abusehelper"],
+        require => Util::Extract::Tar["/usr/local/src/abusehelper"],
     }
 
     include user::system