diff --git a/roles/gitweb/tasks/main.yml b/roles/gitweb/tasks/main.yml index 55e4ff0..6f9593b 100644 --- a/roles/gitweb/tasks/main.yml +++ b/roles/gitweb/tasks/main.yml @@ -14,28 +14,18 @@ git: repo: "{{ gitweb_repo }}" dest: "{{ gitweb_webroot }}" - - name: Register certificates - block: - - name: Configure insecure virtual host configs - template: - src: apache2-vhost.conf - dest: "/etc/apache2/sites-enabled/{{ gitweb_url }}.conf" - - name: Generate certificate - include_role: - name: https - vars: - website_url: "{{ gitweb_url }}" - website_webroot: "{{ gitweb_webroot }}" - - name: Secure Apache - block: - # If we copied over http-only configs before, they get oblooterated now - - name: Copy over virtual host configs - template: - src: apache2-vhost-ssl.conf - dest: "/etc/apache2/sites-enabled/{{ gitweb_url }}.conf" - - name: Reload Apache - service: - name: apache2 - state: reloaded - enabled: true + - name: Copy over virtual host configs + template: + src: apache2-vhost-ssl.conf + dest: "/etc/apache2/sites-enabled/{{ gitweb_url }}.conf" + - name: Generate certificate + include_role: + name: https + vars: + website_url: "{{ gitweb_url }}" + website_webroot: "{{ gitweb_webroot }}" + - name: Reload Apache + service: + name: apache2 + state: reloaded become: yes