jpp/ansible-roles
1
0
Fork 0
mirror of https://git.lapiole.org/dani/ansible-roles.git synced 2025-04-24 14:13:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to 2025-01-28 15:00

Browse Source
This commit is contained in:
Daniel Berteaud 2025-01-28 15:00:27 +01:00
parent 0e34a90b5f
commit bd78dba07a
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/repo_zabbix/defaults/main.yml
View File

@ -1,2 +1,2 @@
---
zabbix_major_version: 7.0
zabbix_major_version: 7.2

2
roles/zabbix_server/templates/httpd.conf.j2
View File

@ -1,5 +1,5 @@
<Directory "/usr/share/zabbix">
<Directory "/usr/share/zabbix{% if zabbix_major_version is version('7.2', '>=') %}/ui{% endif %}">
Options FollowSymLinks
AllowOverride All
{% if zabbix_server_web_src_ip is defined %}

2
roles/zabbix_server/templates/php.conf.j2
View File

@ -27,7 +27,7 @@ php_admin_value[upload_tmp_dir] = /tmp
php_admin_value[post_max_size] = 32M
php_admin_value[upload_max_filesize] = 5M
php_admin_value[disable_functions] = system, show_source, symlink, exec, dl, shell_exec, passthru, phpinfo, escapeshellarg, escapeshellcmd
php_admin_value[open_basedir] = /usr/share/zabbix:/etc/zabbix:/tmp:/var/lib/zabbix/sessions:/etc/alternative/:/usr/share/fonts/dejavu/:/usr/share/zabbix/assets/fonts/graphfont.ttf
php_admin_value[open_basedir] = /usr/share/zabbix:/etc/zabbix:/tmp:/var/lib/zabbix/sessions:/etc/alternative/:/usr/share/fonts/dejavu/:/usr/share/zabbix{% if zabbix_major_version is version('7.2', '>=') %}/ui{% endif %}/assets/fonts/graphfont.ttf
php_admin_value[max_execution_time] = 600
php_admin_value[max_input_time] = 600
php_admin_flag[allow_url_include] = off

3
roles/zimbra/templates/pre_backup.sh.j2
View File

@ -44,7 +44,8 @@ for MAILBOX in $(/usr/local/bin/zmprov getQuotaUsage $(hostname --fqdn) | awk '{
continue
fi
DIR=$(echo $LINE | perl -ne 'm/\s*\d+\s+(\w{4})\s+\d+\s+\d+\s+(\/.*)/ && print "$2\n"')
if echo $DIR | grep -qiP '\([a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}:\d+\)$'; then
if echo $DIR | grep -qiP '\(([a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}|null):\d+\)$'; then
echo "Skipping dir $DIR as it's a shared folder"
continue
fi
TYPE=$(echo $LINE | perl -ne 'm/\s*\d+\s+(\w{4})\s+\d+\s+\d+\s+(\/.*)/ && print "$1\n"')