summaryrefslogtreecommitdiff
path: root/manifests/virtual/web
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-06-22 20:13:29 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-06-22 20:13:29 -0300
commit02d67a46797b1df10a1b50914c22e941527d3119 (patch)
tree52cbf08d80acf2eaa0bdf282b2d4279990a10078 /manifests/virtual/web
parent601890ff5a25e3429e1f88a2f722d8e14cce11dc (diff)
downloadpuppet-mail-02d67a46797b1df10a1b50914c22e941527d3119.tar.gz
puppet-mail-02d67a46797b1df10a1b50914c22e941527d3119.tar.bz2
Postfixadmin: user version from package
Diffstat (limited to 'manifests/virtual/web')
-rw-r--r--manifests/virtual/web/admin.pp11
1 files changed, 7 insertions, 4 deletions
diff --git a/manifests/virtual/web/admin.pp b/manifests/virtual/web/admin.pp
index 2ec4243..d6b8422 100644
--- a/manifests/virtual/web/admin.pp
+++ b/manifests/virtual/web/admin.pp
@@ -9,17 +9,20 @@ class mail::virtual::web::admin(
}
apache::site { "postfixadmin":
- docroot => "${apache::sites_folder}/postfixadmin/site",
- use => [ "Site postfixadmin" ],
+ docroot => '/usr/share/postfixadmin',
+ #docroot => "${apache::sites_folder}/postfixadmin/site",
+ #use => [ "Site postfixadmin" ],
mpm => false,
}
- file { "${apache::sites_folder}/postfixadmin/site/config.inc.php":
+ #file { "${apache::sites_folder}/postfixadmin/site/config.inc.php":
+ file { "/etc/postfixadmin/config.inc.php":
ensure => present,
owner => www-data,
group => root,
mode => 0640,
content => template('mail/virtual/postfixadmin/config.inc.php.erb'),
- require => File["${apache::sites_folder}/postfixadmin/site"],
+ #require => File["${apache::sites_folder}/postfixadmin/site"],
+ require => Package['postfixadmin'],
}
}