Commit 8dba00f9 by Martin Fitzpatrick Committed by Fred Smith

Remove unused handler, fixed symlink syntax, fix to lms.yml

Fixed the the comments from review. Also noted that the
include in `lms.yml` was in the wrong place (outside the
server block), fixed.
parent 797bd1e5
---
- name: reload nginx
service:
name: nginx
state: reloaded
...@@ -112,10 +112,10 @@ ...@@ -112,10 +112,10 @@
# certs they are shared: symlink only required to the first # certs they are shared: symlink only required to the first
- name: symlink certificates - name: symlink certificates
file: > file:
src=/etc/letsencrypt/live/{{ LETS_ENCRYPT_DOMAINS|first }}/{{ item.src }} src: /etc/letsencrypt/live/{{ LETS_ENCRYPT_DOMAINS|first }}/{{ item.src }}
dest=/etc/ssl/{{ item.dest }} dest: /etc/ssl/{{ item.dest }}
state=link state: link
with_items: with_items:
- { src: 'fullchain.pem', dest: 'certs/fullchain.pem' } - { src: 'fullchain.pem', dest: 'certs/fullchain.pem' }
- { src: 'privkey.pem', dest: 'private/privkey.pem' } - { src: 'privkey.pem', dest: 'private/privkey.pem' }
......
...@@ -104,7 +104,7 @@ error_page {{ k }} {{ v }}; ...@@ -104,7 +104,7 @@ error_page {{ k }} {{ v }};
proxy_pass http://cms-backend; proxy_pass http://cms-backend;
} }
{% include "lets_encrypt.j2" %} {% include "lets_encrypt.j2" %}
location / { location / {
{% if EDXAPP_CMS_ENABLE_BASIC_AUTH|bool %} {% if EDXAPP_CMS_ENABLE_BASIC_AUTH|bool %}
......
...@@ -27,8 +27,6 @@ limit_req_zone {{ "$limit_bot_" ~ agent.alias }} zone=agents:10m rate={{ agent.r ...@@ -27,8 +27,6 @@ limit_req_zone {{ "$limit_bot_" ~ agent.alias }} zone=agents:10m rate={{ agent.r
{%- endif %} {%- endif %}
{% include "lets_encrypt.j2" %}
{% if NGINX_EDXAPP_EMBARGO_CIDRS %} {% if NGINX_EDXAPP_EMBARGO_CIDRS %}
{%- if NGINX_SET_X_FORWARDED_HEADERS %} {%- if NGINX_SET_X_FORWARDED_HEADERS %}
...@@ -135,6 +133,8 @@ error_page {{ k }} {{ v }}; ...@@ -135,6 +133,8 @@ error_page {{ k }} {{ v }};
proxy_pass http://lms-backend; proxy_pass http://lms-backend;
} }
{% include "lets_encrypt.j2" %}
location / { location / {
{% if EDXAPP_LMS_ENABLE_BASIC_AUTH|bool %} {% if EDXAPP_LMS_ENABLE_BASIC_AUTH|bool %}
{% include "basic-auth.j2" %} {% include "basic-auth.j2" %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment