diff --git a/roles/bookstack/templates/php.conf.j2 b/roles/bookstack/templates/php.conf.j2 index e3719a9..75ced56 100644 --- a/roles/bookstack/templates/php.conf.j2 +++ b/roles/bookstack/templates/php.conf.j2 @@ -27,7 +27,7 @@ php_admin_value[post_max_size] = 100M php_admin_value[upload_max_filesize] = 100M php_admin_value[disable_functions] = system, show_source, symlink, exec, dl, shell_exec, passthru, phpinfo, escapeshellcmd php_admin_value[open_basedir] = {{ bookstack_root_dir }}:/usr/share/pear/:/usr/share/php/ -php_admin_value[max_execution_time] = 60 +php_admin_value[max_execution_time] = 180 php_admin_value[max_input_time] = 60 php_admin_flag[allow_url_include] = off php_admin_flag[allow_url_fopen] = off diff --git a/roles/httpd_common/templates/vhost_ansible.conf.j2 b/roles/httpd_common/templates/vhost_ansible.conf.j2 index 94d3a44..9fd8768 100644 --- a/roles/httpd_common/templates/vhost_ansible.conf.j2 +++ b/roles/httpd_common/templates/vhost_ansible.conf.j2 @@ -14,6 +14,9 @@ {% if vhost.aliases is defined %} ServerAlias {{ vhost.aliases | default([]) | join(' ') }} {% endif %} +{% if vhost.proxy_timeout is defined %} + ProxyTimeout {{ vhost.proxy_timeout }} +{% endif %} {% if vhost.webmaster_email is defined %} ServerAdmin {{ vhost.webmaster_email }} {% endif %} @@ -107,6 +110,9 @@ {% if vhost.aliases is defined %} ServerAlias {{ vhost.aliases | default([]) | join(' ') }} {% endif %} +{% if vhost.proxy_timeout is defined %} + ProxyTimeout {{ vhost.proxy_timeout }} +{% endif %} {% if vhost.webmaster_email is defined %} ServerAdmin {{ vhost.webmaster_email }} {% endif %} diff --git a/roles/lemonldap_ng/files/logos/scandm_appliance.png b/roles/lemonldap_ng/files/logos/scandm_appliance.png new file mode 100644 index 0000000..9e18497 Binary files /dev/null and b/roles/lemonldap_ng/files/logos/scandm_appliance.png differ diff --git a/roles/n8n/defaults/main.yml b/roles/n8n/defaults/main.yml index 24c9899..ca4536d 100644 --- a/roles/n8n/defaults/main.yml +++ b/roles/n8n/defaults/main.yml @@ -1,7 +1,7 @@ --- # Version to deploy -n8n_version: 0.184.0 +n8n_version: 0.185.0 # Root directory where n8n will be installed n8n_root_dir: /opt/n8n # User account under which n8n will run diff --git a/roles/pgadmin4/defaults/main.yml b/roles/pgadmin4/defaults/main.yml index d47596b..0a50bde 100644 --- a/roles/pgadmin4/defaults/main.yml +++ b/roles/pgadmin4/defaults/main.yml @@ -10,7 +10,7 @@ pga_src_ip: [] # Root dir where the app will be installed pga_root_dir: /opt/pgadmin4_{{ pga_id }} # Version to deploy -pga_version: '6.10' +pga_version: '6.11' # When pg_auth is an empty list, pgAdmin will be in single user mode # You can set it to a list, eg diff --git a/roles/pgadmin4/templates/config_local.py.j2 b/roles/pgadmin4/templates/config_local.py.j2 index 488303b..fa78b57 100644 --- a/roles/pgadmin4/templates/config_local.py.j2 +++ b/roles/pgadmin4/templates/config_local.py.j2 @@ -2,6 +2,7 @@ SERVER_MODE={{ (pga_auth | length >= 1) | ternary('True','False') }} DEFAULT_SERVER='0.0.0.0' DEFAULT_SERVER_PORT={{ pga_port }} DATA_DIR='{{ pga_root_dir }}/data' +AZURE_CREDENTIAL_CACHE_DIR='{{ pga_root_dir }}/data/azurecredentialcache' LOG_FILE='{{ pga_root_dir }}/logs/pgadmin4.log' STORAGE_DIR='{{ pga_root_dir }}/data' SQLITE_PATH='{{ pga_root_dir }}/data/pgadmin4.db'