[constellation] Properly separe constellation and constellation-front

Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
certbot_on_virtu
Yohann D'ANELLO 2021-03-24 14:23:22 +01:00
parent a90b8e2eb6
commit 98263de23f
Signed by: _ynerant
GPG Key ID: 3A75C55819C8CF85
5 changed files with 41 additions and 38 deletions

View File

@ -0,0 +1,30 @@
---
loc_nginx:
service_name: constellation
ssl: []
servers:
- ssl: false
default: true
server_name:
- "constellation.crans.org"
- "intranet.crans.org"
locations:
- filter: "/static"
params:
- "alias /var/local/constellation/static/"
- filter: "/javascript"
params:
- "alias /usr/share/javascript/"
- filter: "/media"
params:
- "alias /var/local/constellation/media/"
- filter: "/"
params:
- "uwsgi_pass constellation"
- "include /etc/nginx/uwsgi_params"
upstreams:
- name: 'constellation'
server: 'unix:///var/run/uwsgi/app/constellation/constellation.sock'

View File

@ -40,33 +40,3 @@ glob_constellation:
version: master
settings_local_owner: www-data
settings_local_group: nounou
loc_nginx:
service_name: constellation
ssl: []
servers:
- ssl: false
default: true
server_name:
- "constellation.crans.org"
- "intranet.crans.org"
locations:
- filter: "/static"
params:
- "alias /var/local/constellation/static/"
- filter: "/javascript"
params:
- "alias /usr/share/javascript/"
- filter: "/media"
params:
- "alias /var/local/constellation/media/"
- filter: "/"
params:
- "uwsgi_pass constellation"
- "include /etc/nginx/uwsgi_params"
upstreams:
- name: 'constellation'
server: 'unix:///var/run/uwsgi/app/constellation/constellation.sock'

7
hosts
View File

@ -45,7 +45,10 @@ reverseproxy
thelounge
vsftpd
[constellation]
[constellation:children]
constellation-front
[constellation-front]
constellation-dev.adm.crans.org
[dhcp:children]
@ -139,7 +142,7 @@ eclat.adm.crans.org
ptf.adm.crans.org
[nginx:children]
constellation
constellation-front
django_cas
galene
jitsi

View File

@ -3,8 +3,13 @@
- hosts: constellation
vars:
constellation: "{{ glob_constellation | combine(loc_constellation | default({}), recursive=True) }}"
nginx: "{{ glob_nginx | combine(loc_nginx | default({})) }}"
roles:
- constellation
- hosts: constellation-front
vars:
constellation: "{{ glob_constellation | combine(loc_constellation | default({}), recursive=True) }}"
nginx: "{{ glob_nginx | combine(loc_nginx | default({})) }}"
roles:
- nginx
- constellation-front

View File

@ -1,9 +1,4 @@
---
- name: Reload NGINX
systemd:
name: nginx
state: reloaded
- name: Reload uWSGI
systemd:
name: uwsgi