X-Git-Url: https://pwan.org/git/?p=hgr.git;a=blobdiff_plain;f=manifests%2Finit.pp;fp=manifests%2Finit.pp;h=2e7e3963fa31ccbaefebf74e53cdc16aad42ccc0;hp=64a0e718dcec06a2c635471ef0e7a7df042e6099;hb=cb5a94b9d4662bcb79cc59e23c9d3f1bbdb31cc5;hpb=8e287a49e4932a8a9b7b20b4372225a9d5ea5bd9

diff --git a/manifests/init.pp b/manifests/init.pp
index 64a0e71..2e7e396 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -3,80 +3,10 @@
 
 class hgr {
 
-    package {
-	"postfix" :
-           ensure => installed;
-        "dovecot" :
-           ensure => installed;
-        "sasl2-bin":
-           ensure => installed;
-
-        "spamassassin":
-	   ensure => installed;
-	"pyzor":
-	   ensure => installed;
-
-        "incron" :
-           ensure => installed;	
-
-	"notmuch" :
-	   ensure => installeD;
-    }
-
-    service {
-        "postfix":
-            ensure => running,
-            enable => true,
-            require => Package["postfix"];
-        "dovecot":
-            ensure => running,
-            enable => true,
-            require => Package["dovecot"];
-        "saslauthd"
-	    ensure => running,
-            enable => true,
-            require => Package["sasl2-bin"]
-    }
-
-# Beter support for pulling a github repo ? 
-# support for running 'sudo python setup.py install' to build afew
-
-    package {
-         "python-dev":
-             ensure => installed;
-         "gcc" :
-              ensure => installed;
-         "git":
-	      ensure => installed;
-    }
-
-    file {
-	"/var/tmp/git":
-	    ensure => directory;
-    }
-
-    exec {
-	"clone-afew-repo":
-		cwd => "/var/tmp/git"
-		command => "git clone https://github.com/teythoon/afew /var/tmp/git/afew"
-                creates => "/var/tmp/git/afew/setup.py";
-		requires => [File["/var/tmp/git"],Package["git"]]
-	"install-afew":
-                cwd => "/var/tmp/git/afew";
-		command => "/usr/bin/python /var/tmp/git/afew/setup.py install",
-		creates => "/usr/local/bin/afew",
-		requires => [Exec["clone-afew-repo"],Package["python-dev"],Package["gcc"]];
-    }
-
-    file {
-        "/usr/local/bin/afew":
-             ensure => present,
-	     require => Exec["install-afew"];
-	"/usr/local/bin/my-notmuch-new.sh":
-	     ensure => present,
-	     mode => "0755",
-	     source => "puppet:///module/hgr/my-notmuch-new.sh",
-	     require => [Package["notmuch"], File["/usr/local/bin/afew"]];
-    }
+    include hgr::postfix
+    include hgr::dovecot
+    include hgr::spamassassin
+    include hgr::radicale
+    include hgr::slapd
 
 }