From d2f244b5b6142fc2f873b0d46694fefd2456b7fd Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Thu, 6 Jun 2019 11:33:04 -0500 Subject: [PATCH] PR #156 follow-up: Fix code linting issue. --- README.md | 2 +- defaults/main.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 0e44ba6..99bc1bd 100644 --- a/README.md +++ b/README.md @@ -151,7 +151,7 @@ Configures Nginx's [`log_format`](http://nginx.org/en/docs/http/ngx_http_log_mod nginx_service_state: started nginx_service_enabled: yes -The last task in the role configures the current state and the boot time state of the nginx service. Default settings start nginx and set it to startup at boot time. These can be overridden if installing in a container or further control over the service state is needed. +By default, this role will ensure Nginx is running and enabled at boot after Nginx is configured. You can use these variables to override this behavior if installing in a container or further control over the service state is required. ## Overriding configuration templates diff --git a/defaults/main.yml b/defaults/main.yml index 1cdef78..d5ac8d3 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -12,6 +12,9 @@ nginx_ppa_version: stable # The name of the nginx package to install. nginx_package_name: "nginx" +nginx_service_state: started +nginx_service_enabled: true + nginx_conf_template: "nginx.conf.j2" nginx_vhost_template: "vhost.j2" @@ -84,6 +87,3 @@ nginx_log_format: | '$remote_addr - $remote_user [$time_local] "$request" ' '$status $body_bytes_sent "$http_referer" ' '"$http_user_agent" "$http_x_forwarded_for"' - -nginx_service_state: started -nginx_service_enabled: yes