Merge branch 'certbot'
This commit is contained in:
@@ -1,8 +1,12 @@
|
||||
---
|
||||
# tasks file for apache_vhost
|
||||
|
||||
<<<<<<< HEAD
|
||||
- include_vars: "{{ ansible_os_family|lower }}.yml"
|
||||
tags: always
|
||||
=======
|
||||
- include_vars: "{{ ansible_os_family }}.yml"
|
||||
>>>>>>> certbot
|
||||
|
||||
- name: create dedicated user
|
||||
user:
|
||||
@@ -43,6 +47,17 @@
|
||||
include_tasks: dns.yml
|
||||
when: apache_use_dns
|
||||
|
||||
- name: remove default site
|
||||
ansible.builtin.file:
|
||||
path: /etc/apache2/sites-enabled/000-default.conf
|
||||
state: absent
|
||||
notify: restart apache
|
||||
when: ansible_os_family| lower == 'debian'
|
||||
|
||||
- name: create certificate
|
||||
include_tasks: certbot.yml
|
||||
when: apache_use_ssl
|
||||
|
||||
- name: vhost config file
|
||||
template:
|
||||
src: vhost.conf.jj
|
||||
|
||||
Reference in New Issue
Block a user