From bbc95640557e200a5a4e463f451ed647692dc0a3 Mon Sep 17 00:00:00 2001
From: Micah <micah@leap.se>
Date: Sat, 19 Sep 2015 22:19:44 -0400
Subject: Remove no longer used vhost for leap_webapp (#7475)

The configuration /etc/apache/sites-enabled/leap_webapp.conf was never
removed after 6255e58bf9ff3489bf2707bc2be9759ec5c7db68 made it obsolete,
and because it exists on older systems, it is being used instead of the
correct common.conf.

This removes it and reloads apache.

Change-Id: Ic4c9901f4bba869ecb3dfe5362dfd1971570f89a
---
 puppet/modules/site_config/manifests/remove_files.pp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'puppet/modules/site_config/manifests')

diff --git a/puppet/modules/site_config/manifests/remove_files.pp b/puppet/modules/site_config/manifests/remove_files.pp
index a9a0c8bf..e2ab3c2e 100644
--- a/puppet/modules/site_config/manifests/remove_files.pp
+++ b/puppet/modules/site_config/manifests/remove_files.pp
@@ -23,6 +23,8 @@ class site_config::remove_files {
     '/etc/logrotate.d/mx':;
     '/etc/logrotate.d/stunnel':;
     '/var/log/stunnel4/stunnel.log':;
+    '/etc/apache/sites-enabled/leap_webapp.conf':
+      notify => Service['apache'];
     'leap_mx':
       path => '/var/log/',
       recurse => true,
-- 
cgit v1.2.3