diff --git a/production.yml b/production.yml index f5a837b..1bf540d 100644 --- a/production.yml +++ b/production.yml @@ -56,7 +56,7 @@ borg_client: borg_backup_path: - /etc - /var/lib/mumble-server - ror.dmz.mateu.be: + ror1.dmz.mateu.be: borg_backup_excluded_path: - /srv/docker/m.nintendojo.fr/public @@ -102,7 +102,7 @@ webservers: web_hostname: - sebicomics.com - www.sebicomics.com - ror.dmz.mateu.be: + ror1.dmz.mateu.be: web_hostname: - m.nintendojo.fr jabber.dmz.mateu.be: @@ -134,7 +134,7 @@ phpservers: dockerservers: hosts: - ror.dmz.mateu.be: + ror1.dmz.mateu.be: mariadbservers: hosts: @@ -144,7 +144,7 @@ mariadbservers: pgsqlservers: hosts: - ror.dmz.mateu.be: + ror1.dmz.mateu.be: mailservers: hosts: diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 609dc4e..e9a3434 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -10,7 +10,7 @@ repo: "deb [arch=amd64] https://download.docker.com/linux/debian {{ ansible_facts['distribution_release'] }} stable" state: present -- name: install docker and docker-compose +- name: install docker, docker-compose and extra packages package: name: "{{ item }}" state: present @@ -19,6 +19,7 @@ - docker-ce-cli - containerd.io - docker-compose + - fuse-overlayfs - name: docker directory file: diff --git a/roles/spamassassin/files/local.cf b/roles/spamassassin/files/local.cf index 95b73d3..d1d0a8d 100644 --- a/roles/spamassassin/files/local.cf +++ b/roles/spamassassin/files/local.cf @@ -6,6 +6,9 @@ bayes_auto_learn 1 ok_locales fr score UNWANTED_LANGUAGE_BODY 5 +rawbody LOCAL_BAZARTIONSER /bazartionser\.eu/i +score LOCAL_BAZARTIONSER 20.0 + rawbody LOCAL_AMZ_ENTERPRISE /Amazon pour votre entreprise/i score LOCAL_AMZ_ENTERPRISE 20.0 @@ -143,6 +146,7 @@ whitelist_from *@chichiclothing.com whitelist_from dmarcreport@microsoft.com # Blacklist manuel +blacklist_from *@mazamins.uk blacklist_from *@booksaners.de blacklist_from *@*.de.fr blacklist_from *@*.my-apollonnl.fr