entrouvert
/
publik-devinst
16
0
Fork 0
Code Issues Pull Requests 2 Releases Activity

misc: factor /var/lib references (#52511)

This commit is contained in:
Emmanuel Cazenave 2021-03-30 15:40:27 +02:00
parent 618930c536
commit 9bc245e9e5
9 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/app-setup/tasks/main.yml
View File

@ -15,7 +15,7 @@
- name: "{{app_name}} - /var/lib directory"
file:
path: "/var/lib/{{project_name}}"
path: "{{state_dir}}"
state: directory
owner: "{{user}}"
group: "{{user}}"
@ -23,7 +23,7 @@
- name: "{{app_name}} - /var/lib tenants directory"
file:
path: "/var/lib/{{project_name}}/tenants"
path: "{{tenants_dir}}"
state: directory
owner: "{{user}}"
group: "{{user}}"

2
roles/app-setup/vars/main.yml Normal file
View File

@ -0,0 +1,2 @@
state_dir: "/var/lib/{{project_name}}"
tenants_dir: "/var/lib/{{project_name}}/tenants"

6
roles/nginx-setup/templates/chrono-nginx-server.j2
View File

@ -3,9 +3,9 @@
{% block middle %}
location ~ ^/static/(.+)$ {
root /;
try_files /var/lib/{{project_name}}/tenants/$host/static/$1
/var/lib/{{project_name}}/tenants/$host/theme/static/$1
/var/lib/{{project_name}}/collectstatic/$1
try_files {{tenants_dir}}/$host/static/$1
{{tenants_dir}}/$host/theme/static/$1
{{state_dir}}/collectstatic/$1
=404;
add_header Access-Control-Allow-Origin *;
}

6
roles/nginx-setup/templates/corbo-nginx-server.j2
View File

@ -3,9 +3,9 @@
{% block middle %}
location ~ ^/static/(.+)$ {
root /;
try_files /var/lib/{{project_name}}/tenants/$host/static/$1
/var/lib/{{project_name}}/tenants/$host/theme/static/$1
/var/lib/{{project_name}}/collectstatic/$1
try_files {{tenants_dir}}/$host/static/$1
{{tenants_dir}}/$host/theme/static/$1
{{state_dir}}/collectstatic/$1
=404;
add_header Access-Control-Allow-Origin *;
}

6
roles/nginx-setup/templates/fargo-nginx-server.j2
View File

@ -3,9 +3,9 @@
{% block middle %}
location ~ ^/static/(.+)$ {
root /;
try_files /var/lib/{{project_name}}/tenants/$host/static/$1
/var/lib/{{project_name}}/tenants/$host/theme/static/$1
/var/lib/{{project_name}}/collectstatic/$1
try_files {{tenants_dir}}/$host/static/$1
{{tenants_dir}}/$host/theme/static/$1
{{state_dir}}/collectstatic/$1
=404;
add_header Access-Control-Allow-Origin *;
}

8
roles/nginx-setup/templates/nginx-server.j2
View File

@ -11,16 +11,16 @@ server {
location ~ ^/static/(.+)$ {
root /;
try_files /var/lib/{{project_name}}/tenants/$host/static/$1
/var/lib/{{project_name}}/tenants/$host/theme/static/$1
/var/lib/{{project_name}}/collectstatic/$1
try_files {{tenants_dir}}/$host/static/$1
{{tenants_dir}}/$host/theme/static/$1
{{state_dir}}/collectstatic/$1
=404;
add_header Access-Control-Allow-Origin *;
add_header 'Service-Worker-Allowed' '/';
}
location ~ ^/media/(.+)$ {
alias /var/lib/{{project_name}}/tenants/$host/media/$1;
alias {{tenants_dir}}/$host/media/$1;
}
location / {

8
roles/nginx-setup/templates/std-nginx-server.j2
View File

@ -3,15 +3,15 @@
{% block middle %}
location ~ ^/static/(.+)$ {
root /;
try_files /var/lib/{{project_name}}/tenants/$host/static/$1
/var/lib/{{project_name}}/tenants/$host/theme/static/$1
/var/lib/{{project_name}}/collectstatic/$1
try_files {{tenants_dir}}/$host/static/$1
{{tenants_dir}}/$host/theme/static/$1
{{state_dir}}/collectstatic/$1
=404;
add_header Access-Control-Allow-Origin *;
add_header 'Service-Worker-Allowed' '/';
}
location ~ ^/media/(.+)$ {
alias /var/lib/{{project_name}}/tenants/$host/media/$1;
alias {{tenants_dir}}/$host/media/$1;
}
{% endblock %}

10
roles/nginx-setup/templates/wcs-nginx-server.j2
View File

@ -3,17 +3,17 @@
{% block middle %}
location ~ ^/static/(.+)$ {
root /;
try_files /var/lib/wcs/$host/static/$1
/var/lib/wcs/$host/theme/static/$1
/var/lib/wcs/collectstatic/$1
try_files {{state_dir}}/$host/static/$1
{{state_dir}}/$host/theme/static/$1
{{state_dir}}/collectstatic/$1
=404;
}
location /static { alias /var/lib/wcs/collectstatic/; }
location /static { alias {{state_dir}}/collectstatic/; }
location /qo { alias {{app_src_dir}}/wcs/qommon/static/; }
location /themes {
root /;
try_files /var/lib/wcs/$host$uri
try_files {{state_dir}}/$host$uri
{{app_src_dir}}/data/themes/$uri
=404;
}

2
roles/nginx-setup/vars/main.yml Normal file
View File

@ -0,0 +1,2 @@
state_dir: "/var/lib/{{project_name}}"
tenants_dir: "/var/lib/{{project_name}}/tenants"