From 5021f7b76fa59c996b8ae3e0c26b252ffe85d663 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Thu, 16 Aug 2018 14:14:57 -0700 Subject: [PATCH] puppet: Fix accidental conflict on apache2 package. Apparently, the work to force installation of the Python 3 version of mod_wsgi was buggy and tried to force uninstall apache2. Fixes #10318. --- puppet/zulip/manifests/apache_sso.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/puppet/zulip/manifests/apache_sso.pp b/puppet/zulip/manifests/apache_sso.pp index ea08c14b5f..4010ba773e 100644 --- a/puppet/zulip/manifests/apache_sso.pp +++ b/puppet/zulip/manifests/apache_sso.pp @@ -4,7 +4,7 @@ class zulip::apache_sso { $apache_packages = [ 'apache2', 'libapache2-mod-wsgi-py3', ] package { $apache_packages: ensure => 'installed' } - $apache_former_packages = [ 'apache2', 'libapache2-mod-wsgi', ] + $apache_former_packages = [ 'libapache2-mod-wsgi', ] package { $apache_former_packages: ensure => 'absent' } apache2mod { [ 'headers', 'proxy', 'proxy_http', 'rewrite', 'ssl', 'wsgi', ]: