From adda5d051773e183965dcc4acac1f591ecec01b6 Mon Sep 17 00:00:00 2001 From: Lorin Hochstein Date: Sun, 15 Feb 2015 13:37:46 -0500 Subject: [PATCH] ssl_enabled -> tls_enabled --- ch06/playbooks/mezzanine.yml | 6 +++--- ch06/playbooks/templates/nginx.conf.j2 | 4 ++-- ch08/playbooks/roles/mezzanine/defaults/main.yml | 2 +- ch08/playbooks/roles/mezzanine/tasks/django.yml | 2 +- ch08/playbooks/roles/mezzanine/tasks/nginx.yml | 2 +- ch08/playbooks/roles/mezzanine/templates/nginx.conf.j2 | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ch06/playbooks/mezzanine.yml b/ch06/playbooks/mezzanine.yml index 28fa283..cb0bfcb 100644 --- a/ch06/playbooks/mezzanine.yml +++ b/ch06/playbooks/mezzanine.yml @@ -20,7 +20,7 @@ # Variables below don't appear in Mezannine's fabfile.py # but I've added them for convenience conf_path: /etc/nginx/conf - ssl_enabled: True + tls_enabled: True python: "{{ venv_path }}/bin/python" database_name: "{{ proj_name }}" database_user: "{{ proj_name }}" @@ -122,7 +122,7 @@ - name: ensure config path exists file: path={{ conf_path }} state=directory sudo: True - when: ssl_enabled + when: tls_enabled - name: create ssl certificates command: > openssl req -new -x509 -nodes -out {{ proj_name }}.crt @@ -130,7 +130,7 @@ chdir={{ conf_path }} creates={{ conf_path }}/{{ proj_name }}.crt sudo: True - when: ssl_enabled + when: tls_enabled notify: restart nginx - name: install poll twitter cron job cron: name="poll twitter" minute="*/5" user={{ user }} job="{{ manage }} poll_twitter" diff --git a/ch06/playbooks/templates/nginx.conf.j2 b/ch06/playbooks/templates/nginx.conf.j2 index 0603417..d729654 100644 --- a/ch06/playbooks/templates/nginx.conf.j2 +++ b/ch06/playbooks/templates/nginx.conf.j2 @@ -6,14 +6,14 @@ server { listen 80; - {% if ssl_enabled %} + {% if tls_enabled %} listen 443 ssl; {% endif %} server_name {{ domains|join(", ") }}; client_max_body_size 10M; keepalive_timeout 15; - {% if ssl_enabled %} + {% if tls_enabled %} ssl_certificate conf/{{ proj_name }}.crt; ssl_certificate_key conf/{{ proj_name }}.key; ssl_session_cache shared:SSL:10m; diff --git a/ch08/playbooks/roles/mezzanine/defaults/main.yml b/ch08/playbooks/roles/mezzanine/defaults/main.yml index 3c86a1b..1de786e 100644 --- a/ch08/playbooks/roles/mezzanine/defaults/main.yml +++ b/ch08/playbooks/roles/mezzanine/defaults/main.yml @@ -1,2 +1,2 @@ --- -ssl_enabled: True +tls_enabled: True diff --git a/ch08/playbooks/roles/mezzanine/tasks/django.yml b/ch08/playbooks/roles/mezzanine/tasks/django.yml index 7cec415..bb17ba1 100644 --- a/ch08/playbooks/roles/mezzanine/tasks/django.yml +++ b/ch08/playbooks/roles/mezzanine/tasks/django.yml @@ -45,7 +45,7 @@ - name: ensure config path exists file: path={{ mezzanine_conf_path }} state=directory sudo: True - when: ssl_enabled + when: tls_enabled - name: install poll twitter cron job cron: > name="poll twitter" minute="*/5" user={{ mezzanine_user }} diff --git a/ch08/playbooks/roles/mezzanine/tasks/nginx.yml b/ch08/playbooks/roles/mezzanine/tasks/nginx.yml index 9e63f18..41482e8 100644 --- a/ch08/playbooks/roles/mezzanine/tasks/nginx.yml +++ b/ch08/playbooks/roles/mezzanine/tasks/nginx.yml @@ -20,5 +20,5 @@ chdir={{ mezzanine_conf_path }} creates={{ mezzanine_conf_path }}/{{ mezzanine_proj_name }}.crt sudo: True - when: ssl_enabled + when: tls_enabled notify: restart nginx diff --git a/ch08/playbooks/roles/mezzanine/templates/nginx.conf.j2 b/ch08/playbooks/roles/mezzanine/templates/nginx.conf.j2 index 9d12843..80accd4 100644 --- a/ch08/playbooks/roles/mezzanine/templates/nginx.conf.j2 +++ b/ch08/playbooks/roles/mezzanine/templates/nginx.conf.j2 @@ -6,14 +6,14 @@ server { listen 80; - {% if ssl_enabled %} + {% if tls_enabled %} listen 443 ssl; {% endif %} server_name {{ domains|join(", ") }}; client_max_body_size 10M; keepalive_timeout 15; - {% if ssl_enabled %} + {% if tls_enabled %} ssl_certificate conf/{{ mezzanine_proj_name }}.crt; ssl_certificate_key conf/{{ mezzanine_proj_name }}.key; ssl_session_cache shared:SSL:10m; -- 2.44.0