summaryrefslogtreecommitdiff
path: root/roles/elevate
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2019-10-13 17:29:11 +0200
committerChristian Pointner <equinox@spreadspace.org>2019-10-13 17:29:11 +0200
commitb523cf86c8cbedb43cf625a1a847ca828afd5fba (patch)
treefd48b4d7792ca75c31d197414ba8463e57cade1e /roles/elevate
parentnextcloud: fix systemd timer shuffling (diff)
nextcloud basic installation is finally working properly
Diffstat (limited to 'roles/elevate')
-rw-r--r--roles/elevate/liquidtruth/tasks/main.yml16
-rw-r--r--roles/elevate/media/tasks/main.yml14
2 files changed, 15 insertions, 15 deletions
diff --git a/roles/elevate/liquidtruth/tasks/main.yml b/roles/elevate/liquidtruth/tasks/main.yml
index d791c33f..4cb50dc9 100644
--- a/roles/elevate/liquidtruth/tasks/main.yml
+++ b/roles/elevate/liquidtruth/tasks/main.yml
@@ -23,16 +23,16 @@
- name: install and configure nodejs
import_tasks: nodejs.yml
-- name: install and configure nginx
+- name: configure nginx vhost
import_role:
- name: nginx
+ name: nginx/vhost
vars:
- nginx_vhosts:
- liquidtruth:
- template: generic-proxy-no-buffering-with-acme
- acme: true
- hostnames: "{{ liquidtruth_hostnames }}"
- proxy_pass: "http://127.0.0.1:8080"
+ nginx_vhost:
+ name: liquidtruth
+ template: generic-proxy-no-buffering-with-acme
+ acme: true
+ hostnames: "{{ liquidtruth_hostnames }}"
+ proxy_pass: "http://127.0.0.1:8080"
- name: create app user
user:
diff --git a/roles/elevate/media/tasks/main.yml b/roles/elevate/media/tasks/main.yml
index 77d53d23..f2d8b85d 100644
--- a/roles/elevate/media/tasks/main.yml
+++ b/roles/elevate/media/tasks/main.yml
@@ -20,15 +20,15 @@
- name: install and configure nextcloud
import_tasks: nextcloud.yml
-- name: install and configure nginx
+- name: configure nginx vhost
import_role:
- name: nginx
+ name: nginx/vhost
vars:
- nginx_vhosts:
- nextcloud:
- content: "{{ lookup('template', 'nextcloud-nginx.conf.j2') }}"
- acme: true
- hostnames: "{{ nextcloud_hostnames }}"
+ nginx_vhost:
+ name: nextcloud
+ content: "{{ lookup('template', 'nextcloud-nginx.conf.j2') }}"
+ acme: true
+ hostnames: "{{ nextcloud_hostnames }}"
- name: install dstat script
template: