diff --git a/roles/postgres/defaults/main.yml b/roles/postgres/defaults/main.yml index 1706527..8a09f3a 100644 --- a/roles/postgres/defaults/main.yml +++ b/roles/postgres/defaults/main.yml @@ -1 +1 @@ -pg_version: "{% if ansible_facts['os_family'] == 'Debian' and ansible_facts['distribution_major_version'] == '9' %}9.6{% elif ansible_facts['os_family'] == 'Debian' and ansible_facts['distribution_major_version'] == '10' %}11{% endif %}" +pg_version: "{% if ansible_facts['os_family'] == 'Debian' and ansible_facts['distribution_major_version'] == '9' %}9.6{% elif ansible_facts['os_family'] == 'Debian' and ansible_facts['distribution_major_version'] == '10' %}11{% elif ansible_facts['os_family'] == 'Debian' and ansible_facts['distribution_major_version'] == '11' %}13{% endif %}" diff --git a/roles/postgres/files/postgresql.conf b/roles/postgres/files/postgresql.conf index 8cc90a8..617ba26 100644 --- a/roles/postgres/files/postgresql.conf +++ b/roles/postgres/files/postgresql.conf @@ -40,13 +40,13 @@ data_directory = '/srv/postgresql' # use data in another directory # (change requires restart) -hba_file = '/etc/postgresql/11/main/pg_hba.conf' # host-based authentication file +hba_file = '/etc/postgresql/13/main/pg_hba.conf' # host-based authentication file # (change requires restart) -ident_file = '/etc/postgresql/11/main/pg_ident.conf' # ident configuration file +ident_file = '/etc/postgresql/13/main/pg_ident.conf' # ident configuration file # (change requires restart) # If external_pid_file is not explicitly set, no extra PID file is written. -external_pid_file = '/var/run/postgresql/11-main.pid' # write an extra PID file +external_pid_file = '/var/run/postgresql/13-main.pid' # write an extra PID file # (change requires restart) @@ -484,7 +484,7 @@ log_timezone = 'Europe/Paris' # PROCESS TITLE #------------------------------------------------------------------------------ -cluster_name = '11/main' # added to process titles if nonempty +cluster_name = '13/main' # added to process titles if nonempty # (change requires restart) #update_process_title = on @@ -500,7 +500,7 @@ cluster_name = '11/main' # added to process titles if nonempty #track_io_timing = off #track_functions = none # none, pl, all #track_activity_query_size = 1024 # (change requires restart) -stats_temp_directory = '/var/run/postgresql/11-main.pg_stat_tmp' +stats_temp_directory = '/var/run/postgresql/13-main.pg_stat_tmp' # - Monitoring - diff --git a/roles/spamassassin/files/local.cf b/roles/spamassassin/files/local.cf index db1d2bb..c41194e 100644 --- a/roles/spamassassin/files/local.cf +++ b/roles/spamassassin/files/local.cf @@ -106,6 +106,9 @@ score LOCAL_BITCOIN 10.0 whitelist_from *@chichiclothing.com # Blacklist manuel +blacklist_from *@starhold.ru +blacklist_from *@*.rodeo +blacklist_from *@gotomorgen.com.se blacklist_from cyriltruka1999@outlook.com blacklist_from *@*.ink blacklist_from anatoliy.sidorov521o8i@hotmail.com diff --git a/site.yml b/site.yml index 7640a13..29ba104 100644 --- a/site.yml +++ b/site.yml @@ -1,6 +1,5 @@ - import_playbook: system.yml - import_playbook: usb.yml -- import_playbook: proxmox.yml - import_playbook: smtprelay.yml - import_playbook: borgbackup.yml - import_playbook: nut.yml