diff --git a/tasks/nginx.yml b/tasks/nginx.yml index f62cc77..ec78900 100644 --- a/tasks/nginx.yml +++ b/tasks/nginx.yml @@ -1,51 +1,41 @@ -- name: copy nginx configuration files +- name: Copy nginx configuration files become: true - template: + ansible.builtin.template: src: '{{ item.src }}' dest: '{{ item.dest }}' owner: root group: root mode: '0644' loop: - - { src: 'templates/nginx/default.j2', dest: '/etc/nginx/sites-available/default' } - - { src: 'templates/nginx/forgejo.j2', dest: '/etc/nginx/sites-available/forgejo' } - - { src: 'templates/nginx/woodpecker.j2', dest: '/etc/nginx/sites-available/woodpecker' } - - { src: 'templates/nginx/glitchtip.j2', dest: '/etc/nginx/sites-available/glitchtip' } - - { src: 'templates/nginx/vpn.j2', dest: '/etc/nginx/sites-available/vpn' } - - { - src: 'templates/nginx/newsreader.j2', - dest: '/etc/nginx/sites-available/newsreader', - } + - src: 'templates/nginx/default.j2' + dest: '/etc/nginx/sites-available/default' + - src: 'templates/nginx/forgejo.j2' + dest: '/etc/nginx/sites-available/forgejo' + - src: 'templates/nginx/woodpecker.j2' + dest: '/etc/nginx/sites-available/woodpecker' + - src: 'templates/nginx/glitchtip.j2' + dest: '/etc/nginx/sites-available/glitchtip' + - src: 'templates/nginx/newsreader.j2' + dest: '/etc/nginx/sites-available/newsreader' notify: restart nginx -- name: create configuration links +- name: Create configuration links become: true - file: + ansible.builtin.file: src: '{{ item.src }}' dest: '{{ item.dest }}' state: link loop: - - { - src: '/etc/nginx/sites-available/default', - dest: '/etc/nginx/sites-enabled/default', - } - - { - src: '/etc/nginx/sites-available/forgejo', - dest: '/etc/nginx/sites-enabled/forgejo', - } - - { - src: '/etc/nginx/sites-available/woodpecker', - dest: '/etc/nginx/sites-enabled/woodpecker', - } - - { - src: '/etc/nginx/sites-available/glitchtip', - dest: '/etc/nginx/sites-enabled/glitchtip', - } - - { src: '/etc/nginx/sites-available/vpn', dest: '/etc/nginx/sites-enabled/vpn' } - - { - src: '/etc/nginx/sites-available/newsreader', - dest: '/etc/nginx/sites-enabled/newsreader', - } + - src: '/etc/nginx/sites-available/default' + dest: '/etc/nginx/sites-enabled/default' + - src: '/etc/nginx/sites-available/forgejo' + dest: '/etc/nginx/sites-enabled/forgejo' + - src: '/etc/nginx/sites-available/woodpecker' + dest: '/etc/nginx/sites-enabled/woodpecker' + - src: '/etc/nginx/sites-available/glitchtip' + dest: '/etc/nginx/sites-enabled/glitchtip' + - src: '/etc/nginx/sites-available/newsreader' + dest: '/etc/nginx/sites-enabled/newsreader' notify: restart nginx @@ -62,9 +52,9 @@ # # This will also save its configuration. # -- name: copy letsencrypt configuration +- name: Copy letsencrypt configuration become: true - template: + ansible.builtin.template: src: 'templates/letsencrypt/cli.j2' dest: '/etc/letsencrypt/cli.ini' owner: root @@ -72,9 +62,9 @@ mode: '0644' notify: restart certbot -- name: enable certbot periodic certificate renewal +- name: Enable certbot periodic certificate renewal become: true - systemd: + ansible.builtin.systemd: name: certbot.timer state: started enabled: true