diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2019-06-10 14:16:10 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2019-06-10 14:27:36 +0400 |
| commit | 77d58a1773dcea3ab971661292158978d4f00f6f (patch) | |
| tree | 006fa6004f2f1780eb65b75cc00612f9fe666b42 /mcp/patches | |
| parent | ed04ad3dcbc5aece711ea48d165b7f587d050ea1 (diff) | |
[ha] Disable apache's status module
To avoid ports conflict of nginx/apache disable unused apache's
status module, which is binded on 80 port by default.
Also remove patch with double locations content
(formula already has such configuration).
JIRA: FUEL-408
Change-Id: Ib06dac8abe36299cf77747bdb3fc0fe7216b6096
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/patches')
| -rw-r--r-- | mcp/patches/salt-formula-apache/0001-wsgi.conf-Allow-configuration-of-locations.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/mcp/patches/salt-formula-apache/0001-wsgi.conf-Allow-configuration-of-locations.patch b/mcp/patches/salt-formula-apache/0001-wsgi.conf-Allow-configuration-of-locations.patch deleted file mode 100644 index 6304424d3..000000000 --- a/mcp/patches/salt-formula-apache/0001-wsgi.conf-Allow-configuration-of-locations.patch +++ /dev/null @@ -1,32 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2019 Mirantis Inc., Enea AB and others. -: -: All rights reserved. This program and the accompanying materials -: are made available under the terms of the Apache License, Version 2.0 -: which accompanies this distribution, and is available at -: http://www.apache.org/licenses/LICENSE-2.0 -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Wed, 5 Jun 2019 14:23:21 +0200 -Subject: [PATCH] wsgi.conf: Allow configuration of `locations` - -wsgi configuration template should also asupport configuring locations -in order to allow Horizon resources to be accessed from '/static', -otherwise the system level reclass config for it is silently ignored. - -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - apache/files/wsgi.conf | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/apache/files/wsgi.conf b/apache/files/wsgi.conf -index cad01dc..d375708 100644 ---- a/apache/files/wsgi.conf -+++ b/apache/files/wsgi.conf -@@ -26,4 +26,6 @@ Listen {{ site.host.address }}:{{ site.host.port }} - Allow from all - </IfVersion> - </Directory> -+ -+ {%- include "apache/files/_locations.conf" %} - </VirtualHost> |