summaryrefslogtreecommitdiff
path: root/manifests/virtual
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2022-12-28 21:49:31 -0300
committerSilvio Rhatto <rhatto@riseup.net>2022-12-28 21:49:31 -0300
commit32527259e7533e82b712f3d21765aecc6ed88fa4 (patch)
treec93904147694146d5997af97bc36611caf93de73 /manifests/virtual
parent52e4f5906023c29c75e0e0c96f91cc4042d9f9ae (diff)
downloadpuppet-mail-32527259e7533e82b712f3d21765aecc6ed88fa4.tar.gz
puppet-mail-32527259e7533e82b712f3d21765aecc6ed88fa4.tar.bz2
Fix: switch postfixadmin to upstream codebase
Diffstat (limited to 'manifests/virtual')
-rw-r--r--manifests/virtual/packages.pp10
-rw-r--r--manifests/virtual/web/admin.pp10
2 files changed, 13 insertions, 7 deletions
diff --git a/manifests/virtual/packages.pp b/manifests/virtual/packages.pp
index 969cc02..4dc173c 100644
--- 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 a71589d..1a81f28 100644
--- 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,
}