diff --git a/group_vars/galene.yml b/group_vars/galene.yml index fffd2a0a..d3ae3759 100644 --- a/group_vars/galene.yml +++ b/group_vars/galene.yml @@ -11,7 +11,10 @@ service_nginx: params: - "include /etc/nginx/snippets/options-proxypass.conf" - "proxy_pass http://localhost:8443" - + - filter: "/auth" + params: + - "include /etc/nginx/snippets/options-proxypass.conf" + - "proxy_pass http://localhost:1234" - filter: "~ ^/(\\w+)/$" params: - "return 302 https://$host/group/$1" @@ -20,11 +23,17 @@ service_nginx: server_name: - "neree.crans.org" locations: - - filter: "/" + - filter: "~ ^(/ws|.*\\.json)$" params: - "include /etc/nginx/snippets/options-proxypass.conf" - "proxy_pass http://localhost:8443" - - filter: "~ ^/(\\w+)/$" params: - "return 302 https://$host/group/$1" + - filter: "/" + params: + - "include /etc/nginx/snippets/options-proxypass.conf" + - "proxy_pass http://localhost:8444" + +glob_galene: + version: 0.6.1 diff --git a/roles/galene/handlers/main.yml b/roles/galene/handlers/main.yml index cf0b5792..dfd63238 100644 --- a/roles/galene/handlers/main.yml +++ b/roles/galene/handlers/main.yml @@ -1,5 +1,5 @@ --- -- name: Restart galène +- name: systemctl restart galene.service systemd: name: galene state: restarted diff --git a/roles/galene/tasks/main.yml b/roles/galene/tasks/main.yml index ee33d0a6..16ad195b 100644 --- a/roles/galene/tasks/main.yml +++ b/roles/galene/tasks/main.yml @@ -29,7 +29,7 @@ git: repo: https://github.com/jech/galene.git dest: /var/local/galene - version: galene-0.3.5 + version: galene-{{ galene.version }} register: git_result become_user: galene @@ -40,7 +40,7 @@ chdir: /var/local/galene environment: CGO_ENABLED: 0 - notify: Restart galène + notify: systemctl restart galene.service - name: Make Galène configuration directory file: @@ -70,7 +70,7 @@ owner: root group: root mode: 0644 - notify: Restart galène + notify: systemctl restart galene.service - name: Enable systemd unit systemd: diff --git a/roles/galene/templates/systemd/system/galene.service.j2 b/roles/galene/templates/systemd/system/galene.service.j2 index 1a8897c8..2f650fa2 100644 --- a/roles/galene/templates/systemd/system/galene.service.j2 +++ b/roles/galene/templates/systemd/system/galene.service.j2 @@ -9,7 +9,7 @@ Type=simple WorkingDirectory=/var/local/galene User=galene Group=galene -ExecStart=/var/local/galene/galene --insecure --static /var/www/galene-static/static/ +ExecStart=/var/local/galene/galene --insecure LimitNOFILE=65536 [Install]