From 61c3fded0adc2ee42e0b67f90aa5c29601685a3b Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 29 Apr 2020 10:47:06 -0700
Subject: [PATCH] Create /srv/mailman

The multihost setup mailman setup assumes /srv/mailman is present which
then causes failures in testing because we don't explicitly create this
path. Fix that by managing the /srv/mailman path in puppet too.

Change-Id: Ia378b098b672e471897c8397f2562fc21a327f38
---
 manifests/init.pp | 8 +++++++-
 manifests/site.pp | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 961d8b2..cb275c5 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -5,13 +5,19 @@ class mailman(
   $multihost = false,
 ) {
 
-  include ::httpd
+  include httpd
 
   package { 'mailman':
     ensure => installed,
   }
 
   if ($multihost) {
+    file { '/srv/mailman':
+      ensure => directory,
+      owner  => 'root',
+      group  => 'root',
+      mode   => '0755',
+    }
     file { '/etc/mailman/mm_cfg.py':
       ensure  => present,
       owner   => 'root',
diff --git a/manifests/site.pp b/manifests/site.pp
index b852d79..3df6852 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -35,7 +35,7 @@ define mailman::site (
   $default_url_host,
   $install_languages = ['en'])
 {
-  include ::httpd
+  include httpd
 
   $root = "/srv/mailman/${name}"
   $dirs = [