diff --git a/.gitignore b/.gitignore index 06328b857..5c3fb65ca 100644 --- a/.gitignore +++ b/.gitignore @@ -51,6 +51,8 @@ data/hooks/postfix/* data/hooks/rspamd/* data/hooks/sogo/* data/hooks/unbound/* +data/web/templates/cache/* +!data/web/templates/cache/.gitkeep data/web/.well-known/acme-challenge data/web/css/build/0081-custom-mailcow.css data/web/inc/vars.local.inc.php diff --git a/data/Dockerfiles/phpfpm/docker-entrypoint.sh b/data/Dockerfiles/phpfpm/docker-entrypoint.sh index 9a2b5829f..f727001f4 100755 --- a/data/Dockerfiles/phpfpm/docker-entrypoint.sh +++ b/data/Dockerfiles/phpfpm/docker-entrypoint.sh @@ -181,6 +181,11 @@ fi # Fix permissions for global filters chown -R 82:82 /global_sieve/* +# Fix permissions on twig cache folder +chown -R 82:82 /web/templates/cache +# Clear cache +find /web/templates/cache/* -not -name '.gitkeep' -delete + [[ ! -f /etc/nginx/conf.d/ZZZ-ejabberd.conf ]] && echo '# Autogenerated by mailcow' > /etc/nginx/conf.d/ZZZ-ejabberd.conf chown 82:82 /etc/nginx/conf.d/ZZZ-ejabberd.conf diff --git a/data/web/admin.php b/data/web/admin.php index 3c2dbfc73..30b7d3e44 100644 --- a/data/web/admin.php +++ b/data/web/admin.php @@ -1,7 +1,11 @@ "get_friendly_names")); if (!isset($_SESSION['gal']) && $license_cache = $redis->Get('LICENSE_STATUS_CACHE')) { $_SESSION['gal'] = json_decode($license_cache, true); } -?> -
=(isset($tfa_data['pretty'])) ? $tfa_data['pretty'] : '';?>
-ID | -=$lang['admin']['action'];?> | -
---|---|
- =(isset($_SESSION['fido2_cid']) && $_SESSION['fido2_cid'] == $key_info['cid']) ? ' ' : NULL; ?>=(!empty($key_info['fn']))?$key_info['fn']:$key_info['subject'];?> - | -- | -
=$lang['admin']['api_info'];?>
-=$lang['admin']['oauth2_info'];?>
-=$lang['admin']['relayhosts_hint'];?>
-=$lang['admin']['add_relayhost_hint'];?>
-=$lang['admin']['transports_hint'];?>
-=$lang['admin']['add_transports_hint'];?>
-=$lang['admin']['domain'];?>: =htmlspecialchars($domain);?> -
=$lang['admin']['dkim_key_valid'];?>
-=$lang['admin']['dkim_domains_selector'];?> '=$dkim['dkim_selector'];?>'
-=$dkim['length'];?> bit
- -=$dkim['dkim_txt'];?>-
=$lang['admin']['dkim_private_key'];?>
-=$lang['admin']['domain'];?>: =htmlspecialchars($domain);?>
=$lang['admin']['dkim_key_missing'];?>
-
↳ Alias-Domain: =htmlspecialchars($alias_domain);?> -
=$lang['admin']['dkim_key_valid'];?>
-Selector '=$dkim['dkim_selector'];?>'
-=$dkim['length'];?> bit
- -=$dkim['dkim_txt'];?>-
Private key
-↳ Alias-Domain: =htmlspecialchars($alias_domain);?>
=$lang['admin']['dkim_key_missing'];?>
-
=$lang['admin']['domain'];?>: =htmlspecialchars($blind);?> -
=$lang['admin']['dkim_key_unused'];?>
-Selector '=$dkim['dkim_selector'];?>'
-=$dkim['length'];?> bit
- -=$dkim['dkim_txt'];?>-
Private key
-=$lang['admin']['forwarding_hosts_hint'];?>
-=$lang['admin']['forwarding_hosts_add_hint'];?>
- -=$lang['admin']['f2b_regex_info'];?>
- -=$lang['admin']['ban_list_info'];?>
- - =$lang['admin']['no_active_bans'];?> - -=$active_bans['network'];?>(=$active_bans['banned_until'];?>) - - - [=$lang['admin']['queue_unban'];?>] - [whitelist] - [blacklist (needs restart)] - - =$lang['admin']['unban_pending'];?> - -
- -=$lang['admin']['quota_notifications_info'];?>
- - -=$lang['admin']['logo_info'];?>
-
-
-
-
=$lang['admin']['merged_vars_hint'];?>
-=$lang['admin']['app_name'];?> | -=$lang['admin']['link'];?> | -- |
---|---|---|
- | - | =$lang['admin']['remove_row'];?> | -
- | - | - |
=$lang['admin']['ui_header_announcement_help'];?>
- - - -=$lang['admin']['rspamd_global_filters_info'];?>
-=$lang['admin']['rspamd_global_filters_regex'];?>
-=$vmail_df[0];?>
-=$vmail_df[2];?> / =$vmail_df[1];?> (=$vmail_df[4];?>)
-=$lang['debug']['jvm_memory_solr'];?>: =(int)$solr_status['jvm']['memory']['total'] - (int)$solr_status['jvm']['memory']['free'];?> / =$solr_status['jvm']['memory']['total'];?> - (=round($solr_status['jvm']['memory']['raw']['used%']);?>%)
-=$lang['debug']['uptime'];?>: =round($solr_status['status']['dovecot-fts']['uptime'] / 1000 / 60 / 60);?>h
-=$lang['debug']['started_at'];?>: =$solr_status['status']['dovecot-fts']['startTime'];?>
-=$lang['debug']['last_modified'];?>: =$solr_status['status']['dovecot-fts']['index']['lastModified'];?>
-=$lang['debug']['size'];?>: =$solr_status['status']['dovecot-fts']['index']['size'];?>
-=$lang['debug']['docs'];?>: =$solr_status['status']['dovecot-fts']['index']['numDocs'];?>
- -=$lang['debug']['solr_dead'];?>
- -=$lang['admin']['hash_remove_info'];?>
-=$lang['edit']['sogo_visible_info'];?>
- -ACL
-=$lang['edit']['relay_all_info'];?>
- -=$lang['edit']['relay_transport_info'];?>
-Domain: =htmlspecialchars($result['domain_name']);?> (=$dkim['dkim_selector'];?>._domainkey)
-=$dkim['dkim_txt'];?>-
=$lang['user']['spamfilter_wl_desc'];?>
-=$lang['user']['spamfilter_bl_desc'];?>
-=$lang['edit']['quota_warning_bcc_info'];?>
-Domain: =htmlspecialchars($result['alias_domain']);?> (=$dkim['dkim_selector'];?>._domainkey)
-=$dkim['dkim_txt'];?>-
- =$lang['edit']['mailbox_relayhost_info'];?> -
=$lang['user']['quarantine_notification_info'];?>
-=$lang['user']['quarantine_category_info'];?>
-=sprintf($lang['edit']['pushover_info'], $mailbox);?>
-=$lang['edit']['pushover_vars'];?>: {SUBJECT}
, {SENDER}
ACL
-=$lang['acl']['ratelimit'];?>
-=$lang['edit']['mbox_rl_info'];?>
-=$lang['add']['relayhost_wrapped_tls_info'];?>
-