chore(pillar.example): reset after recent fixes [skip ci]
This commit is contained in:
Imran Iqbal
parent
da7cc0cead
commit
a57d98f4fe
@ -19,7 +19,8 @@
|
||||
name: 'myii/ssf-pre-commit:2.9.2'
|
||||
entrypoint: ['/bin/bash', '-c']
|
||||
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest'
|
||||
image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14'
|
||||
# yamllint disable-line rule:line-length
|
||||
image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release-pandoc:15.14'
|
||||
# `services`
|
||||
services_docker_dind: &services_docker_dind
|
||||
- 'docker:dind'
|
||||
|
||||
479
pillar.example
479
pillar.example
@ -90,66 +90,66 @@ apache:
|
||||
# Force group, defaults to lookup:document_root_group or apache.user
|
||||
DocumentRootGroup: null
|
||||
|
||||
{# {%- if grains.os_family in ('Debian', 'Suse', 'Gentoo') %} #}
|
||||
{# SSLCertificateFile: /etc/apache2/conf/server.crt #}
|
||||
{# SSLCertificateKeyFile: /etc/apache2/conf/server.key #}
|
||||
{# {%- else %} #}
|
||||
{# SSLCertificateFile: /etc/httpd/conf/server.crt #}
|
||||
{# SSLCertificateKeyFile: /etc/httpd/conf/server.key #}
|
||||
{# {%- endif %} #}
|
||||
{# # SSLCertificateChainFile: /etc/httpd/ssl/example.com.cer #}
|
||||
{# #}
|
||||
{# SSLCertificateFile_content: | #}
|
||||
{# -----BEGIN CERTIFICATE----- #}
|
||||
{# MIIDYTCCAkkCFCKCcuwB/Ze9bI5/75oRChNH8RzHMA0GCSqGSIb3DQEBCwUAMG0x #}
|
||||
{# CzAJBgNVBAYTAklFMREwDwYDVQQIDAhDb25uYWNodDESMBAGA1UEBwwJQ29ubWFp #}
|
||||
{# Y25lMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxFDASBgNVBAMM #}
|
||||
{# C2V4YW1wbGUuY29tMB4XDTIwMTAwMzEzMzI1N1oXDTIxMTAwMzEzMzI1N1owbTEL #}
|
||||
{# MAkGA1UEBhMCSUUxETAPBgNVBAgMCENvbm5hY2h0MRIwEAYDVQQHDAlDb25tYWlj #}
|
||||
{# bmUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEUMBIGA1UEAwwL #}
|
||||
{# ZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSl0qL #}
|
||||
{# ol+/b3R9VccpOLe5Cg1Tf1zstAzV5TvjcjSdytdwMDGy9J8Yi2EcMZ1wNdMkvf4D #}
|
||||
{# mr+72Za+qeHHc0ZA+fIJoV+tTcbLbV/mhv0i0i7Zldi3QuvIVBpLR2Z5s5mXZ7C8 #}
|
||||
{# yz8VpF9enQkS3uNnbNuZNT3ElGHmlAj1yHsh0K+TbvZrygFkG0wvYwivhlt1Zcbo #}
|
||||
{# th4LJ+gBwNIdSJUiAa58VO5ZNeenM9DquJfZVcFc1bDFqzU0T9KY4PsxmzO1A2+m #}
|
||||
{# TDHoGR4nCz7B+5Ec4USyBUuKo2FhALBEtYz2hlwaf9XasSSvmzO5hhPCQ3nJ4qeY #}
|
||||
{# i+BLCSpiq2lApPVZAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAD9/78A4ygQWbO27 #}
|
||||
{# jQPm+2Zg0f9Sn1tcD4tOVao0MlAfWrALjbmj82hg+givEQKAuN7ptthYoaJcOxHl #}
|
||||
{# aUe++y3bQiCznN73yKSJZFgG5fYR8tyMslsYRBcKSay0nvPhN/3Jry0nNehDREQ+ #}
|
||||
{# 2H0vB595bymGNTmux13sNwOZH1i8KEgxdLcFbje87+CbhCGbFhS3lHPY2FeXnHpO #}
|
||||
{# W60Zchwsy06xMjo4rzbQatdJj/HAh6lIx0YmNDX/d3dCLpZlkvUBT6ENVhipi5bb #}
|
||||
{# 2pF/Awob8AYWbIn4N7gmIP5Sb0tugpEgrSgSyDdZNWoFDChvfHXcNUP8lblIftAl #}
|
||||
{# ylssbnQ= #}
|
||||
{# -----END CERTIFICATE----- #}
|
||||
{# #}
|
||||
{# SSLCertificateKeyFile_content: | #}
|
||||
{# -----BEGIN RSA PRIVATE KEY----- #}
|
||||
{# MIIEowIBAAKCAQEA0pdKi6Jfv290fVXHKTi3uQoNU39c7LQM1eU743I0ncrXcDAx #}
|
||||
{# svSfGIthHDGdcDXTJL3+A5q/u9mWvqnhx3NGQPnyCaFfrU3Gy21f5ob9ItIu2ZXY #}
|
||||
{# t0LryFQaS0dmebOZl2ewvMs/FaRfXp0JEt7jZ2zbmTU9xJRh5pQI9ch7IdCvk272 #}
|
||||
{# a8oBZBtML2MIr4ZbdWXG6LYeCyfoAcDSHUiVIgGufFTuWTXnpzPQ6riX2VXBXNWw #}
|
||||
{# xas1NE/SmOD7MZsztQNvpkwx6BkeJws+wfuRHOFEsgVLiqNhYQCwRLWM9oZcGn/V #}
|
||||
{# 2rEkr5szuYYTwkN5yeKnmIvgSwkqYqtpQKT1WQIDAQABAoIBAQCI39SP1UWuQ17P #}
|
||||
{# Z8U+waKIHkRzFMDtCEmfbJL0TfJs7L4CKRDkY6JUbaL8lDLkD9fgdax340jja5VS #}
|
||||
{# 70/UNtRevxXVtJFfLsIazkgaqXo1+65/talZ06E0X5WHgCzWxSj7A2YYD3I9OszR #}
|
||||
{# zfdr0Hq1akeA2N4AuwC2wVjhhyCg5Lg4xY0l+kRFLrPU4RctsjCAaveVIm3wmJVd #}
|
||||
{# vmHO9hKcR3nxuIx0/cPYe20WgGSqbYJQburE1uXp26uz/Jek/u8FNFIEjWCWB+vj #}
|
||||
{# eRQOcxngebyWCh0dyoxb3nL28Yty9O1MlLP2b0YMmep1ZfEFtwn4M2d8FdW1WCmJ #}
|
||||
{# viOGFx4BAoGBAPTYSIpyxea1qaeNmT97e4YgPwV3rajhdPRYSQKyCsjKHk7Q/uxk #}
|
||||
{# Phddo0ymiGKLCRAUwg9py900slY8mZKbdrVxXV4EEhngrWrr2gpfzxkEF1i0d4bS #}
|
||||
{# 2OuRCbkfE23glxqtVjvnTlrRANaXgk5mUQCL1YDUf+hrpEvF0pTbDRYpAoGBANwv #}
|
||||
{# ffy+Sk+e0v+NlthhNHUDcXisIoW7b/DoT0H8DtbJV/QVexaGln7Ts6EgaH2NdpC+ #}
|
||||
{# dyLKa+l7oIeKgXeHm2Tgm879di/ChQCkoAHIUu5Nm0c5D2Vst26JrfCA7vZb9ddI #}
|
||||
{# FMFt5bsDgRqFzTXFe0k9TEIBiF0Pp5xfHVwNWeuxAoGAGNY3xZOO77BN3WlHumDU #}
|
||||
{# Tu7Gdc+GFjOIoaCzB0r4PRYDrQsWUPR6N/SPtB7Qhu6DpNX2OYoJ3A6UaJsNGQoc #}
|
||||
{# KJuvVPIkw+s+rDHwlEzTvT3lAGKOHWcWCg9UZSr51ZOKwHIE5V65XA0HgL0twrYu #}
|
||||
{# UVfd+IuVzgXdTLJsgh0WXsECgYApcgcU+/yg4BR3Zf9u2100aWGChWQ6J/36KsBA #}
|
||||
{# e2GPrHaRyzlQFCVf2hmFysPgXjBjLnbeZZvKZyrgWIHmLfBiHKU3YR5N/x9p75Lu #}
|
||||
{# wvZZROJllagAP2aHuAK1so9IcCbmTvsZLcaAXTh/9Y+a/4ElWBRymDdCzR+Pn5e3 #}
|
||||
{# LAwxAQKBgBHH42ri6pHbRptINzJ9sw3PhwewQZtGu3sfvrOknBs3togptCrjBWDF #}
|
||||
{# eOGuFmjHO9vnhWs2yWQYETL1jt+CWgzRc4o4akB3qH5sXar5F7h06y16RFV9u6UJ #}
|
||||
{# qaGqPFcy/l/5H6uNPLZt4Ufg3T0Mz0Az+Dti99KqVLKeqWQvXVc4 #}
|
||||
{# -----END RSA PRIVATE KEY----- #}
|
||||
{%- if grains.os_family in ('Debian', 'Suse', 'Gentoo') %}
|
||||
SSLCertificateFile: /etc/apache2/conf/server.crt
|
||||
SSLCertificateKeyFile: /etc/apache2/conf/server.key
|
||||
{%- else %}
|
||||
SSLCertificateFile: /etc/httpd/conf/server.crt
|
||||
SSLCertificateKeyFile: /etc/httpd/conf/server.key
|
||||
{%- endif %}
|
||||
# SSLCertificateChainFile: /etc/httpd/ssl/example.com.cer
|
||||
|
||||
SSLCertificateFile_content: |
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIDYTCCAkkCFCKCcuwB/Ze9bI5/75oRChNH8RzHMA0GCSqGSIb3DQEBCwUAMG0x
|
||||
CzAJBgNVBAYTAklFMREwDwYDVQQIDAhDb25uYWNodDESMBAGA1UEBwwJQ29ubWFp
|
||||
Y25lMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxFDASBgNVBAMM
|
||||
C2V4YW1wbGUuY29tMB4XDTIwMTAwMzEzMzI1N1oXDTIxMTAwMzEzMzI1N1owbTEL
|
||||
MAkGA1UEBhMCSUUxETAPBgNVBAgMCENvbm5hY2h0MRIwEAYDVQQHDAlDb25tYWlj
|
||||
bmUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEUMBIGA1UEAwwL
|
||||
ZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSl0qL
|
||||
ol+/b3R9VccpOLe5Cg1Tf1zstAzV5TvjcjSdytdwMDGy9J8Yi2EcMZ1wNdMkvf4D
|
||||
mr+72Za+qeHHc0ZA+fIJoV+tTcbLbV/mhv0i0i7Zldi3QuvIVBpLR2Z5s5mXZ7C8
|
||||
yz8VpF9enQkS3uNnbNuZNT3ElGHmlAj1yHsh0K+TbvZrygFkG0wvYwivhlt1Zcbo
|
||||
th4LJ+gBwNIdSJUiAa58VO5ZNeenM9DquJfZVcFc1bDFqzU0T9KY4PsxmzO1A2+m
|
||||
TDHoGR4nCz7B+5Ec4USyBUuKo2FhALBEtYz2hlwaf9XasSSvmzO5hhPCQ3nJ4qeY
|
||||
i+BLCSpiq2lApPVZAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAD9/78A4ygQWbO27
|
||||
jQPm+2Zg0f9Sn1tcD4tOVao0MlAfWrALjbmj82hg+givEQKAuN7ptthYoaJcOxHl
|
||||
aUe++y3bQiCznN73yKSJZFgG5fYR8tyMslsYRBcKSay0nvPhN/3Jry0nNehDREQ+
|
||||
2H0vB595bymGNTmux13sNwOZH1i8KEgxdLcFbje87+CbhCGbFhS3lHPY2FeXnHpO
|
||||
W60Zchwsy06xMjo4rzbQatdJj/HAh6lIx0YmNDX/d3dCLpZlkvUBT6ENVhipi5bb
|
||||
2pF/Awob8AYWbIn4N7gmIP5Sb0tugpEgrSgSyDdZNWoFDChvfHXcNUP8lblIftAl
|
||||
ylssbnQ=
|
||||
-----END CERTIFICATE-----
|
||||
|
||||
SSLCertificateKeyFile_content: |
|
||||
-----BEGIN RSA PRIVATE KEY-----
|
||||
MIIEowIBAAKCAQEA0pdKi6Jfv290fVXHKTi3uQoNU39c7LQM1eU743I0ncrXcDAx
|
||||
svSfGIthHDGdcDXTJL3+A5q/u9mWvqnhx3NGQPnyCaFfrU3Gy21f5ob9ItIu2ZXY
|
||||
t0LryFQaS0dmebOZl2ewvMs/FaRfXp0JEt7jZ2zbmTU9xJRh5pQI9ch7IdCvk272
|
||||
a8oBZBtML2MIr4ZbdWXG6LYeCyfoAcDSHUiVIgGufFTuWTXnpzPQ6riX2VXBXNWw
|
||||
xas1NE/SmOD7MZsztQNvpkwx6BkeJws+wfuRHOFEsgVLiqNhYQCwRLWM9oZcGn/V
|
||||
2rEkr5szuYYTwkN5yeKnmIvgSwkqYqtpQKT1WQIDAQABAoIBAQCI39SP1UWuQ17P
|
||||
Z8U+waKIHkRzFMDtCEmfbJL0TfJs7L4CKRDkY6JUbaL8lDLkD9fgdax340jja5VS
|
||||
70/UNtRevxXVtJFfLsIazkgaqXo1+65/talZ06E0X5WHgCzWxSj7A2YYD3I9OszR
|
||||
zfdr0Hq1akeA2N4AuwC2wVjhhyCg5Lg4xY0l+kRFLrPU4RctsjCAaveVIm3wmJVd
|
||||
vmHO9hKcR3nxuIx0/cPYe20WgGSqbYJQburE1uXp26uz/Jek/u8FNFIEjWCWB+vj
|
||||
eRQOcxngebyWCh0dyoxb3nL28Yty9O1MlLP2b0YMmep1ZfEFtwn4M2d8FdW1WCmJ
|
||||
viOGFx4BAoGBAPTYSIpyxea1qaeNmT97e4YgPwV3rajhdPRYSQKyCsjKHk7Q/uxk
|
||||
Phddo0ymiGKLCRAUwg9py900slY8mZKbdrVxXV4EEhngrWrr2gpfzxkEF1i0d4bS
|
||||
2OuRCbkfE23glxqtVjvnTlrRANaXgk5mUQCL1YDUf+hrpEvF0pTbDRYpAoGBANwv
|
||||
ffy+Sk+e0v+NlthhNHUDcXisIoW7b/DoT0H8DtbJV/QVexaGln7Ts6EgaH2NdpC+
|
||||
dyLKa+l7oIeKgXeHm2Tgm879di/ChQCkoAHIUu5Nm0c5D2Vst26JrfCA7vZb9ddI
|
||||
FMFt5bsDgRqFzTXFe0k9TEIBiF0Pp5xfHVwNWeuxAoGAGNY3xZOO77BN3WlHumDU
|
||||
Tu7Gdc+GFjOIoaCzB0r4PRYDrQsWUPR6N/SPtB7Qhu6DpNX2OYoJ3A6UaJsNGQoc
|
||||
KJuvVPIkw+s+rDHwlEzTvT3lAGKOHWcWCg9UZSr51ZOKwHIE5V65XA0HgL0twrYu
|
||||
UVfd+IuVzgXdTLJsgh0WXsECgYApcgcU+/yg4BR3Zf9u2100aWGChWQ6J/36KsBA
|
||||
e2GPrHaRyzlQFCVf2hmFysPgXjBjLnbeZZvKZyrgWIHmLfBiHKU3YR5N/x9p75Lu
|
||||
wvZZROJllagAP2aHuAK1so9IcCbmTvsZLcaAXTh/9Y+a/4ElWBRymDdCzR+Pn5e3
|
||||
LAwxAQKBgBHH42ri6pHbRptINzJ9sw3PhwewQZtGu3sfvrOknBs3togptCrjBWDF
|
||||
eOGuFmjHO9vnhWs2yWQYETL1jt+CWgzRc4o4akB3qH5sXar5F7h06y16RFV9u6UJ
|
||||
qaGqPFcy/l/5H6uNPLZt4Ufg3T0Mz0Az+Dti99KqVLKeqWQvXVc4
|
||||
-----END RSA PRIVATE KEY-----
|
||||
|
||||
|
||||
Directory:
|
||||
@ -175,9 +175,9 @@ apache:
|
||||
example2.com_ssl:
|
||||
port: 443
|
||||
ServerName: example.com
|
||||
# SSLCertificateFile: /path/to/ssl.crt
|
||||
# SSLCertificateKeyFile: /path/to/ssl.key
|
||||
# SSLCertificateChainFile: /path/to/ssl.ca.crt
|
||||
SSLCertificateFile: /path/to/ssl.crt
|
||||
SSLCertificateKeyFile: /path/to/ssl.key
|
||||
SSLCertificateChainFile: /path/to/ssl.ca.crt
|
||||
|
||||
# Use RedirectMatch Directive
|
||||
redirectmatch.com:
|
||||
@ -202,175 +202,175 @@ apache:
|
||||
DocumentRoot: /var/www/proxy
|
||||
port: '8084'
|
||||
|
||||
# 8443-proxyexample.com:
|
||||
# template_file: salt://apache/config/vhosts/proxy.tmpl
|
||||
# ServerName: www.proxyexample.com
|
||||
# ServerAlias: www.proxyexample.com
|
||||
# interface: '*'
|
||||
# port: '8443'
|
||||
# DocumentRoot: /var/www/proxy
|
||||
#
|
||||
# Rewrite: |
|
||||
# RewriteRule ^/webmail$ /webmail/ [R]
|
||||
# RewriteRule ^/webmail(.*) http://mail.example.com$1 [P,L]
|
||||
# RewriteRule ^/vicescws(.*) http://svc.example.com:92$1 [P,L]
|
||||
#
|
||||
# SSLCertificateFile: /etc/httpd/conf/server.crt
|
||||
# SSLCertificateKeyFile: /etc/httpd/conf/server.key
|
||||
# # SSLCertificateChainFile: /etc/httpd/ssl/example.com.cer
|
||||
#
|
||||
# SSLCertificateFile_content: |
|
||||
# -----BEGIN CERTIFICATE-----
|
||||
# MIIDYTCCAkkCFCKCcuwB/Ze9bI5/75oRChNH8RzHMA0GCSqGSIb3DQEBCwUAMG0x
|
||||
# CzAJBgNVBAYTAklFMREwDwYDVQQIDAhDb25uYWNodDESMBAGA1UEBwwJQ29ubWFp
|
||||
# Y25lMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxFDASBgNVBAMM
|
||||
# C2V4YW1wbGUuY29tMB4XDTIwMTAwMzEzMzI1N1oXDTIxMTAwMzEzMzI1N1owbTEL
|
||||
# MAkGA1UEBhMCSUUxETAPBgNVBAgMCENvbm5hY2h0MRIwEAYDVQQHDAlDb25tYWlj
|
||||
# bmUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEUMBIGA1UEAwwL
|
||||
# ZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSl0qL
|
||||
# ol+/b3R9VccpOLe5Cg1Tf1zstAzV5TvjcjSdytdwMDGy9J8Yi2EcMZ1wNdMkvf4D
|
||||
# mr+72Za+qeHHc0ZA+fIJoV+tTcbLbV/mhv0i0i7Zldi3QuvIVBpLR2Z5s5mXZ7C8
|
||||
# yz8VpF9enQkS3uNnbNuZNT3ElGHmlAj1yHsh0K+TbvZrygFkG0wvYwivhlt1Zcbo
|
||||
# th4LJ+gBwNIdSJUiAa58VO5ZNeenM9DquJfZVcFc1bDFqzU0T9KY4PsxmzO1A2+m
|
||||
# TDHoGR4nCz7B+5Ec4USyBUuKo2FhALBEtYz2hlwaf9XasSSvmzO5hhPCQ3nJ4qeY
|
||||
# i+BLCSpiq2lApPVZAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAD9/78A4ygQWbO27
|
||||
# jQPm+2Zg0f9Sn1tcD4tOVao0MlAfWrALjbmj82hg+givEQKAuN7ptthYoaJcOxHl
|
||||
# aUe++y3bQiCznN73yKSJZFgG5fYR8tyMslsYRBcKSay0nvPhN/3Jry0nNehDREQ+
|
||||
# 2H0vB595bymGNTmux13sNwOZH1i8KEgxdLcFbje87+CbhCGbFhS3lHPY2FeXnHpO
|
||||
# W60Zchwsy06xMjo4rzbQatdJj/HAh6lIx0YmNDX/d3dCLpZlkvUBT6ENVhipi5bb
|
||||
# 2pF/Awob8AYWbIn4N7gmIP5Sb0tugpEgrSgSyDdZNWoFDChvfHXcNUP8lblIftAl
|
||||
# ylssbnQ=
|
||||
# -----END CERTIFICATE-----
|
||||
#
|
||||
# SSLCertificateKeyFile_content: |
|
||||
# -----BEGIN RSA PRIVATE KEY-----
|
||||
# MIIEowIBAAKCAQEA0pdKi6Jfv290fVXHKTi3uQoNU39c7LQM1eU743I0ncrXcDAx
|
||||
# svSfGIthHDGdcDXTJL3+A5q/u9mWvqnhx3NGQPnyCaFfrU3Gy21f5ob9ItIu2ZXY
|
||||
# t0LryFQaS0dmebOZl2ewvMs/FaRfXp0JEt7jZ2zbmTU9xJRh5pQI9ch7IdCvk272
|
||||
# a8oBZBtML2MIr4ZbdWXG6LYeCyfoAcDSHUiVIgGufFTuWTXnpzPQ6riX2VXBXNWw
|
||||
# xas1NE/SmOD7MZsztQNvpkwx6BkeJws+wfuRHOFEsgVLiqNhYQCwRLWM9oZcGn/V
|
||||
# 2rEkr5szuYYTwkN5yeKnmIvgSwkqYqtpQKT1WQIDAQABAoIBAQCI39SP1UWuQ17P
|
||||
# Z8U+waKIHkRzFMDtCEmfbJL0TfJs7L4CKRDkY6JUbaL8lDLkD9fgdax340jja5VS
|
||||
# 70/UNtRevxXVtJFfLsIazkgaqXo1+65/talZ06E0X5WHgCzWxSj7A2YYD3I9OszR
|
||||
# zfdr0Hq1akeA2N4AuwC2wVjhhyCg5Lg4xY0l+kRFLrPU4RctsjCAaveVIm3wmJVd
|
||||
# vmHO9hKcR3nxuIx0/cPYe20WgGSqbYJQburE1uXp26uz/Jek/u8FNFIEjWCWB+vj
|
||||
# eRQOcxngebyWCh0dyoxb3nL28Yty9O1MlLP2b0YMmep1ZfEFtwn4M2d8FdW1WCmJ
|
||||
# viOGFx4BAoGBAPTYSIpyxea1qaeNmT97e4YgPwV3rajhdPRYSQKyCsjKHk7Q/uxk
|
||||
# Phddo0ymiGKLCRAUwg9py900slY8mZKbdrVxXV4EEhngrWrr2gpfzxkEF1i0d4bS
|
||||
# 2OuRCbkfE23glxqtVjvnTlrRANaXgk5mUQCL1YDUf+hrpEvF0pTbDRYpAoGBANwv
|
||||
# ffy+Sk+e0v+NlthhNHUDcXisIoW7b/DoT0H8DtbJV/QVexaGln7Ts6EgaH2NdpC+
|
||||
# dyLKa+l7oIeKgXeHm2Tgm879di/ChQCkoAHIUu5Nm0c5D2Vst26JrfCA7vZb9ddI
|
||||
# FMFt5bsDgRqFzTXFe0k9TEIBiF0Pp5xfHVwNWeuxAoGAGNY3xZOO77BN3WlHumDU
|
||||
# Tu7Gdc+GFjOIoaCzB0r4PRYDrQsWUPR6N/SPtB7Qhu6DpNX2OYoJ3A6UaJsNGQoc
|
||||
# KJuvVPIkw+s+rDHwlEzTvT3lAGKOHWcWCg9UZSr51ZOKwHIE5V65XA0HgL0twrYu
|
||||
# UVfd+IuVzgXdTLJsgh0WXsECgYApcgcU+/yg4BR3Zf9u2100aWGChWQ6J/36KsBA
|
||||
# e2GPrHaRyzlQFCVf2hmFysPgXjBjLnbeZZvKZyrgWIHmLfBiHKU3YR5N/x9p75Lu
|
||||
# wvZZROJllagAP2aHuAK1so9IcCbmTvsZLcaAXTh/9Y+a/4ElWBRymDdCzR+Pn5e3
|
||||
# LAwxAQKBgBHH42ri6pHbRptINzJ9sw3PhwewQZtGu3sfvrOknBs3togptCrjBWDF
|
||||
# eOGuFmjHO9vnhWs2yWQYETL1jt+CWgzRc4o4akB3qH5sXar5F7h06y16RFV9u6UJ
|
||||
# qaGqPFcy/l/5H6uNPLZt4Ufg3T0Mz0Az+Dti99KqVLKeqWQvXVc4
|
||||
# -----END RSA PRIVATE KEY-----
|
||||
#
|
||||
# SSLCertificateChainFile_content: |
|
||||
# -----BEGIN CERTIFICATE-----
|
||||
# MIICUTCCAfugAwIBAgIBADANBgkqhkiG9w0BAQQFADBXMQswCQYDVQQGEwJDTjEL
|
||||
# MAkGA1UECBMCUE4xCzAJBgNVBAcTAkNOMQswCQYDVQQKEwJPTjELMAkGA1UECxMC
|
||||
# VU4xFDASBgNVBAMTC0hlcm9uZyBZYW5nMB4XDTA1MDcxNTIxMTk0N1oXDTA1MDgx
|
||||
# NDIxMTk0N1owVzELMAkGA1UEBhMCQ04xCzAJBgNVBAgTAlBOMQswCQYDVQQHEwJD
|
||||
# TjELMAkGA1UEChMCT04xCzAJBgNVBAsTAlVOMRQwEgYDVQQDEwtIZXJvbmcgWWFu
|
||||
# ZzBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQCp5hnG7ogBhtlynpOS21cBewKE/B7j
|
||||
# V14qeyslnr26xZUsSVko36ZnhiaO/zbMOoRcKK9vEcgMtcLFuQTWDl3RAgMBAAGj
|
||||
# gbEwga4wHQYDVR0OBBYEFFXI70krXeQDxZgbaCQoR4jUDncEMH8GA1UdIwR4MHaA
|
||||
# FFXI70krXeQDxZgbaCQoR4jUDncEoVukWTBXMQswCQYDVQQGEwJDTjELMAkGA1UE
|
||||
# CBMCUE4xCzAJBgNVBAcTAkNOMQswCQYDVQQKEwJPTjELMAkGA1UECxMCVU4xFDAS
|
||||
# BgNVBAMTC0hlcm9uZyBZYW5nggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEE
|
||||
# BQADQQA/ugzBrjjK9jcWnDVfGHlk3icNRq0oV7Ri32z/+HQX67aRfgZu7KWdI+Ju
|
||||
# Wm7DCfrPNGVwFWUQOmsPue9rZBgO
|
||||
# -----END CERTIFICATE-----
|
||||
# -----BEGIN CERTIFICATE-----
|
||||
# MIICUTCCAfugAwIBAgIBADANBgkqhkiG9w0BAQQFADBXMQswCQYDVQQGEwJDTjEL
|
||||
# MAkGA1UECBMCUE4xCzAJBgNVBAcTAkNOMQswCQYDVQQKEwJPTjELMAkGA1UECxMC
|
||||
# VU4xFDASBgNVBAMTC0hlcm9uZyBZYW5nMB4XDTA1MDcxNTIxMTk0N1oXDTA1MDgx
|
||||
# NDIxMTk0N1owVzELMAkGA1UEBhMCQ04xCzAJBgNVBAgTAlBOMQswCQYDVQQHEwJD
|
||||
# TjELMAkGA1UEChMCT04xCzAJBgNVBAsTAlVOMRQwEgYDVQQDEwtIZXJvbmcgWWFu
|
||||
# ZzBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQCp5hnG7ogBhtlynpOS21cBewKE/B7j
|
||||
# V14qeyslnr26xZUsSVko36ZnhiaO/zbMOoRcKK9vEcgMtcLFuQTWDl3RAgMBAAGj
|
||||
# gbEwga4wHQYDVR0OBBYEFFXI70krXeQDxZgbaCQoR4jUDncEMH8GA1UdIwR4MHaA
|
||||
# FFXI70krXeQDxZgbaCQoR4jUDncEoVukWTBXMQswCQYDVQQGEwJDTjELMAkGA1UE
|
||||
# CBMCUE4xCzAJBgNVBAcTAkNOMQswCQYDVQQKEwJPTjELMAkGA1UECxMCVU4xFDAS
|
||||
# BgNVBAMTC0hlcm9uZyBZYW5nggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEE
|
||||
# BQADQQA/ugzBrjjK9jcWnDVfGHlk3icNRq0oV7Ri32z/+HQX67aRfgZu7KWdI+Ju
|
||||
# Wm7DCfrPNGVwFWUQOmsPue9rZBgO
|
||||
# -----END CERTIFICATE-----
|
||||
#
|
||||
# ProxyRequests: 'Off'
|
||||
# ProxyPreserveHost: 'On'
|
||||
#
|
||||
# ProxyRoute:
|
||||
# example prod proxy route:
|
||||
# ProxyPassSource: '/'
|
||||
# ProxyPassTarget: 'http://prod.example.com:85/'
|
||||
# ProxyPassTargetOptions: 'connectiontimeout=10 timeout=90'
|
||||
# ProxyPassReverseSource: '/'
|
||||
# ProxyPassReverseTarget: 'http://prod.example.com:85/'
|
||||
#
|
||||
# example webmail proxy route:
|
||||
# ProxyPassSource: '/webmail/'
|
||||
# ProxyPassTarget: 'http://mail.example.com/'
|
||||
# ProxyPassTargetOptions: 'connectiontimeout=10 timeout=90'
|
||||
# ProxyPassReverseSource: '/webmail/'
|
||||
# ProxyPassReverseTarget: 'http://mail.example.com/'
|
||||
#
|
||||
# example service proxy route:
|
||||
# ProxyPassSource: '/svc/'
|
||||
# ProxyPassTarget: 'http://svc.example.com:92/'
|
||||
# ProxyPassTargetOptions: 'connectiontimeout=10 timeout=90'
|
||||
# ProxyPassReverseSource: '/svc/'
|
||||
# ProxyPassReverseTarget: 'http://svc.example.com:92/'
|
||||
#
|
||||
# Location:
|
||||
# /:
|
||||
# Require: false
|
||||
# # Formula_Append: |
|
||||
# # SecRuleRemoveById 981231
|
||||
# # SecRuleRemoveById 981173
|
||||
#
|
||||
# /error:
|
||||
# Require: 'all granted'
|
||||
#
|
||||
# /docs:
|
||||
# Order: allow,deny # For Apache < 2.4
|
||||
# Allow: from all # For apache < 2.4
|
||||
# Require: all granted # For apache > 2.4.
|
||||
# # Formula_Append: |
|
||||
# # Additional config as a
|
||||
# # multi-line string here
|
||||
#
|
||||
# LocationMatch:
|
||||
# '^[.\\/]+([Ww][Ee][Bb][Mm][Aa][Ii][Ll])[.\\/]':
|
||||
# Require: false
|
||||
# Formula_Append: |
|
||||
# RequestHeader set Host mail.example.com
|
||||
#
|
||||
# '^[.\\/]+([Ss][Vv][Cc])[.\\/]':
|
||||
# Require: false
|
||||
# Formula_Append: |
|
||||
# Require ip 123.123.13.6 84.24.25.74
|
||||
#
|
||||
# Proxy_control:
|
||||
# '*':
|
||||
# AllowAll: false
|
||||
# AllowCountry: false
|
||||
# # - DE
|
||||
# AllowIP:
|
||||
# - 12.5.25.32
|
||||
# - 12.5.25.33
|
||||
#
|
||||
# Alias:
|
||||
# /docs: /usr/share/docs
|
||||
#
|
||||
# ScriptAlias:
|
||||
# /cgi-bin/: /var/www/cgi-bin/
|
||||
8443-proxyexample.com:
|
||||
template_file: salt://apache/config/vhosts/proxy.tmpl
|
||||
ServerName: www.proxyexample.com
|
||||
ServerAlias: www.proxyexample.com
|
||||
interface: '*'
|
||||
port: '8443'
|
||||
DocumentRoot: /var/www/proxy
|
||||
|
||||
Rewrite: |
|
||||
RewriteRule ^/webmail$ /webmail/ [R]
|
||||
RewriteRule ^/webmail(.*) http://mail.example.com$1 [P,L]
|
||||
RewriteRule ^/vicescws(.*) http://svc.example.com:92$1 [P,L]
|
||||
|
||||
SSLCertificateFile: /etc/httpd/conf/server.crt
|
||||
SSLCertificateKeyFile: /etc/httpd/conf/server.key
|
||||
# SSLCertificateChainFile: /etc/httpd/ssl/example.com.cer
|
||||
|
||||
SSLCertificateFile_content: |
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIDYTCCAkkCFCKCcuwB/Ze9bI5/75oRChNH8RzHMA0GCSqGSIb3DQEBCwUAMG0x
|
||||
CzAJBgNVBAYTAklFMREwDwYDVQQIDAhDb25uYWNodDESMBAGA1UEBwwJQ29ubWFp
|
||||
Y25lMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxFDASBgNVBAMM
|
||||
C2V4YW1wbGUuY29tMB4XDTIwMTAwMzEzMzI1N1oXDTIxMTAwMzEzMzI1N1owbTEL
|
||||
MAkGA1UEBhMCSUUxETAPBgNVBAgMCENvbm5hY2h0MRIwEAYDVQQHDAlDb25tYWlj
|
||||
bmUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEUMBIGA1UEAwwL
|
||||
ZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSl0qL
|
||||
ol+/b3R9VccpOLe5Cg1Tf1zstAzV5TvjcjSdytdwMDGy9J8Yi2EcMZ1wNdMkvf4D
|
||||
mr+72Za+qeHHc0ZA+fIJoV+tTcbLbV/mhv0i0i7Zldi3QuvIVBpLR2Z5s5mXZ7C8
|
||||
yz8VpF9enQkS3uNnbNuZNT3ElGHmlAj1yHsh0K+TbvZrygFkG0wvYwivhlt1Zcbo
|
||||
th4LJ+gBwNIdSJUiAa58VO5ZNeenM9DquJfZVcFc1bDFqzU0T9KY4PsxmzO1A2+m
|
||||
TDHoGR4nCz7B+5Ec4USyBUuKo2FhALBEtYz2hlwaf9XasSSvmzO5hhPCQ3nJ4qeY
|
||||
i+BLCSpiq2lApPVZAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAD9/78A4ygQWbO27
|
||||
jQPm+2Zg0f9Sn1tcD4tOVao0MlAfWrALjbmj82hg+givEQKAuN7ptthYoaJcOxHl
|
||||
aUe++y3bQiCznN73yKSJZFgG5fYR8tyMslsYRBcKSay0nvPhN/3Jry0nNehDREQ+
|
||||
2H0vB595bymGNTmux13sNwOZH1i8KEgxdLcFbje87+CbhCGbFhS3lHPY2FeXnHpO
|
||||
W60Zchwsy06xMjo4rzbQatdJj/HAh6lIx0YmNDX/d3dCLpZlkvUBT6ENVhipi5bb
|
||||
2pF/Awob8AYWbIn4N7gmIP5Sb0tugpEgrSgSyDdZNWoFDChvfHXcNUP8lblIftAl
|
||||
ylssbnQ=
|
||||
-----END CERTIFICATE-----
|
||||
|
||||
SSLCertificateKeyFile_content: |
|
||||
-----BEGIN RSA PRIVATE KEY-----
|
||||
MIIEowIBAAKCAQEA0pdKi6Jfv290fVXHKTi3uQoNU39c7LQM1eU743I0ncrXcDAx
|
||||
svSfGIthHDGdcDXTJL3+A5q/u9mWvqnhx3NGQPnyCaFfrU3Gy21f5ob9ItIu2ZXY
|
||||
t0LryFQaS0dmebOZl2ewvMs/FaRfXp0JEt7jZ2zbmTU9xJRh5pQI9ch7IdCvk272
|
||||
a8oBZBtML2MIr4ZbdWXG6LYeCyfoAcDSHUiVIgGufFTuWTXnpzPQ6riX2VXBXNWw
|
||||
xas1NE/SmOD7MZsztQNvpkwx6BkeJws+wfuRHOFEsgVLiqNhYQCwRLWM9oZcGn/V
|
||||
2rEkr5szuYYTwkN5yeKnmIvgSwkqYqtpQKT1WQIDAQABAoIBAQCI39SP1UWuQ17P
|
||||
Z8U+waKIHkRzFMDtCEmfbJL0TfJs7L4CKRDkY6JUbaL8lDLkD9fgdax340jja5VS
|
||||
70/UNtRevxXVtJFfLsIazkgaqXo1+65/talZ06E0X5WHgCzWxSj7A2YYD3I9OszR
|
||||
zfdr0Hq1akeA2N4AuwC2wVjhhyCg5Lg4xY0l+kRFLrPU4RctsjCAaveVIm3wmJVd
|
||||
vmHO9hKcR3nxuIx0/cPYe20WgGSqbYJQburE1uXp26uz/Jek/u8FNFIEjWCWB+vj
|
||||
eRQOcxngebyWCh0dyoxb3nL28Yty9O1MlLP2b0YMmep1ZfEFtwn4M2d8FdW1WCmJ
|
||||
viOGFx4BAoGBAPTYSIpyxea1qaeNmT97e4YgPwV3rajhdPRYSQKyCsjKHk7Q/uxk
|
||||
Phddo0ymiGKLCRAUwg9py900slY8mZKbdrVxXV4EEhngrWrr2gpfzxkEF1i0d4bS
|
||||
2OuRCbkfE23glxqtVjvnTlrRANaXgk5mUQCL1YDUf+hrpEvF0pTbDRYpAoGBANwv
|
||||
ffy+Sk+e0v+NlthhNHUDcXisIoW7b/DoT0H8DtbJV/QVexaGln7Ts6EgaH2NdpC+
|
||||
dyLKa+l7oIeKgXeHm2Tgm879di/ChQCkoAHIUu5Nm0c5D2Vst26JrfCA7vZb9ddI
|
||||
FMFt5bsDgRqFzTXFe0k9TEIBiF0Pp5xfHVwNWeuxAoGAGNY3xZOO77BN3WlHumDU
|
||||
Tu7Gdc+GFjOIoaCzB0r4PRYDrQsWUPR6N/SPtB7Qhu6DpNX2OYoJ3A6UaJsNGQoc
|
||||
KJuvVPIkw+s+rDHwlEzTvT3lAGKOHWcWCg9UZSr51ZOKwHIE5V65XA0HgL0twrYu
|
||||
UVfd+IuVzgXdTLJsgh0WXsECgYApcgcU+/yg4BR3Zf9u2100aWGChWQ6J/36KsBA
|
||||
e2GPrHaRyzlQFCVf2hmFysPgXjBjLnbeZZvKZyrgWIHmLfBiHKU3YR5N/x9p75Lu
|
||||
wvZZROJllagAP2aHuAK1so9IcCbmTvsZLcaAXTh/9Y+a/4ElWBRymDdCzR+Pn5e3
|
||||
LAwxAQKBgBHH42ri6pHbRptINzJ9sw3PhwewQZtGu3sfvrOknBs3togptCrjBWDF
|
||||
eOGuFmjHO9vnhWs2yWQYETL1jt+CWgzRc4o4akB3qH5sXar5F7h06y16RFV9u6UJ
|
||||
qaGqPFcy/l/5H6uNPLZt4Ufg3T0Mz0Az+Dti99KqVLKeqWQvXVc4
|
||||
-----END RSA PRIVATE KEY-----
|
||||
|
||||
SSLCertificateChainFile_content: |
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIICUTCCAfugAwIBAgIBADANBgkqhkiG9w0BAQQFADBXMQswCQYDVQQGEwJDTjEL
|
||||
MAkGA1UECBMCUE4xCzAJBgNVBAcTAkNOMQswCQYDVQQKEwJPTjELMAkGA1UECxMC
|
||||
VU4xFDASBgNVBAMTC0hlcm9uZyBZYW5nMB4XDTA1MDcxNTIxMTk0N1oXDTA1MDgx
|
||||
NDIxMTk0N1owVzELMAkGA1UEBhMCQ04xCzAJBgNVBAgTAlBOMQswCQYDVQQHEwJD
|
||||
TjELMAkGA1UEChMCT04xCzAJBgNVBAsTAlVOMRQwEgYDVQQDEwtIZXJvbmcgWWFu
|
||||
ZzBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQCp5hnG7ogBhtlynpOS21cBewKE/B7j
|
||||
V14qeyslnr26xZUsSVko36ZnhiaO/zbMOoRcKK9vEcgMtcLFuQTWDl3RAgMBAAGj
|
||||
gbEwga4wHQYDVR0OBBYEFFXI70krXeQDxZgbaCQoR4jUDncEMH8GA1UdIwR4MHaA
|
||||
FFXI70krXeQDxZgbaCQoR4jUDncEoVukWTBXMQswCQYDVQQGEwJDTjELMAkGA1UE
|
||||
CBMCUE4xCzAJBgNVBAcTAkNOMQswCQYDVQQKEwJPTjELMAkGA1UECxMCVU4xFDAS
|
||||
BgNVBAMTC0hlcm9uZyBZYW5nggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEE
|
||||
BQADQQA/ugzBrjjK9jcWnDVfGHlk3icNRq0oV7Ri32z/+HQX67aRfgZu7KWdI+Ju
|
||||
Wm7DCfrPNGVwFWUQOmsPue9rZBgO
|
||||
-----END CERTIFICATE-----
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIICUTCCAfugAwIBAgIBADANBgkqhkiG9w0BAQQFADBXMQswCQYDVQQGEwJDTjEL
|
||||
MAkGA1UECBMCUE4xCzAJBgNVBAcTAkNOMQswCQYDVQQKEwJPTjELMAkGA1UECxMC
|
||||
VU4xFDASBgNVBAMTC0hlcm9uZyBZYW5nMB4XDTA1MDcxNTIxMTk0N1oXDTA1MDgx
|
||||
NDIxMTk0N1owVzELMAkGA1UEBhMCQ04xCzAJBgNVBAgTAlBOMQswCQYDVQQHEwJD
|
||||
TjELMAkGA1UEChMCT04xCzAJBgNVBAsTAlVOMRQwEgYDVQQDEwtIZXJvbmcgWWFu
|
||||
ZzBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQCp5hnG7ogBhtlynpOS21cBewKE/B7j
|
||||
V14qeyslnr26xZUsSVko36ZnhiaO/zbMOoRcKK9vEcgMtcLFuQTWDl3RAgMBAAGj
|
||||
gbEwga4wHQYDVR0OBBYEFFXI70krXeQDxZgbaCQoR4jUDncEMH8GA1UdIwR4MHaA
|
||||
FFXI70krXeQDxZgbaCQoR4jUDncEoVukWTBXMQswCQYDVQQGEwJDTjELMAkGA1UE
|
||||
CBMCUE4xCzAJBgNVBAcTAkNOMQswCQYDVQQKEwJPTjELMAkGA1UECxMCVU4xFDAS
|
||||
BgNVBAMTC0hlcm9uZyBZYW5nggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEE
|
||||
BQADQQA/ugzBrjjK9jcWnDVfGHlk3icNRq0oV7Ri32z/+HQX67aRfgZu7KWdI+Ju
|
||||
Wm7DCfrPNGVwFWUQOmsPue9rZBgO
|
||||
-----END CERTIFICATE-----
|
||||
|
||||
ProxyRequests: 'Off'
|
||||
ProxyPreserveHost: 'On'
|
||||
|
||||
ProxyRoute:
|
||||
example prod proxy route:
|
||||
ProxyPassSource: '/'
|
||||
ProxyPassTarget: 'http://prod.example.com:85/'
|
||||
ProxyPassTargetOptions: 'connectiontimeout=10 timeout=90'
|
||||
ProxyPassReverseSource: '/'
|
||||
ProxyPassReverseTarget: 'http://prod.example.com:85/'
|
||||
|
||||
example webmail proxy route:
|
||||
ProxyPassSource: '/webmail/'
|
||||
ProxyPassTarget: 'http://mail.example.com/'
|
||||
ProxyPassTargetOptions: 'connectiontimeout=10 timeout=90'
|
||||
ProxyPassReverseSource: '/webmail/'
|
||||
ProxyPassReverseTarget: 'http://mail.example.com/'
|
||||
|
||||
example service proxy route:
|
||||
ProxyPassSource: '/svc/'
|
||||
ProxyPassTarget: 'http://svc.example.com:92/'
|
||||
ProxyPassTargetOptions: 'connectiontimeout=10 timeout=90'
|
||||
ProxyPassReverseSource: '/svc/'
|
||||
ProxyPassReverseTarget: 'http://svc.example.com:92/'
|
||||
|
||||
Location:
|
||||
/:
|
||||
Require: false
|
||||
# Formula_Append: |
|
||||
# SecRuleRemoveById 981231
|
||||
# SecRuleRemoveById 981173
|
||||
|
||||
/error:
|
||||
Require: 'all granted'
|
||||
|
||||
/docs:
|
||||
Order: allow,deny # For Apache < 2.4
|
||||
Allow: from all # For apache < 2.4
|
||||
Require: all granted # For apache > 2.4.
|
||||
# Formula_Append: |
|
||||
# Additional config as a
|
||||
# multi-line string here
|
||||
|
||||
LocationMatch:
|
||||
'^[.\\/]+([Ww][Ee][Bb][Mm][Aa][Ii][Ll])[.\\/]':
|
||||
Require: false
|
||||
Formula_Append: |
|
||||
RequestHeader set Host mail.example.com
|
||||
|
||||
'^[.\\/]+([Ss][Vv][Cc])[.\\/]':
|
||||
Require: false
|
||||
Formula_Append: |
|
||||
Require ip 123.123.13.6 84.24.25.74
|
||||
|
||||
Proxy_control:
|
||||
'*':
|
||||
AllowAll: false
|
||||
AllowCountry: false
|
||||
# - DE
|
||||
AllowIP:
|
||||
- 12.5.25.32
|
||||
- 12.5.25.33
|
||||
|
||||
Alias:
|
||||
/docs: /usr/share/docs
|
||||
|
||||
ScriptAlias:
|
||||
/cgi-bin/: /var/www/cgi-bin/
|
||||
|
||||
# Formula_Append: |
|
||||
# \#Additional config as a
|
||||
@ -391,7 +391,7 @@ apache:
|
||||
modules:
|
||||
enabled: # List modules to enable
|
||||
- ssl
|
||||
# - prefork
|
||||
- prefork
|
||||
- rewrite
|
||||
- proxy
|
||||
- proxy_ajp
|
||||
@ -399,13 +399,13 @@ apache:
|
||||
- headers
|
||||
# geoip
|
||||
- status
|
||||
# - logio
|
||||
- logio
|
||||
- dav
|
||||
- dav_fs
|
||||
- dav_lock
|
||||
- auth_digest
|
||||
- socache_shmcb
|
||||
# - watchdog
|
||||
- watchdog
|
||||
- xml2enc
|
||||
- ldap
|
||||
disabled: # List modules to disable
|
||||
@ -464,7 +464,7 @@ apache:
|
||||
sec_debug_log_level: '3'
|
||||
|
||||
rules:
|
||||
# enabled: ~
|
||||
enabled: ~
|
||||
modsecurity_crs_10_setup.conf:
|
||||
rule_set: ''
|
||||
enabled: true
|
||||
@ -542,10 +542,3 @@ apache:
|
||||
# Just for testing purposes
|
||||
winner: pillar
|
||||
added_in_pillar: pillar_value
|
||||
|
||||
retry_option:
|
||||
# https://docs.saltstack.com/en/latest/ref/states/requisites.html#retrying-states
|
||||
attempts: 1
|
||||
until: true
|
||||
interval: 1
|
||||
splay: 1
|
||||
|
||||
@ -28,3 +28,91 @@ sed -i -e '1,4s/-/=/g' CHANGELOG.rst
|
||||
|
||||
# Return back to the main directory
|
||||
cd ..
|
||||
|
||||
|
||||
###############################################################################
|
||||
# (C) Make all adjustments related to the Antora-based documentation
|
||||
# This needs to run after the conversion to `.rst` since it uses
|
||||
# those files to convert to `.adoc`
|
||||
###############################################################################
|
||||
|
||||
# Update `docs/antora.yml` with `${nextRelease.version}`
|
||||
sed -i -e "/^\(version: '\).*\('\)$/s//\1${1}\2/" docs/antora.yml
|
||||
|
||||
# Convert the files from `.rst` to `.adoc` using `pandoc`
|
||||
FROM=rst && FN=CHANGELOG && pandoc -t asciidoc -f ${FROM} -o docs/modules/ROOT/pages/${FN}.adoc docs/${FN}.${FROM}
|
||||
FROM=rst && FN=AUTHORS && pandoc -t asciidoc -f ${FROM} -o docs/modules/ROOT/pages/${FN}.adoc docs/${FN}.${FROM}
|
||||
FROM=rst && FN=README && pandoc -t asciidoc -f ${FROM} -o docs/modules/ROOT/pages/${FN}.adoc docs/${FN}.${FROM}
|
||||
|
||||
# Adjust `CHANGELOG.adoc`
|
||||
ADOC="docs/modules/ROOT/pages/CHANGELOG.adoc"
|
||||
# Fix links to avoid issue with `...` in URL
|
||||
# Also ensure each of these links opens in a new tab
|
||||
sed -i -e '/^\(=== \)\(https.*\)\(\[.*\)\(]\)/s//\1link:++\2++\3^\4/' "${ADOC}"
|
||||
# Open other standard links in new tabs
|
||||
sed -i -e '/^\((https.*\)\(]\)/s//\1^\2/' "${ADOC}"
|
||||
sed -i -e '/^\(https.*\)\(]\)/s//\1^\2/' "${ADOC}"
|
||||
# And other non-standard links
|
||||
# shellcheck disable=SC2016
|
||||
sed -i -e '\_^\((https.*/commit/\)\(.......\)\()\)$_s__\1\2[\2^]\3_' "${ADOC}"
|
||||
# Fix headings throughout file
|
||||
sed -i -e '/^=/s///' "${ADOC}"
|
||||
# Fix `[skip ci]` on line by itself
|
||||
sed -i -e '/^\[skip ci]$/s// &/' "${ADOC}"
|
||||
# Fix what looks like Asciidoctor variables, i.e. in curly braces `{...}`
|
||||
sed -i -e '/{\w\+}/s//\\&/' "${ADOC}"
|
||||
# Add `:sectnums!:` directly after the title (the blank line in-between is necessary)
|
||||
sed -i -e '2 i \\n:sectnums!:' "${ADOC}"
|
||||
|
||||
# Adjust `AUTHORS.adoc`
|
||||
ADOC="docs/modules/ROOT/pages/AUTHORS.adoc"
|
||||
# Fix the heading
|
||||
sed -i -e '/^=/s///' "${ADOC}"
|
||||
# Run three times to get all four lines joined
|
||||
# (most entries only need two joins but that's dealt with below)
|
||||
sed -i -e '/^|:raw-html-m2r/N;s/\n/ /' "${ADOC}"
|
||||
sed -i -e '/^|:raw-html-m2r/N;s/\n/ /' "${ADOC}"
|
||||
sed -i -e '/^|:raw-html-m2r/N;s/\n/ /' "${ADOC}"
|
||||
# Add blank line in-between
|
||||
sed -i -e '/^|:raw-html-m2r/{G;}' "${ADOC}"
|
||||
# Clear up any double-blank lines introduced
|
||||
sed -i -e '/^$/N;/\n$/D' "${ADOC}"
|
||||
# Split the lines again on the table delimeter
|
||||
sed -i -e '/^|:raw-html-m2r/s/ |/\n|/g' "${ADOC}"
|
||||
# Fix the `raw-html-m2r` to link to the GitHub avatar images correctly
|
||||
sed -i -e "/^\(|\):raw-html-m2r.*src='\(.*\)' width='\(.*\)' height='\(.*\)' alt='\(.*\)'.*/s//\1image::\2[\5,\3,\4]/" "${ADOC}"
|
||||
# Reduce the table boundary markers
|
||||
sed -i -e '/^|===.*/s//|===/' "${ADOC}"
|
||||
# Reduce the table boundary markers
|
||||
sed -i -e '/^|Avatar |Contributor |Contributions/s//^.^|Avatar\n<.^|Contributor\n^.^|Contributions\n/' "${ADOC}"
|
||||
# Fix the table heading
|
||||
sed -i -e '/^\[cols=".*/s//.List of contributors\n[format="psv", separator="|", options="header", cols="^.<30a,<.<40a,^.<40d", width="100"]/' "${ADOC}"
|
||||
# Open links in new tab
|
||||
sed -i -e '/^\(|https.*\)\(]\)/s//\1^\2/' "${ADOC}"
|
||||
# Likewise for footer links
|
||||
sed -i -e '/\(\[forked version\)\(]\)/s//\1^\2/' "${ADOC}"
|
||||
sed -i -e '/\(\[.*maintainer\)\(]\)/s//\1^\2/' "${ADOC}"
|
||||
|
||||
# Adjust `README.adoc`
|
||||
ADOC="docs/modules/ROOT/pages/README.adoc"
|
||||
# Fix headings throughout file
|
||||
sed -i -e '/^=/s///' "${ADOC}"
|
||||
# Delete the `[[readme]]` line
|
||||
sed -i -e '/^\[\[readme]]$/d' "${ADOC}"
|
||||
# Remove the `Table of Contents` line and the blank line after it
|
||||
sed -i -e '/^\*Table of Contents\*$/,+1d' "${ADOC}"
|
||||
# Fix the link to `CONTRIBUTING.adoc` (to the Antora-based version)
|
||||
# shellcheck disable=SC2016
|
||||
sed -i -e '/^Please see `How to contribute <CONTRIBUTING>` for more details.$/s//Please see\nxref:main::CONTRIBUTING.adoc[How to contribute]\nfor more details./' "${ADOC}"
|
||||
# Fix the link to `CONTRIBUTING.adoc` (to the Antora-based version) -- based on `.github` repo
|
||||
sed -i -e '\_https://github.com/saltstack-formulas/.github/blob/master/CONTRIBUTING.rst_s__xref:main::CONTRIBUTING.adoc_' "${ADOC}"
|
||||
# Fix the link to `map.jinja.adoc` (to the Antora-based version)
|
||||
sed -i -e '/^\* link:map.jinja.rst/s//* xref:main::map.jinja.adoc/' "${ADOC}"
|
||||
# Fix link: `#_special_notes`
|
||||
sed -i -e '/#special-notes/s//#_special_notes/' "${ADOC}"
|
||||
# Fix `sourceCode`
|
||||
sed -i -e '/^\(\[source,\)sourceCode,/s//\1/' "${ADOC}"
|
||||
# Fix source `jinja2`
|
||||
sed -i -e '/^\(\[source,jinja\)2/s//\1/' "${ADOC}"
|
||||
# Fix source `sls`
|
||||
sed -i -e '/^\(\[source,\)sls/s//\1yaml/' "${ADOC}"
|
||||
|
||||
@ -15,7 +15,7 @@ module.exports = {
|
||||
prepareCmd: 'sh ./pre-commit_semantic-release.sh ${nextRelease.version}',
|
||||
}],
|
||||
['@semantic-release/git', {
|
||||
assets: ['*.md', 'docs/*.rst', 'FORMULA'],
|
||||
assets: ['*.md', 'docs/*.rst', 'FORMULA', 'docs/antora.yml', 'docs/modules/ROOT/pages/*.adoc'],
|
||||
}],
|
||||
'@semantic-release/github',
|
||||
],
|
||||
|
||||
Loading…
Reference in New Issue
Block a user