From 4bba8862abc73f742f0433a56d92bb1948625bc1 Mon Sep 17 00:00:00 2001
From: Andreas Thienemann <andreas@bawue.net>
Date: Sat, 27 Oct 2018 23:27:27 +0200
Subject: [PATCH] Delete Red Hat provided ssl.conf (#243)
When using the mod_ssl state on Red Hat family systems the httpd
server will currently not start.
This is due to duplicate Listen directives provided in the
ssl.conf file shipped with the mod_ssl rpm package and the directives
configured by saltstack.
The easy solution is to just ensure the rpm shipped mod_ssl is removed.
---
apache/mod_ssl.sls | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/apache/mod_ssl.sls b/apache/mod_ssl.sls
index 45667f9..affd084 100644
--- a/apache/mod_ssl.sls
+++ b/apache/mod_ssl.sls
@@ -33,6 +33,13 @@ mod_ssl:
- watch_in:
- module: apache-restart
+{{ apache.confdir }}/ssl.conf:
+ file.absent:
+ - require:
+ - pkg: apache
+ - watch_in:
+ - service: apache
+
{% elif grains['os_family']=="FreeBSD" %}
include:
--
GitLab