salt/ansible
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix accidentally breaking gitea lmao

Browse Source
This commit is contained in:
Salt 2020-06-22 05:24:58 -05:00
parent 124997992e
commit 56057012b5
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
roles/gitea/templates/apache2-vhost-ssl.conf
View File

@ -25,18 +25,6 @@ SSLProxyEngine on
AllowOverride All AllowOverride All
Options MultiViews FollowSymlinks Options MultiViews FollowSymlinks
</Directory> </Directory>
RequestHeader set X_FORWARDED_PROTO 'https'
RequestHeader set X-Forwarded-Ssl on
</VirtualHost>
<VirtualHost *:8448>
SSLEngine on
SSLCertificateFile /etc/pki/cert/crt/{{ gitea_url }}.crt
SSLCertificateKeyFile /etc/pki/cert/private/{{ gitea_url }}.key
SSLCertificateChainFile /etc/pki/cert/crt/{{ gitea_url }}-fullchain.crt
SSLProtocol {{ ssl_protocol }}
SSLCipherSuite {{ ssl_cipher_suite }}
ServerName {{ gitea_url }}
ProxyPreserveHost On ProxyPreserveHost On
ProxyRequests Off ProxyRequests Off
ProxyPass / http://127.0.0.1:3000/ nocanon retry=1 ProxyPass / http://127.0.0.1:3000/ nocanon retry=1

11
roles/matrix/templates/apache2-vhost-ssl.conf
View File

@ -25,6 +25,17 @@ SSLProxyEngine on
AllowOverride All AllowOverride All
Options MultiViews FollowSymlinks Options MultiViews FollowSymlinks
</Directory> </Directory>
RequestHeader set X_FORWARDED_PROTO 'https'
RequestHeader set X-Forwarded-Ssl on
</VirtualHost>
<VirtualHost *:8448>
SSLEngine on
SSLCertificateFile /etc/pki/cert/crt/{{ matrix_url }}.crt
SSLCertificateKeyFile /etc/pki/cert/private/{{ matrix_url }}.key
SSLCertificateChainFile /etc/pki/cert/crt/{{ matrix_url }}-fullchain.crt
SSLProtocol {{ ssl_protocol }}
SSLCipherSuite {{ ssl_cipher_suite }}
ServerName {{ matrix_url }}
ProxyPreserveHost On ProxyPreserveHost On
ProxyRequests Off ProxyRequests Off
ProxyPass / http://127.0.0.1:8008/ nocanon retry=1 ProxyPass / http://127.0.0.1:8008/ nocanon retry=1