Fix: switch postfixadmin to upstream codebase

diff --git a/manifests/virtual/packages.pp b/manifests/virtual/packages.pp
index 969cc02186b63ae192e46e161acfb9365cbec5dc..4dc173c4ce7237674a4c712c37b50bf6c672f9cb 100644 (file)
--- a/manifests/virtual/packages.pp
+++ b/manifests/virtual/packages.pp
@@ -1,6 +1,8 @@
 class mail::virtual::packages {
+  # This package come and goes from Debian, therefore right now it may be manually maintained
+  # See https://git.fluxo.info/downloaders for a semi-automated installation/update procedure
   package { 'postfixadmin':
-    ensure => present,
+    ensure => absent,
   }
 
   package { [ 'libpam-mysql', 'libgsasl7' ]:
@@ -13,7 +15,7 @@ class mail::virtual::packages {
 
   package { [ 'squirrelmail', 'squirrelmail-locales' ]:
     ensure => absent,
-  } 
+  }
 
   package { 'php-crypt-gpg':
     ensure => $::lsbdistcodename ? {
@@ -26,7 +28,7 @@ class mail::virtual::packages {
   if $::lsbdistcodename != 'lenny' {
     package { [ 'roundcube', 'roundcube-sqlite3', 'roundcube-plugins', 'roundcube-mysql' ]:
       ensure => latest,
-    } 
+    }
   }
 
   # Not in use right now
@@ -45,5 +47,5 @@ class mail::virtual::packages {
       'squeeze' => installed,
       default   => absent,
     }
-  } 
+  }
 }

diff --git a/manifests/virtual/web/admin.pp b/manifests/virtual/web/admin.pp
index a71589d9c000ed27ef10679ffad89697684837ec..1a81f28098373500550ae91090615d6f3466924f 100644 (file)
--- a/manifests/virtual/web/admin.pp
+++ b/manifests/virtual/web/admin.pp
@@ -9,9 +9,13 @@ class mail::virtual::web::admin(
   }
 
   apache::site { "postfixadmin":
-    docroot => '/usr/share/postfixadmin/public',
-    #docroot => "${apache::sites_folder}/postfixadmin/site",
-    #use     => [ "Site postfixadmin" ],
+    # Configuration when postfixadmin is installed as a package
+    #docroot => '/usr/share/postfixadmin/public',
+
+    # Configuration when postfixadmin is manually maintained
+    docroot => "${apache::sites_folder}/postfixadmin/site/public",
+    use     => [ "Site postfixadmin" ],
+
     mpm     => false,
   }