diff --git a/defaults/main.yml b/defaults/main.yml index 73100c5..840c9b3 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" +# If the name of the service is not nginx, it can be customized +nginx_service_name: nginx + nginx_conf_template: "nginx.conf.j2" nginx_vhost_template: "vhost.j2" @@ -84,3 +87,6 @@ nginx_log_format: | '$remote_addr - $remote_user [$time_local] "$request" ' '$status $body_bytes_sent "$http_referer" ' '"$http_user_agent" "$http_x_forwarded_for"' + +# If one does not desire to include the OS-specific variables (vars/{{ ansible_os_family }}.yaml) +nginx_include_os_vars: true diff --git a/handlers/main.yml b/handlers/main.yml index 3f6d024..ff15363 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,10 +1,10 @@ --- - name: restart nginx - service: name=nginx state=restarted + service: name={{ nginx_service_name }} state=restarted - name: validate nginx configuration - command: nginx -t -c /etc/nginx/nginx.conf + command: nginx -t -c {{ nginx_conf_file_path }} changed_when: False - name: reload nginx - service: name=nginx state=reloaded + service: name={{ nginx_service_name }} state=reloaded diff --git a/tasks/main.yml b/tasks/main.yml index 4ee901a..5c4f48f 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -2,6 +2,7 @@ # Variable setup. - name: Include OS-specific variables. include_vars: "{{ ansible_os_family }}.yml" + when: nginx_include_os_vars - name: Define nginx_user. set_fact: @@ -42,4 +43,4 @@ - reload nginx - name: Ensure nginx is started and enabled to start at boot. - service: name=nginx state=started enabled=yes + service: name={{ nginx_service_name }} state=started enabled=yes