summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2020-05-08 16:03:05 -0300
committerSilvio Rhatto <rhatto@riseup.net>2020-05-08 16:03:05 -0300
commita12e2949947f4a131b9fcbdaa30f5fbff9518ce8 (patch)
tree456ec514640730ae5be592fe61a9ec8be711b823 /manifests
parent6f215690167ce4c23005feec574c91a8db1ae999 (diff)
downloadpuppet-mail-a12e2949947f4a131b9fcbdaa30f5fbff9518ce8.tar.gz
puppet-mail-a12e2949947f4a131b9fcbdaa30f5fbff9518ce8.tar.bz2
Debian Buster changes
Diffstat (limited to 'manifests')
-rw-r--r--manifests/amavisd.pp16
-rw-r--r--manifests/virtual/web/admin.pp2
2 files changed, 9 insertions, 9 deletions
diff --git a/manifests/amavisd.pp b/manifests/amavisd.pp
index d726e00..c5d4d22 100644
--- a/manifests/amavisd.pp
+++ b/manifests/amavisd.pp
@@ -23,14 +23,14 @@ class mail::amavisd {
notify => Service['amavis'],
}
- file { "/etc/amavis/conf.d/20-debian_defaults":
- ensure => present,
- owner => root,
- group => root,
- mode => '0644',
- source => "puppet:///modules/mail/amavisd/20-debian_defaults",
- notify => Service['amavis'],
- }
+ #file { "/etc/amavis/conf.d/20-debian_defaults":
+ # ensure => present,
+ # owner => root,
+ # group => root,
+ # mode => '0644',
+ # source => "puppet:///modules/mail/amavisd/20-debian_defaults",
+ # notify => Service['amavis'],
+ #}
file { "/etc/amavis/conf.d/50-user":
ensure => present,
diff --git a/manifests/virtual/web/admin.pp b/manifests/virtual/web/admin.pp
index 76cd715..a71589d 100644
--- a/manifests/virtual/web/admin.pp
+++ b/manifests/virtual/web/admin.pp
@@ -9,7 +9,7 @@ class mail::virtual::web::admin(
}
apache::site { "postfixadmin":
- docroot => '/usr/share/postfixadmin',
+ docroot => '/usr/share/postfixadmin/public',
#docroot => "${apache::sites_folder}/postfixadmin/site",
#use => [ "Site postfixadmin" ],
mpm => false,