diff options
| author | Lars Wirzenius <liw@liw.fi> | 2018-08-05 17:23:51 +0300 |
|---|---|---|
| committer | Lars Wirzenius <liw@liw.fi> | 2018-08-05 17:23:51 +0300 |
| commit | c0f9a32ae8f092b7ba552798ea1ae2f2fdd9666a (patch) | |
| tree | f0059202115a952365785b5fb74edbf22bb0a992 /roles | |
| parent | a1203258d80afd0bfcc726011f39591974c7a7e3 (diff) | |
| download | ick2-ansible-c0f9a32ae8f092b7ba552798ea1ae2f2fdd9666a.tar.gz | |
Fix: how ickweb is started
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/haproxy/templates/haproxy.cfg.j2 | 15 | ||||
| -rw-r--r-- | roles/qvisqve/tasks/main.yml | 8 | ||||
| -rw-r--r-- | roles/qvisqve/templates/qvisqve.yaml.j2 | 3 |
3 files changed, 24 insertions, 2 deletions
diff --git a/roles/haproxy/templates/haproxy.cfg.j2 b/roles/haproxy/templates/haproxy.cfg.j2 index 8117d8a..0a6ec70 100644 --- a/roles/haproxy/templates/haproxy.cfg.j2 +++ b/roles/haproxy/templates/haproxy.cfg.j2 @@ -36,21 +36,36 @@ frontend http-in rspadd Strict-Transport-Security:\ max-age=15768000 + acl ickweb path_beg /web acl blobs path_beg /blobs acl token path_beg /token + acl login path_beg /login + acl auth path_beg /auth + acl clients path_beg /clients + acl users path_beg /users + acl applications path_beg /applications acl notify path_beg /notify acl debian path_beg /debian acl any method GET HEAD POST PUT DELETE use_backend apache if debian + use_backend ickweb if ickweb use_backend notification_service if notify use_backend artifact_store if blobs use_backend qvisqve if token + use_backend qvisqve if login + use_backend qvisqve if auth + use_backend qvisqve if clients + use_backend qvisqve if users + use_backend qvisqve if applications use_backend controller if any backend apache server apache_1 127.0.0.1:8080 +backend ickweb + server ickweb_1 127.0.0.1:{{ ickweb_port }} + backend controller server controller_1 127.0.0.1:{{ controller_port }} diff --git a/roles/qvisqve/tasks/main.yml b/roles/qvisqve/tasks/main.yml index 2b78dac..2d19c75 100644 --- a/roles/qvisqve/tasks/main.yml +++ b/roles/qvisqve/tasks/main.yml @@ -15,6 +15,14 @@ with_items: - qvisqve +- name: "create Qvisqve store dir" + file: + state: directory + path: /var/lib/qvisqve + owner: _qvisqve + group: _qvisqve + mode: 0755 + - name: "create Qvisqve config dir" file: state: directory diff --git a/roles/qvisqve/templates/qvisqve.yaml.j2 b/roles/qvisqve/templates/qvisqve.yaml.j2 index 5d19a1d..1f22fda 100644 --- a/roles/qvisqve/templates/qvisqve.yaml.j2 +++ b/roles/qvisqve/templates/qvisqve.yaml.j2 @@ -1,8 +1,7 @@ +store: /var/lib/qvisqve gunicorn: yes gunicorn-log: /var/log/qvisqve/gunicorn.log gunicorn-port: {{ qvisqve_port }} -clients: -{{ qvisqve_clients|to_nice_yaml|indent(4,true) }} log: - filename: /var/log/qvisqve/qvisqve.slog token-issuer: "https://{{ qvisqve_domain }}" |