Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

copr-be: fix bug in loop, second attempt

Browse source 
Don't ask for 'devel' instance, but rather for 'letsencrypt'
configuration.
This commit is contained in:
Pavel Raiskup 2021-01-22 17:03:33 +01:00
parent a1f67eb0bf
commit 8c079d8cc3
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
roles/copr/backend/templates/lighttpd/lighttpd.conf
View file

@ -467,7 +467,7 @@ server.upload-dirs = ( "/var/tmp" )
# we need to have this twice, once for IPv4 and once for IPv6, see: # we need to have this twice, once for IPv4 and once for IPv6, see:
# https://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config#Recommended-IPv6-setup # https://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config#Recommended-IPv6-setup
{% if not devel %} {% if letsencrypt is not defined %}
# production still uses normal configuration # production still uses normal configuration
$SERVER["socket"] == "{{ https_bind }}" { $SERVER["socket"] == "{{ https_bind }}" {
ssl.engine = "enable" ssl.engine = "enable"
@ -482,10 +482,6 @@ $SERVER["socket"] == "{{ https_bind }}" {
# devel runs on letsencrypt # devel runs on letsencrypt
# Used for letsencrypt validation
$HTTP["url"] =~ "^/.well-known/" {
dir-listing.activate = "enable"
}
# Enable HTTPS # Enable HTTPS
$SERVER["socket"] == "{{ https_bind }}" { $SERVER["socket"] == "{{ https_bind }}" {
@ -504,6 +500,13 @@ $SERVER["socket"] == "{{ https_bind }}" {
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% if letsencrypt is defined %}
# Used for letsencrypt validation
$HTTP["url"] =~ "^/.well-known/" {
dir-listing.activate = "enable"
}
{% endif %}
url.redirect = ( "^/results/sgallagh/cockpit-preview/(.+)" => "/results/@cockpit/cockpit-preview/$1" ) url.redirect = ( "^/results/sgallagh/cockpit-preview/(.+)" => "/results/@cockpit/cockpit-preview/$1" )
url.redirect += ( "^/results/(.*)/(.*)/mageia-(.*)-i386(.*)" => "/results/$1/$2/mageia-$3-i586$4" ) url.redirect += ( "^/results/(.*)/(.*)/mageia-(.*)-i386(.*)" => "/results/$1/$2/mageia-$3-i586$4" )