Changeset 9fe61085 in darkpeak-services


Ignore:
Timestamp:
Jul 21, 2018, 3:20:38 PM (18 months ago)
Author:
Mat Booth <mat.booth@…>
Branches:
ansible, keycloak, master, matrix, pleroma
Children:
2e7d6b46
Parents:
7381d8ca
git-author:
Mat Booth <mat.booth@…> (07/21/18 15:20:02)
git-committer:
Mat Booth <mat.booth@…> (07/21/18 15:20:38)
Message:

Refs #7 - Allow well-known url on unencrypted port instead

File:
1 edited

Legend:

Unmodified
Added
Removed
  • roles/apache2/templates/apache.vhost.conf.j2

    r7381d8ca r9fe61085  
    33{% if service_name == 'default' %}
    44    ServerName {{ domain_name }}
    5     Redirect / https://{{ domain_name }}/
     5
     6    # Redirect all URLs except the Well-known URLs for certbot/letsencrypt
     7    AliasMatch "^/.well-known/acme-challenge/(.*)" "/usr/share/certbot/$1"
     8    RedirectMatch ^/((?!\.well-known/acme-challenge/).*)$ https://{{ domain_name }}/$1
    69{% else %}
    710    ServerName {{ domain }}
    8     Redirect permanent / https://{{ domain }}/
     11
     12    # Redirect all URLs except the Well-known URLs for certbot/letsencrypt
     13    AliasMatch "^/.well-known/acme-challenge/(.*)" "/usr/share/certbot/$1"
     14    RedirectMatch ^/((?!\.well-known/acme-challenge/).*)$ https://{{ domain }}/$1
    915{% endif %}
    1016</VirtualHost>
     
    131137                #               downgrade-1.0 force-response-1.0
    132138
    133                 # Well-known URLs for certbot/letsencrypt
    134                 AliasMatch "^/.well-known/acme-challenge/(.*)" "/usr/share/certbot/$1"
    135 
    136139                # Include service-specific site configuration
    137140                Include includes/{{ service_name }}.incl.conf
Note: See TracChangeset for help on using the changeset viewer.