mirror of
https://git.lapiole.org/dani/ansible-roles.git
synced 2025-04-22 21:23:23 +02:00
Update to 2024-04-29 15:01
This commit is contained in:
parent
cdd8b6b638
commit
f51f6fd9bc
@ -5,12 +5,12 @@
|
|||||||
# You can set it to a number or a simple string (no special chars)
|
# You can set it to a number or a simple string (no special chars)
|
||||||
kimai_id: 1
|
kimai_id: 1
|
||||||
# Kimai version to deploy
|
# Kimai version to deploy
|
||||||
kimai_version: '2.13.0'
|
kimai_version: '2.15.0'
|
||||||
|
|
||||||
# URL of the archive
|
# URL of the archive
|
||||||
kimai_archive_url: https://github.com/kevinpapst/kimai2/archive/refs/tags/{{ kimai_version }}.tar.gz
|
kimai_archive_url: https://github.com/kevinpapst/kimai2/archive/refs/tags/{{ kimai_version }}.tar.gz
|
||||||
# Expected sha256 of the archive
|
# Expected sha256 of the archive
|
||||||
kimai_archive_sha256: 4b5136fc12e00a6591088bfbdbeed2b0e07002d15918204a67e0878b96bf32d6
|
kimai_archive_sha256: f61c50d3d426922bc6533768ccfa51b428b82506c8fbade4534ff0daf6ccd334
|
||||||
# Directory where kimai will be installed
|
# Directory where kimai will be installed
|
||||||
kimai_root_dir: /opt/kimai_{{ kimai_id }}
|
kimai_root_dir: /opt/kimai_{{ kimai_id }}
|
||||||
# Should ansible handle upgrades or only initial install
|
# Should ansible handle upgrades or only initial install
|
||||||
@ -20,7 +20,7 @@ kimai_manage_upgrade: True
|
|||||||
# Will be created
|
# Will be created
|
||||||
kimai_php_user: php-kimai_{{ kimai_id }}
|
kimai_php_user: php-kimai_{{ kimai_id }}
|
||||||
# PHP version under which kimai will run
|
# PHP version under which kimai will run
|
||||||
kimai_php_version: 82
|
kimai_php_version: 83
|
||||||
# Or you can specify here the name of a custom PHP FPM pool. See the httpd_php role
|
# Or you can specify here the name of a custom PHP FPM pool. See the httpd_php role
|
||||||
# bookstack_php_fpm_pool: custom_kimai
|
# bookstack_php_fpm_pool: custom_kimai
|
||||||
|
|
||||||
|
11
roles/kimai/files/kimai_empty_authorization.patch
Normal file
11
roles/kimai/files/kimai_empty_authorization.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- src/API/Authentication/ApiRequestMatcher.php.orig 2024-04-29 13:28:50.876284724 +0200
|
||||||
|
+++ src/API/Authentication/ApiRequestMatcher.php 2024-04-29 13:29:14.366580152 +0200
|
||||||
|
@@ -27,7 +27,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
// let's use this firewall if a Bearer token is set in the header
|
||||||
|
- if ($request->headers->has('Authorization')) {
|
||||||
|
+ if ($request->headers->has('Authorization') && $request->headers->get('Authorization') != "") {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
@ -59,6 +59,12 @@
|
|||||||
environment:
|
environment:
|
||||||
COMPOSER_ALLOW_SUPERUSER: 1
|
COMPOSER_ALLOW_SUPERUSER: 1
|
||||||
|
|
||||||
|
- name: Fix empty Authorization header
|
||||||
|
patch:
|
||||||
|
src: kimai_empty_authorization.patch
|
||||||
|
dest: "{{ kimai_root_dir }}/app/src/API/Authentication/ApiRequestMatcher.php"
|
||||||
|
backup: true
|
||||||
|
|
||||||
tags: kimai
|
tags: kimai
|
||||||
|
|
||||||
- import_tasks: ../includes/webapps_create_mysql_db.yml
|
- import_tasks: ../includes/webapps_create_mysql_db.yml
|
||||||
|
@ -26,6 +26,6 @@ Alias /{{ kimai_web_alias | regex_replace('^/','') }} {{ kimai_root_dir }}/app/p
|
|||||||
|
|
||||||
</Directory>
|
</Directory>
|
||||||
|
|
||||||
<Directory {{ kimai_root_dir }}/public/bundles>
|
<Directory {{ kimai_root_dir }}/app/public/bundles>
|
||||||
FallbackResource disabled
|
FallbackResource disabled
|
||||||
</Directory>
|
</Directory>
|
||||||
|
@ -7,3 +7,4 @@ kimai_packages:
|
|||||||
- acl
|
- acl
|
||||||
- zstd
|
- zstd
|
||||||
- git
|
- git
|
||||||
|
- patch
|
||||||
|
@ -7,3 +7,4 @@ kimai_packages:
|
|||||||
- acl
|
- acl
|
||||||
- zstd
|
- zstd
|
||||||
- git
|
- git
|
||||||
|
- patch
|
||||||
|
Loading…
x
Reference in New Issue
Block a user