diff options
Diffstat (limited to 'roles/elevate/media/tasks')
-rw-r--r-- | roles/elevate/media/tasks/main.yml | 14 | ||||
-rw-r--r-- | roles/elevate/media/tasks/nextcloud-config.yml | 4 | ||||
-rw-r--r-- | roles/elevate/media/tasks/nextcloud.yml | 2 | ||||
-rw-r--r-- | roles/elevate/media/tasks/nginx.yml | 75 |
4 files changed, 79 insertions, 16 deletions
diff --git a/roles/elevate/media/tasks/main.yml b/roles/elevate/media/tasks/main.yml index 7b4c6659..9633a0e1 100644 --- a/roles/elevate/media/tasks/main.yml +++ b/roles/elevate/media/tasks/main.yml @@ -5,19 +5,11 @@ - nginx - python-docker - systemd-docker + - python-openssl state: present -- name: remove nginx default config - file: - name: /etc/nginx/sites-enabled/default - state: absent - notify: restart nginx - -- name: install nginx config - template: - src: nextcloud-nginx.conf.j2 - dest: /etc/nginx/sites-enabled/nextcloud - notify: restart nginx +- name: configure nginx + import_tasks: nginx.yml - name: install and configure nextcloud import_tasks: nextcloud.yml diff --git a/roles/elevate/media/tasks/nextcloud-config.yml b/roles/elevate/media/tasks/nextcloud-config.yml index 67bb0cec..2a3c8074 100644 --- a/roles/elevate/media/tasks/nextcloud-config.yml +++ b/roles/elevate/media/tasks/nextcloud-config.yml @@ -47,7 +47,3 @@ - name: set up background tasks trigger to cron command: docker exec -u www-data nextcloud.service /var/www/html/occ background:cron changed_when: false - -### add this until tests have been done -## 'overwriteprotocol' => 'http', -> /srv/nextcloud/config/nextcloud/config.php -# diff --git a/roles/elevate/media/tasks/nextcloud.yml b/roles/elevate/media/tasks/nextcloud.yml index 44bdfd6d..8531699c 100644 --- a/roles/elevate/media/tasks/nextcloud.yml +++ b/roles/elevate/media/tasks/nextcloud.yml @@ -67,7 +67,7 @@ - /srv/ncdata/share:/srv/external env: NEXTCLOUD_UPDATE: '1' - NEXTCLOUD_TRUSTED_DOMAINS: "{{ nextcloud_hostnames | join(' ') }} 89.106.211.61" ## TODO remove ip when tests are done + NEXTCLOUD_TRUSTED_DOMAINS: "{{ nextcloud_hostnames | join(' ') }}" MYSQL_DATABASE: "{{ nextcloud_db.db }}" MYSQL_HOST: "127.0.0.1:3306" MYSQL_USER: "{{ nextcloud_db.user }}" diff --git a/roles/elevate/media/tasks/nginx.yml b/roles/elevate/media/tasks/nginx.yml new file mode 100644 index 00000000..fd1ed888 --- /dev/null +++ b/roles/elevate/media/tasks/nginx.yml @@ -0,0 +1,75 @@ +--- +## TODO: most of these steps could probably be moved to generic role + +- name: remove nginx default config + file: + name: /etc/nginx/sites-enabled/default + state: absent + notify: restart nginx + +- name: install nginx config snippets + copy: + src: "nginx-snippets/{{ item }}.conf" + dest: /etc/nginx/snippets/ + with_items: + - ssl + - hsts + notify: restart nginx + +- name: generate Diffie-Hellman parameters + openssl_dhparam: + path: /etc/ssl/dhparams.pem + size: 2048 + notify: restart nginx + +- name: install nginx config + template: + src: nextcloud-nginx.conf.j2 + dest: /etc/nginx/sites-available/nextcloud + notify: restart nginx + +- name: check if acme certs already exist + stat: + path: "/var/lib/acme/live/{{ item }}" + with_items: "{{ nextcloud_hostnames }}" + register: acme_cert_stat + +- name: set acmecert_missing_hostnames variable + set_fact: + acmecert_missing_hostnames: "{{ acme_cert_stat.results | acme_cert_nonexistent(nextcloud_hostnames) }}" + +- name: link nonexistent hostnames to self-signed interim cert + when: acmecert_missing_hostnames | length > 0 + block: + - name: get id of existing selfsigned interim certificate + command: cat /var/lib/acme/.selfsigned-interim-cert + changed_when: false + check_mode: false + register: selfsigned_interim_cert_id + + - name: set selfsigned_interim_cert_id variable + set_fact: + selfsigned_interim_cert_id: "{{ selfsigned_interim_cert_id.stdout }}" + + - name: link to snakeoil cert for nonexistent hostnames + file: + src: "../certs/{{ selfsigned_interim_cert_id }}" + dest: "/var/lib/acme/live/{{ item }}" + state: link + with_items: "{{ acmecert_missing_hostnames }}" + +- name: enable vhost config using acme cert + file: + src: ../sites-available/nextcloud + dest: /etc/nginx/sites-enabled/nextcloud + state: link + +- name: make sure nginx config has been (re)loaded + meta: flush_handlers + +- name: get certificate using acmetool + import_role: + name: acmetool/cert + vars: + acmetool_cert_name: "{{ nextcloud_hostnames[0] }}" + acmetool_cert_hostnames: "{{ nextcloud_hostnames }}" |