davina/infrastructure
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

[fix]

Browse source
This commit is contained in:
fenris 2025-09-18 13:44:07 +02:00
parent 897010cce6
commit d5cf4f57b3
4 changed files with 20 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
roles/davina_backend-and-nginx/defaults/main.json
View file

@ -1,4 +1,5 @@
{ {
"var_davina_backend_and_nginx_directory": "/opt/davina",
"var_davina_backend_and_nginx_domain": "davina.example.org", "var_davina_backend_and_nginx_domain": "davina.example.org",
"var_davina_backend_and_nginx_tls_mode": "force" "var_davina_backend_and_nginx_tls_mode": "force"
} }

14
roles/davina_backend-and-nginx/templates/conf.j2
View file

@ -1,13 +1,21 @@
{% macro davina_backend_common() %} {% macro davina_backend_common() %}
root {{var_davina_backend_and_nginx_directory}};
index index.php;
location / { location / {
try_files $uri $uri/ /index.php;
dav_methods PUT DELETE MKCOL COPY MOVE; dav_methods PUT DELETE MKCOL COPY MOVE;
# dav_ext_methods PROPFIND PROPPATCH LOCK UNLOCK; # dav_ext_methods PROPFIND PROPPATCH LOCK UNLOCK;
dav_access user:rw group:rw all:r; # dav_access user:rw group:rw all:r;
# create_full_put_path on;
}
location ~ \.php$ {
include fastcgi_params; include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param REDIRECT_STATUS 200; fastcgi_param REDIRECT_STATUS 200;
fastcgi_pass unix:/var/run/php/php8.2-fpm.sock; fastcgi_pass unix:/var/run/php/php8.4-fpm.sock;
} }
{% endmacro %} {% endmacro %}

25
roles/davina_backend/tasks/main.json
View file

@ -21,6 +21,14 @@
"home": "{{var_davina_backend_directory}}" "home": "{{var_davina_backend_directory}}"
} }
}, },
{
"name": "adjust data directory",
"become": true,
"ansible.builtin.file": {
"group": "www-data",
"mode": "g+rwx"
}
},
{ {
"name": "program | fetch", "name": "program | fetch",
"become": true, "become": true,
@ -57,22 +65,5 @@
"dest": "{{var_davina_backend_directory}}/conf.json", "dest": "{{var_davina_backend_directory}}/conf.json",
"owner": "{{var_davina_backend_user}}" "owner": "{{var_davina_backend_user}}"
} }
},
{
"name": "systemd unit",
"become": true,
"ansible.builtin.template": {
"src": "systemd_unit.j2",
"dest": "/etc/systemd/system/davina.service"
}
},
{
"name": "run",
"become": true,
"ansible.builtin.systemd_service": {
"name": "davina",
"enabled": true,
"state": "restarted"
}
} }
] ]

14
roles/davina_backend/templates/systemd_unit.j2
View file

@ -1,14 +0,0 @@
[Unit]
Description=davina
After=network.target
[Service]
WorkingDirectory={{var_davina_backend_directory}}
ExecStart={{var_davina_backend_directory}}/davina serve
Type=simple
Restart=always
User={{var_davina_backend_user}}
[Install]
WantedBy=default.target
RequiredBy=network.target