diff --git a/roles/glpi/defaults/main.yml b/roles/glpi/defaults/main.yml index 0f14927..0986740 100644 --- a/roles/glpi/defaults/main.yml +++ b/roles/glpi/defaults/main.yml @@ -2,9 +2,9 @@ glpi_id: 1 glpi_manage_upgrade: True -glpi_version: 9.5.1 +glpi_version: 9.5.2 glpi_zip_url: https://github.com/glpi-project/glpi/releases/download/{{ glpi_version }}/glpi-{{ glpi_version }}.tgz -glpi_zip_sha1: 23ceae94dffd5d60ab6fabfcc1517d9ca84bf64d +glpi_zip_sha1: 9e05ad35dc7d6a9fbefec2f6401edb47a1dea9cf glpi_root_dir: /opt/glpi_{{ glpi_id }} glpi_php_user: php-glpi_{{ glpi_id }} # If set, will use the following custom PHP FPM pool, which must be created diff --git a/roles/glpi/tasks/install.yml b/roles/glpi/tasks/install.yml index a62862e..5d040b0 100644 --- a/roles/glpi/tasks/install.yml +++ b/roles/glpi/tasks/install.yml @@ -37,6 +37,7 @@ rsync_opts: - '--exclude=/install/install.php' - '--exclude=/files/' + - '--exclude=/config/glpicrypt.key' delegate_to: "{{ inventory_hostname }}" when: glpi_install_mode != "none" tags: glpi diff --git a/roles/glpi/templates/perms.sh.j2 b/roles/glpi/templates/perms.sh.j2 index bb16d2a..5076e63 100644 --- a/roles/glpi/templates/perms.sh.j2 +++ b/roles/glpi/templates/perms.sh.j2 @@ -13,5 +13,8 @@ chmod 700 {{ glpi_root_dir }}/{tmp,sessions,data} find {{ glpi_root_dir }}/web -type f -exec chmod 644 "{}" \; find {{ glpi_root_dir }}/web -type d -exec chmod 755 "{}" \; chown -R :{{ glpi_php_user }} {{ glpi_root_dir }}/web/config +chown -R :{{ glpi_php_user }} {{ glpi_root_dir }}/web/marketplace chmod 770 {{ glpi_root_dir }}/web/config chmod 660 {{ glpi_root_dir }}/web/config/* +chmod 770 {{ glpi_root_dir }}/web/marketplace +chmod 660 {{ glpi_root_dir }}/web/marketplace/*